35c35
< * $Id: npx.c,v 1.5 1993/11/03 23:32:35 paul Exp $
---
> * $Id: npx.c,v 1.6 1994/01/03 07:55:43 davidg Exp $
117c117
< u_int npx0mask;
---
> u_int npx0_imask;
295c295
< npx0mask = dvp->id_irq; /* npxattach too late */
---
> npx0_imask = dvp->id_irq; /* npxattach too late */
531,532c531,532
< outb(IO_ICU1 + 1, old_icu1_mask & ~(IRQ_SLAVE | npx0mask));
< outb(IO_ICU2 + 1, old_icu2_mask & ~(npx0mask >> 8));
---
> outb(IO_ICU1 + 1, old_icu1_mask & ~(IRQ_SLAVE | npx0_imask));
> outb(IO_ICU2 + 1, old_icu2_mask & ~(npx0_imask >> 8));
544c544
< (icu1_mask & ~npx0mask) | (old_icu1_mask & npx0mask));
---
> (icu1_mask & ~npx0_imask) | (old_icu1_mask & npx0_imask));
546,547c546,547
< (icu2_mask & ~(npx0mask >> 8))
< | (old_icu2_mask & (npx0mask >> 8)));
---
> (icu2_mask & ~(npx0_imask >> 8))
> | (old_icu2_mask & (npx0_imask >> 8)));