--- Net2/arch/i386/isa/isa.c 2018/04/24 18:06:58 1.1.1.3 +++ Net2/arch/i386/isa/isa.c 2018/04/24 18:19:52 1.1.1.5 @@ -33,12 +33,18 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * @(#)isa.c 7.2 (Berkeley) 5/13/91 + * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 + * isa.c,v 1.26 1993/07/11 14:03:54 mycroft Exp */ -static char rcsid[] = "$Header: /var/lib/cvsd/net2/Net2/arch/i386/isa/isa.c,v 1.1.1.3 2018/04/24 18:06:58 root Exp $"; /* * code to manage AT bus + * + * 92/08/18 Frank P. MacLachlan (fpm@crash.cts.com): + * Fixed uninitialized variable problem and added code to deal + * with DMA page boundaries in isa_dmarangecheck(). Fixed word + * mode DMA count compution and reorganized DMA setup code in + * isa_dmastart() */ #include "param.h" @@ -49,169 +55,178 @@ static char rcsid[] = "$Header: /var/lib #include "uio.h" #include "syslog.h" #include "malloc.h" -#include "rlist.h" #include "machine/segments.h" +#include "machine/cpufunc.h" #include "vm/vm.h" #include "i386/isa/isa_device.h" #include "i386/isa/isa.h" #include "i386/isa/icu.h" #include "i386/isa/ic/i8237.h" #include "i386/isa/ic/i8042.h" +#include "i386/isa/timerreg.h" -int config_isadev(struct isa_device *, u_short *); -#ifdef notyet -struct rlist *isa_iomem; +/* sorry, has to be here, no place else really suitable */ +#include "machine/pc/display.h" +u_short *Crtat = (u_short *)MONO_BUF; + +/* +** Register definitions for DMA controller 1 (channels 0..3): +*/ +#define DMA1_CHN(c) (IO_DMA1 + 1*(2*(c))) /* addr reg for channel c */ +#define DMA1_SMSK (IO_DMA1 + 1*10) /* single mask register */ +#define DMA1_MODE (IO_DMA1 + 1*11) /* mode register */ +#define DMA1_FFC (IO_DMA1 + 1*12) /* clear first/last FF */ + +/* +** Register definitions for DMA controller 2 (channels 4..7): +*/ +#define DMA2_CHN(c) (IO_DMA1 + 2*(2*(c))) /* addr reg for channel c */ +#define DMA2_SMSK (IO_DMA2 + 2*10) /* single mask register */ +#define DMA2_MODE (IO_DMA2 + 2*11) /* mode register */ +#define DMA2_FFC (IO_DMA2 + 2*12) /* clear first/last FF */ + +int config_isadev(struct isa_device *, u_int *); +void config_attach(struct isa_driver *, struct isa_device *); +static void sysbeepstop(int); /* * Configure all ISA devices */ +void isa_configure() { struct isa_device *dvp; struct isa_driver *dp; + enable_intr(); splhigh(); INTREN(IRQ_SLAVE); - /*rlist_free(&isa_iomem, 0xa0000, 0xfffff);*/ - for (dvp = isa_devtab_tty; dvp; dvp++) - (void) config_isadev(dvp, &ttymask); - for (dvp = isa_devtab_bio; dvp; dvp++) - (void) config_isadev(dvp, &biomask); - for (dvp = isa_devtab_net; dvp; dvp++) - (void) config_isadev(dvp, &netmask); - for (dvp = isa_devtab_null; dvp; dvp++) - (void) config_isadev(dvp, 0); -#include "sl.h" -#if NSL > 0 - netmask |= ttymask; - ttymask |= netmask; -#endif -/* printf("biomask %x ttymask %x netmask %x\n", biomask, ttymask, netmask); */ + for (dvp = isa_devtab_tty; config_isadev(dvp,&ttymask); dvp++) + ; + for (dvp = isa_devtab_bio; config_isadev(dvp,&biomask); dvp++) + ; + for (dvp = isa_devtab_net; config_isadev(dvp,&netmask); dvp++) + ; + for (dvp = isa_devtab_null; config_isadev(dvp, (u_int *) NULL); dvp++) + ; + + impmask = ttymask | netmask; + + /* and the problem is... if netmask == 0, then the loopback + * code can do some really ugly things. + * workaround for this: if netmask == 0, set it to 0x8000, which + * is the value used by splsoftclock. this is nasty, but it + * should work until this interrupt system goes away. -- cgd + */ + if (netmask == 0) + netmask = 0x8000; /* same as for softclock. XXX */ + + /* biomask |= ttymask ; can some tty devices use buffers? */ + printf("biomask %x ttymask %x netmask %x impmask %x\n", + biomask, ttymask, netmask, impmask); splnone(); } /* * Configure an ISA device. */ +int config_isadev(isdp, mp) struct isa_device *isdp; - u_short *mp; + u_int *mp; { struct isa_driver *dp; - static short drqseen, irqseen; if (dp = isdp->id_driver) { - /* if a device with i/o memory, convert to virtual address */ if (isdp->id_maddr) { - extern unsigned int atdevbase; + extern u_int atdevbase; - isdp->id_maddr -= IOM_BEGIN; + isdp->id_maddr -= 0xa0000; /* XXX should be a define */ isdp->id_maddr += atdevbase; } isdp->id_alive = (*dp->probe)(isdp); + if (isdp->id_irq == (u_short)-1) + isdp->id_alive = 0; + /* + * Only print the I/O address range if id_alive != -1 + * Right now this is a temporary fix just for the new + * NPX code so that if it finds a 486 that can use trap + * 16 it will not report I/O addresses. + * Rod Grimes 04/26/94 + * + * XXX -- cgd + */ if (isdp->id_alive) { + printf("%s%d", dp->name, isdp->id_unit); + printf(" at 0x%x", isdp->id_iobase); + if ((isdp->id_iobase + isdp->id_alive - 1) != + isdp->id_iobase) + printf("-0x%x", + isdp->id_iobase + isdp->id_alive - 1); + if (isdp->id_irq != 0) + printf(" irq %d", ffs(isdp->id_irq)-1); + if (isdp->id_drq != -1) + printf(" drq %d", isdp->id_drq); + if (isdp->id_maddr != 0) + printf(" maddr 0x%x", kvtop(isdp->id_maddr)); + if (isdp->id_msize != 0) + printf("-0x%x", kvtop(isdp->id_maddr) + + isdp->id_msize - 1); + if (isdp->id_flags != 0) + printf(" flags 0x%x", isdp->id_flags); + printf(" on isa\n"); - printf("%s%d at port 0x%x ", dp->name, - isdp->id_unit, isdp->id_iobase); - - /* check for conflicts */ - if (irqseen & isdp->id_irq) { - printf("INTERRUPT CONFLICT - irq%d\n", - ffs(isdp->id_irq) - 1); - return (0); - } - if (isdp->id_drq != -1 - && (drqseen & (1<id_drq))) { - printf("DMA CONFLICT - drq%d\n", isdp->id_drq); - return (0); - } - /* NEED TO CHECK IOMEM CONFLICT HERE */ + config_attach(dp, isdp); - /* allocate and wire in device */ - if(isdp->id_irq) { + if (isdp->id_irq) { int intrno; intrno = ffs(isdp->id_irq)-1; - printf("irq %d ", intrno); - INTREN(isdp->id_irq); - if(mp)INTRMASK(*mp,isdp->id_irq); - setidt(NRSVIDT + intrno, isdp->id_intr, + setidt(ICU_OFFSET+intrno, isdp->id_intr, SDT_SYS386IGT, SEL_KPL); - irqseen |= isdp->id_irq; - } - if (isdp->id_drq != -1) { - printf("drq %d ", isdp->id_drq); - drqseen |= 1 << isdp->id_drq; + if(mp) + INTRMASK(*mp,isdp->id_irq); + INTREN(isdp->id_irq); } - - (*dp->attach)(isdp); - - printf("on isa\n"); } return (1); } else return(0); } -#else -/* - * Configure all ISA devices - */ -isa_configure() { - struct isa_device *dvp; - struct isa_driver *dp; - - splhigh(); - INTREN(IRQ_SLAVE); - for (dvp = isa_devtab_tty; config_isadev(dvp,&ttymask); dvp++); - for (dvp = isa_devtab_bio; config_isadev(dvp,&biomask); dvp++); - for (dvp = isa_devtab_net; config_isadev(dvp,&netmask); dvp++); - for (dvp = isa_devtab_null; config_isadev(dvp,0); dvp++); -#include "sl.h" -#if NSL > 0 - netmask |= ttymask; - ttymask |= netmask; -#endif - /* biomask |= ttymask ; can some tty devices use buffers? */ - /* printf("biomask %x ttymask %x netmask %x\n", biomask, ttymask, netmask); */ - splnone(); -} -/* - * Configure an ISA device. - */ -config_isadev(isdp, mp) - struct isa_device *isdp; - u_short *mp; +void +config_attach(struct isa_driver *dp, struct isa_device *isdp) { - struct isa_driver *dp; - - if (dp = isdp->id_driver) { - if (isdp->id_maddr) { - extern u_int atdevbase; + extern struct isa_device isa_subdev[]; + struct isa_device *dvp; - isdp->id_maddr -= 0xa0000; - isdp->id_maddr += atdevbase; - } - isdp->id_alive = (*dp->probe)(isdp); - if (isdp->id_alive) { - printf("%s%d", dp->name, isdp->id_unit); - (*dp->attach)(isdp); - printf(" at 0x%x ", isdp->id_iobase); - if(isdp->id_irq) { - int intrno; + if(isdp->id_masunit==-1) { + (void)(*dp->attach)(isdp); + return; + } - intrno = ffs(isdp->id_irq)-1; - printf("irq %d ", intrno); - INTREN(isdp->id_irq); - if(mp)INTRMASK(*mp,isdp->id_irq); - setidt(ICU_OFFSET+intrno, isdp->id_intr, - SDT_SYS386IGT, SEL_KPL); - } - if (isdp->id_drq != -1) printf("drq %d ", isdp->id_drq); - printf("on isa\n"); + if(isdp->id_masunit==0) { + for(dvp = isa_subdev; dvp->id_driver; dvp++) { + if (dvp->id_driver != dp) + continue; + if (dvp->id_masunit != isdp->id_unit) + continue; + if (dvp->id_physid == -1) + continue; + dvp->id_alive = (*dp->attach)(dvp); } - return (1); - } else return(0); + for(dvp = isa_subdev; dvp->id_driver; dvp++) { + if (dvp->id_driver != dp) + continue; + if (dvp->id_masunit != isdp->id_unit) + continue; + if (dvp->id_physid != -1) + continue; + dvp->id_alive = (*dp->attach)(dvp); + } + return; + } + printf("id_masunit has weird value\n"); } -#endif + #define IDTVEC(name) __CONCAT(X,name) /* default interrupt vector table entries */ @@ -228,39 +243,48 @@ static *defvec[16] = { /* out of range default interrupt vector gate entry */ extern IDTVEC(intrdefault); - + /* * Fill in default interrupt table (in case of spuruious interrupt * during configuration of kernel, setup interrupt control unit */ +void isa_defaultirq() { int i; /* icu vectors */ for (i = NRSVIDT ; i < NRSVIDT+ICU_LEN ; i++) setidt(i, defvec[i], SDT_SYS386IGT, SEL_KPL); - + /* out of range vectors */ for (i = NRSVIDT; i < NIDT; i++) setidt(i, &IDTVEC(intrdefault), SDT_SYS386IGT, SEL_KPL); - /* clear npx intr latch */ - outb(0xf1,0); - /* initialize 8259's */ outb(IO_ICU1, 0x11); /* reset; program device, four bytes */ outb(IO_ICU1+1, NRSVIDT); /* starting at this vector index */ outb(IO_ICU1+1, 1<<2); /* slave on line 2 */ +#ifdef AUTO_EOI_1 + outb(IO_ICU1+1, 2 | 1); /* auto EOI, 8086 mode */ +#else outb(IO_ICU1+1, 1); /* 8086 mode */ +#endif outb(IO_ICU1+1, 0xff); /* leave interrupts masked */ - outb(IO_ICU1, 2); /* default to ISR on read */ + outb(IO_ICU1, 0x0a); /* default to IRR on read */ +#ifdef REORDER_IRQ + outb(IO_ICU1, 0xc0 | (3 - 1)); /* pri order 3-7, 0-2 (com2 first) */ +#endif outb(IO_ICU2, 0x11); /* reset; program device, four bytes */ outb(IO_ICU2+1, NRSVIDT+8); /* staring at this vector index */ outb(IO_ICU2+1,2); /* my slave id is 2 */ +#ifdef AUTO_EOI_2 + outb(IO_ICU2+1, 2 | 1); /* auto EOI, 8086 mode */ +#else outb(IO_ICU2+1,1); /* 8086 mode */ +#endif outb(IO_ICU2+1, 0xff); /* leave interrupts masked */ - outb(IO_ICU2, 2); /* default to ISR on read */ + outb(IO_ICU2, 0x0a); /* default to IRR on read */ } /* region of physical memory known to be contiguous */ @@ -277,37 +301,38 @@ static short dmapageport[8] = * isa_dmacascade(): program 8237 DMA controller channel to accept * external dma control by a board. */ -void isa_dmacascade(unsigned chan) -{ int modeport; - +void +isa_dmacascade(unsigned chan) +{ if (chan > 7) panic("isa_dmacascade: impossible request"); /* set dma channel mode, and set dma channel mode */ - if ((chan & 4) == 0) - modeport = IO_DMA1 + 0xb; - else - modeport = IO_DMA2 + 0x16; - outb(modeport, DMA37MD_CASCADE | (chan & 3)); - if ((chan & 4) == 0) - outb(modeport - 1, chan & 3); - else - outb(modeport - 2, chan & 3); + if ((chan & 4) == 0) { + outb(DMA1_MODE, DMA37MD_CASCADE | chan); + outb(DMA1_SMSK, chan); + } else { + outb(DMA2_MODE, DMA37MD_CASCADE | (chan & 3)); + outb(DMA2_SMSK, chan & 3); + } } /* * isa_dmastart(): program 8237 DMA controller channel, avoid page alignment * problems by using a bounce buffer. */ -void isa_dmastart(int flags, caddr_t addr, unsigned nbytes, unsigned chan) +void +isa_dmastart(int flags, caddr_t addr, unsigned nbytes, unsigned chan) { vm_offset_t phys; - int modeport, waport, mskport; + int waport; caddr_t newaddr; - if (chan > 7 || nbytes > (1<<16)) + if ( chan > 7 + || (chan < 4 && nbytes > (1<<16)) + || (chan >= 4 && (nbytes > (1<<17) || (u_int)addr & 1))) panic("isa_dmastart: impossible request"); - if (isa_dmarangecheck(addr, nbytes)) { + if (isa_dmarangecheck(addr, nbytes, chan)) { if (dma_bounce[chan] == 0) dma_bounce[chan] = /*(caddr_t)malloc(MAXDMASZ, M_TEMP, M_WAITOK);*/ @@ -325,51 +350,60 @@ void isa_dmastart(int flags, caddr_t add /* translate to physical */ phys = pmap_extract(pmap_kernel(), (vm_offset_t)addr); - /* set dma channel mode, and reset address ff */ - if ((chan & 4) == 0) - modeport = IO_DMA1 + 0xb; - else - modeport = IO_DMA2 + 0x16; - if (flags & B_READ) - outb(modeport, DMA37MD_SINGLE|DMA37MD_WRITE|(chan&3)); - else - outb(modeport, DMA37MD_SINGLE|DMA37MD_READ|(chan&3)); - if ((chan & 4) == 0) - outb(modeport + 1, 0); - else - outb(modeport + 2, 0); - - /* send start address */ if ((chan & 4) == 0) { - waport = IO_DMA1 + (chan<<1); + /* + * Program one of DMA channels 0..3. These are + * byte mode channels. + */ + /* set dma channel mode, and reset address ff */ + if (flags & B_READ) + outb(DMA1_MODE, DMA37MD_SINGLE|DMA37MD_WRITE|chan); + else + outb(DMA1_MODE, DMA37MD_SINGLE|DMA37MD_READ|chan); + outb(DMA1_FFC, 0); + + /* send start address */ + waport = DMA1_CHN(chan); outb(waport, phys); outb(waport, phys>>8); - } else { - waport = IO_DMA2 + ((chan - 4)<<2); - outb(waport, phys>>1); - outb(waport, phys>>9); - } - outb(dmapageport[chan], phys>>16); + outb(dmapageport[chan], phys>>16); - /* send count */ - if ((chan & 4) == 0) { + /* send count */ outb(waport + 1, --nbytes); outb(waport + 1, nbytes>>8); + + /* unmask channel */ + outb(DMA1_SMSK, chan); } else { - nbytes <<= 1; + /* + * Program one of DMA channels 4..7. These are + * word mode channels. + */ + /* set dma channel mode, and reset address ff */ + if (flags & B_READ) + outb(DMA2_MODE, DMA37MD_SINGLE|DMA37MD_WRITE|(chan&3)); + else + outb(DMA2_MODE, DMA37MD_SINGLE|DMA37MD_READ|(chan&3)); + outb(DMA2_FFC, 0); + + /* send start address */ + waport = DMA2_CHN(chan - 4); + outb(waport, phys>>1); + outb(waport, phys>>9); + outb(dmapageport[chan], phys>>16); + + /* send count */ + nbytes >>= 1; outb(waport + 2, --nbytes); outb(waport + 2, nbytes>>8); - } - /* unmask channel */ - if ((chan & 4) == 0) - mskport = IO_DMA1 + 0x0a; - else - mskport = IO_DMA2 + 0x14; - outb(mskport, chan & 3); + /* unmask channel */ + outb(DMA2_SMSK, chan & 3); + } } -void isa_dmadone(int flags, caddr_t addr, int nbytes, int chan) +void +isa_dmadone(int flags, caddr_t addr, int nbytes, int chan) { /* copy bounce buffer on read */ @@ -382,12 +416,15 @@ void isa_dmadone(int flags, caddr_t addr /* * Check for problems with the address range of a DMA transfer - * (non-contiguous physical pages, outside of bus address space). + * (non-contiguous physical pages, outside of bus address space, + * crossing DMA page boundaries). * Return true if special handling needed. */ -isa_dmarangecheck(caddr_t va, unsigned length) { - vm_offset_t phys, priorpage, endva; +int +isa_dmarangecheck(caddr_t va, unsigned length, unsigned chan) { + vm_offset_t phys, priorpage = 0, endva; + u_int dma_pgmsk = (chan & 4) ? ~(128*1024-1) : ~(64*1024-1); endva = (vm_offset_t)round_page(va + length); for (; va < (caddr_t) endva ; va += NBPG) { @@ -397,8 +434,13 @@ isa_dmarangecheck(caddr_t va, unsigned l panic("isa_dmacheck: no physical page present"); if (phys > ISARAM_END) return (1); - if (priorpage && priorpage + NBPG != phys) - return (1); + if (priorpage) { + if (priorpage + NBPG != phys) + return (1); + /* check if crossing a DMA page boundary */ + if (((u_int)priorpage ^ (u_int)phys) & dma_pgmsk) + return (1); + } priorpage = phys; } return (0); @@ -423,7 +465,7 @@ isa_allocphysmem(caddr_t va, unsigned le isaphysmemunblock = func; while (isaphysmemflag & B_BUSY) { isaphysmemflag |= B_WANTED; - sleep(&isaphysmemflag, PRIBIO); + sleep((caddr_t)&isaphysmemflag, PRIBIO); } isaphysmemflag |= B_BUSY; @@ -440,7 +482,7 @@ isa_freephysmem(caddr_t va, unsigned len isaphysmemflag &= ~B_BUSY; if (isaphysmemflag & B_WANTED) { isaphysmemflag &= B_WANTED; - wakeup(&isaphysmemflag); + wakeup((caddr_t)&isaphysmemflag); if (isaphysmemunblock) (*isaphysmemunblock)(); } @@ -450,6 +492,7 @@ isa_freephysmem(caddr_t va, unsigned len * Handle a NMI, possibly a machine check. * return true to panic system, false to ignore. */ +int isa_nmi(cd) { log(LOG_CRIT, "\nNMI port 61 %x, port 70 %x\n", inb(0x61), inb(0x70)); @@ -459,75 +502,194 @@ isa_nmi(cd) { /* * Caught a stray interrupt, notify */ +void isa_strayintr(d) { -#ifdef notdef /* DON'T BOTHER FOR NOW! */ /* for some reason, we get bursts of intr #7, even if not enabled! */ - log(LOG_ERR,"ISA strayintr %x", d); -#endif + /* + * Well the reason you got bursts of intr #7 is because someone + * raised an interrupt line and dropped it before the 8259 could + * prioritize it. This is documented in the intel data book. This + * means you have BAD hardware! I have changed this so that only + * the first 5 get logged, then it quits logging them, and puts + * out a special message. rgrimes 3/25/1993 + */ + extern u_long intrcnt_stray; + + intrcnt_stray++; + if (intrcnt_stray <= 5) + log(LOG_ERR,"ISA strayintr %x\n", d); + if (intrcnt_stray == 5) + log(LOG_CRIT,"Too many ISA strayintr not logging any more\n"); } /* - * Wait "n" microseconds. Relies on timer 0 to have 1Mhz clock, regardless - * of processor board speed. Note: timer had better have been programmed - * before this is first used! + * Wait "n" microseconds. + * Relies on timer 1 counting down from (TIMER_FREQ / hz) at + * (1 * TIMER_FREQ) Hz. + * Note: timer had better have been programmed before this is first used! + * (Note that we use `rate generator' mode, which counts at 1:1; `square + * wave' mode counts at 2:1). */ -DELAY(n) { - int tick = getit(0,0) & 1; +#define CF (1 * TIMER_FREQ) - while (n--) { - /* wait approximately 1 micro second */ - while (tick == getit(0,0) & 1) ; - - tick = getit(0,0) & 1; - } -} +extern int hz; /* XXX - should be elsewhere */ -getit(unit, timer) { - int port = (unit ? IO_TIMER2 : IO_TIMER1) + timer, val; +void +DELAY(n) + int n; +{ + int counter_limit; + int prev_tick; + int tick; + int ticks_left; + int sec; + int usec; + +#ifdef DELAYDEBUG + int gettick_calls = 1; + int n1; + static int state = 0; + + if (state == 0) { + state = 1; + for (n1 = 1; n1 <= 10000000; n1 *= 10) + DELAY(n1); + state = 2; + } + if (state == 1) + printf("DELAY(%d)...", n); +#endif - val = inb(port); - val = (inb(port) << 8) + val; - return (val); + /* + * Read the counter first, so that the rest of the setup overhead is + * counted. Guess the initial overhead is 20 usec (on most systems it + * takes about 1.5 usec for each of the i/o's in gettick(). The loop + * takes about 6 usec on a 486/33 and 13 usec on a 386/20. The + * multiplications and divisions to scale the count take a while). + */ + prev_tick = gettick(); + n -= 20; + + /* + * Calculate (n * (CF / 1e6)) without using floating point and without + * any avoidable overflows. + */ + sec = n / 1000000; + usec = n - sec * 1000000; + ticks_left = sec * CF + + usec * (CF / 1000000) + + usec * ((CF % 1000000) / 1000) / 1000 + + usec * (CF % 1000) / 1000000; + + counter_limit = TIMER_FREQ / hz; + while (ticks_left > 0) { + tick = gettick(); +#ifdef DELAYDEBUG + ++gettick_calls; +#endif + if (tick > prev_tick) + ticks_left -= prev_tick - (tick - counter_limit); + else + ticks_left -= prev_tick - tick; + prev_tick = tick; + } +#ifdef DELAYDEBUG + if (state == 1) + printf(" %d calls to gettick() at %d usec each\n", + gettick_calls, (n + 5) / gettick_calls); +#endif } -extern int hz; +int +gettick() { + int high; + int low; + + /* + * Protect ourself against interrupts. + */ + disable_intr(); + /* + * Latch the count for 'timer' (cc00xxxx, c = counter, x = any). + */ + outb(TIMER_MODE, TIMER_SEL0 | TIMER_LATCH); + low = inb(TIMER_CNTR0); + high = inb(TIMER_CNTR0); + enable_intr(); + return ((high << 8) | low); +} static beeping; -static -sysbeepstop(f) +static void +sysbeepstop(int f) { + int s = splhigh(); + /* disable counter 2 */ + disable_intr(); outb(0x61, inb(0x61) & 0xFC); + enable_intr(); if (f) - timeout(sysbeepstop, 0, f); + timeout((timeout_t)sysbeepstop, (caddr_t)0, f); else beeping = 0; + + splx(s); } -void sysbeep(int pitch, int period) +void +sysbeep(int pitch, int period) { + int s = splhigh(); + static int last_pitch, last_period; - outb(0x61, inb(0x61) | 3); /* enable counter 2 */ - outb(0x43, 0xb6); /* set command for counter 2, 2 byte write */ - - outb(0x42, pitch); - outb(0x42, (pitch>>8)); - - if (!beeping) { - beeping = period; - timeout(sysbeepstop, period/2, period); + if (beeping) { + untimeout((timeout_t)sysbeepstop, (caddr_t)(last_period/2)); + untimeout((timeout_t)sysbeepstop, (caddr_t)0); + } + if (!beeping || last_pitch != pitch) { + /* + * XXX - move timer stuff to clock.c. + */ + disable_intr(); + outb(TIMER_MODE, TIMER_SEL2|TIMER_16BIT|TIMER_SQWAVE); + outb(TIMER_CNTR2, TIMER_DIV(pitch)%256); + outb(TIMER_CNTR2, TIMER_DIV(pitch)/256); + outb(0x61, inb(0x61) | 3); /* enable counter 2 */ + enable_intr(); } + last_pitch = pitch; + beeping = last_period = period; + timeout((timeout_t)sysbeepstop, (caddr_t)(period/2), period); + + splx(s); } /* * Pass command to keyboard controller (8042) */ -unsigned kbc_8042cmd(val) { - +unsigned +kbc_8042cmd(int val) +{ while (inb(KBSTATP)&KBS_IBF); if (val) outb(KBCMDP, val); while (inb(KBSTATP)&KBS_IBF); return (inb(KBDATAP)); } + +/* + * Return nonzero if a (masked) irq is pending for a given device. + */ +int +isa_irq_pending(dvp) + struct isa_device *dvp; +{ + unsigned id_irq; + + id_irq = (unsigned short) dvp->id_irq; /* XXX silly type in struct */ + if (id_irq & 0xff) + return (inb(IO_ICU1) & id_irq); + return (inb(IO_ICU2) & (id_irq >> 8)); +}