--- np2/io/pic.c 2004/01/30 01:29:13 1.14 +++ np2/io/pic.c 2004/03/10 23:01:08 1.16 @@ -15,7 +15,7 @@ static const _PICITEM def_slave = { 0, {0, 0, 0, 0, 0, 0, 0, 0}, {7, 6, 5, 4, 3, 2, 1, 0}, {0, 0x10, 0x07, 0}, - 0x70, 0, 0, 0, + 0x71, 0, 0, 0, 0, 0, 0, 0}; @@ -120,7 +120,7 @@ void pic_irq(void) { nevent_reset(NEVENT_PICMASK); } // TRACEOUT(("hardware-int %.2x", (p->pi[0].icw[1] & 0xf8) | irq)); - CPU_INTERRUPT((REG8)((p->pi[0].icw[1] & 0xf8) | irq)); + CPU_INTERRUPT((REG8)((p->pi[0].icw[1] & 0xf8) | irq), 0); return; } if ((!p->pi[0].levels) || @@ -159,7 +159,7 @@ void pic_irq(void) { p->pi[0].level[p->pi[0].levels++] = sirq; } // TRACEOUT(("hardware-int %.2x", (p->pi[1].icw[1] & 0xf8) | irq)); - CPU_INTERRUPT((REG8)((p->pi[1].icw[1] & 0xf8) | irq)); + CPU_INTERRUPT((REG8)((p->pi[1].icw[1] & 0xf8) | irq), 0); } } } @@ -275,10 +275,6 @@ static void IOOUTCALL pic_o00(UINT port, } } -#if defined(TRACE) -extern int piccnt; -#endif - static void IOOUTCALL pic_o02(UINT port, REG8 dat) { PICITEM picp; @@ -296,9 +292,6 @@ static void IOOUTCALL pic_o02(UINT port, } #endif picp->imr = dat; -#if defined(TRACE) - piccnt++; -#endif } else { picp->icw[picp->writeicw] = dat;