diff options
Diffstat (limited to 'sys/amd64/isa')
| -rw-r--r-- | sys/amd64/isa/clock.c | 18 | ||||
| -rw-r--r-- | sys/amd64/isa/isa.c | 40 | ||||
| -rw-r--r-- | sys/amd64/isa/npx.c | 6 |
3 files changed, 32 insertions, 32 deletions
diff --git a/sys/amd64/isa/clock.c b/sys/amd64/isa/clock.c index 196d34ce75ca..e1bc372f176f 100644 --- a/sys/amd64/isa/clock.c +++ b/sys/amd64/isa/clock.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $Id: clock.c,v 1.32 1995/03/16 18:11:58 bde Exp $ + * $Id: clock.c,v 1.33 1995/05/11 07:44:40 bde Exp $ */ /* @@ -193,7 +193,7 @@ int acquire_timer0(int rate, void (*function) __P((struct clockframe *frame))) { if (timer0_state || TIMER_DIV(rate) < TIMER0_MIN_MAX_COUNT || - !function) + !function) return -1; new_function = function; new_rate = rate; @@ -204,7 +204,7 @@ acquire_timer0(int rate, void (*function) __P((struct clockframe *frame))) int acquire_timer2(int mode) { - if (timer2_state) + if (timer2_state) return -1; timer2_state = 1; outb(TIMER_MODE, TIMER_SEL2 | (mode &0x3f)); @@ -265,7 +265,7 @@ printrtc(void) #endif static int -getit() +getit() { int high, low; @@ -307,7 +307,7 @@ calibrate_cyclecounter(void) /* * Wait "n" microseconds. - * Relies on timer 1 counting down from (TIMER_FREQ / hz) + * Relies on timer 1 counting down from (TIMER_FREQ / hz) * Note: timer had better have been programmed before this is first used! */ void @@ -339,7 +339,7 @@ DELAY(int n) prev_tick = getit(0, 0); n -= 20; /* - * Calculate (n * (TIMER_FREQ / 1e6)) without using floating point + * Calculate (n * (TIMER_FREQ / 1e6)) without using floating point * and without any avoidable overflows. */ sec = n / 1000000; @@ -375,11 +375,11 @@ sysbeepstop(void *chan) beeping = 0; } -int +int sysbeep(int pitch, int period) { - if (acquire_timer2(TIMER_SQWAVE|TIMER_16BIT)) + if (acquire_timer2(TIMER_SQWAVE|TIMER_16BIT)) return -1; disable_intr(); outb(TIMER_CNTR2, pitch); @@ -426,7 +426,7 @@ readrtc(int port) * XXX initialization of other timers is unintentionally left blank. */ void -startrtclock() +startrtclock() { timer0_max_count = hardclock_max_count = TIMER_DIV(hz); timer0_overflow_threshold = timer0_max_count - TIMER0_LATCH_COUNT; diff --git a/sys/amd64/isa/isa.c b/sys/amd64/isa/isa.c index c4a2455b8d6e..1dd0fb99557a 100644 --- a/sys/amd64/isa/isa.c +++ b/sys/amd64/isa/isa.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 - * $Id: isa.c,v 1.48 1995/05/11 05:20:43 jkh Exp $ + * $Id: isa.c,v 1.49 1995/05/13 00:09:38 jkh Exp $ */ /* @@ -334,7 +334,7 @@ isa_configure() { * SLIPDISC. No need to block out ALL ttys during a splimp when only one * of them is running slip. * - * XXX actually, blocking all ttys during a splimp doesn't matter so much + * XXX actually, blocking all ttys during a splimp doesn't matter so much * with sio because the serial interrupt layer doesn't use tty_imask. Only * non-serial ttys suffer. It's more stupid that ALL 'net's are blocked * during spltty. @@ -372,8 +372,8 @@ isa_configure() { /* * Configure an ISA device. */ - - + + static void config_isadev(isdp, mp) struct isa_device *isdp; @@ -381,7 +381,7 @@ config_isadev(isdp, mp) { config_isadev_c(isdp, mp, 0); } - + void reconfig_isadev(isdp, mp) struct isa_device *isdp; @@ -400,7 +400,7 @@ config_isadev_c(isdp, mp, reconfig) int id_alive; int last_alive; struct isa_driver *dp = isdp->id_driver; - + checkbits = 0; checkbits |= CC_DRQ; checkbits |= CC_IOADDR; @@ -464,11 +464,11 @@ config_isadev_c(isdp, mp, reconfig) } printf("\n"); /* - * Check for conflicts again. The driver may have - * changed *dvp. We should weaken the early check - * since the driver may have been able to change - * *dvp to avoid conflicts if given a chance. We - * already skip the early check for IRQs and force + * Check for conflicts again. The driver may have + * changed *dvp. We should weaken the early check + * since the driver may have been able to change + * *dvp to avoid conflicts if given a chance. We + * already skip the early check for IRQs and force * a check for IRQs in the next group of checks. */ checkbits |= CC_IRQ; @@ -497,12 +497,12 @@ config_isadev_c(isdp, mp, reconfig) } printf("\n"); } - } + } else { /* This code has not been tested.... */ if (isdp->id_irq) { INTRDIS(isdp->id_irq); - unregister_intr(ffs(isdp->id_irq) - 1, + unregister_intr(ffs(isdp->id_irq) - 1, isdp->id_intr); if (mp) INTRUNMASK(*mp, isdp->id_irq); @@ -593,7 +593,7 @@ eisa_generic_externalize(struct proc *p, struct kern_devconf *kdc, * during configuration of kernel, setup interrupt control unit */ void -isa_defaultirq() +isa_defaultirq() { int i; @@ -643,7 +643,7 @@ static short dmapageport[8] = void isa_dmacascade(unsigned chan) { if (chan > 7) - panic("isa_dmacascade: impossible request"); + panic("isa_dmacascade: impossible request"); /* set dma channel mode, and set dma channel mode */ if ((chan & 4) == 0) { @@ -670,7 +670,7 @@ void isa_dmastart(int flags, caddr_t addr, unsigned nbytes, unsigned chan) if ( chan > 7 || (chan < 4 && nbytes > (1<<16)) || (chan >= 4 && (nbytes > (1<<17) || (u_int)addr & 1))) - panic("isa_dmastart: impossible request"); + panic("isa_dmastart: impossible request"); if (isa_dmarangecheck(addr, nbytes, chan)) { if (dma_bounce[chan] == 0) @@ -818,7 +818,7 @@ static void (*isaphysmemunblock)(); /* needs to be a list */ */ caddr_t isa_allocphysmem(caddr_t va, unsigned length, void (*func)()) { - + isaphysmemunblock = func; while (isaphysmemflag & B_BUSY) { isaphysmemflag |= B_WANTED; @@ -844,7 +844,7 @@ isa_freephysmem(caddr_t va, unsigned length) { (*isaphysmemunblock)(); } } - + #define NMI_PARITY (1 << 7) #define NMI_IOCHAN (1 << 6) #define ENMI_WATCHDOG (1 << 7) @@ -856,7 +856,7 @@ isa_freephysmem(caddr_t va, unsigned length) { * return true to panic system, false to ignore. */ int -isa_nmi(cd) +isa_nmi(cd) int cd; { int isa_port = inb(0x61); @@ -930,7 +930,7 @@ struct isa_device *find_isadev(table, driverp, unit) while ((table->id_driver != driverp) || (table->id_unit != unit)) { if (table->id_driver == 0) return NULL; - + table++; } diff --git a/sys/amd64/isa/npx.c b/sys/amd64/isa/npx.c index aacff0dd0b19..0a5327941724 100644 --- a/sys/amd64/isa/npx.c +++ b/sys/amd64/isa/npx.c @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * from: @(#)npx.c 7.2 (Berkeley) 5/12/91 - * $Id: npx.c,v 1.21 1995/03/05 04:06:44 wpaul Exp $ + * $Id: npx.c,v 1.22 1995/04/12 20:48:01 wollman Exp $ */ #include "npx.h" @@ -280,7 +280,7 @@ npxprobe1(dvp) /* * Good, now check for a proper control word. */ - control = 0x5a5a; + control = 0x5a5a; fnstcw(&control); if ((control & 0x1f3f) == 0x033f) { hw_float = npx_exists = 1; @@ -344,7 +344,7 @@ npxattach(dvp) printf("npx%d: INT 16 interface\n", dvp->id_unit); else if (npx_irq13) ; /* higher level has printed "irq 13" */ -#if defined(MATH_EMULATE) || defined(GPL_MATH_EMULATE) +#if defined(MATH_EMULATE) || defined(GPL_MATH_EMULATE) else if (npx_exists) { printf("npx%d: error reporting broken; using 387 emulator\n", dvp->id_unit); |