--- np2/sound/fmtimer.c 2004/01/22 01:10:04 1.7 +++ np2/sound/fmtimer.c 2004/02/03 08:24:40 1.8 @@ -6,7 +6,7 @@ #include "fmboard.h" -static const BYTE irqtable[4] = {0x03, 0x0d, 0x0a, 0x0c}; +static const UINT8 irqtable[4] = {0x03, 0x0d, 0x0a, 0x0c}; void fmport_a(NEVENTITEM item) { @@ -92,12 +92,6 @@ static void set_fmtimerbevent(BOOL absol void fmtimer_reset(UINT irq) { ZeroMemory(&fmtimer, sizeof(fmtimer)); - -#if 0 // move - fmtimer.reg = 0x3f; - set_fmtimeraevent(NEVENT_ABSOLUTE); - set_fmtimerbevent(NEVENT_ABSOLUTE); -#endif fmtimer.intr = irq & 0xc0; fmtimer.intdisabel = irq & 0x10; fmtimer.irq = irqtable[irq >> 6]; @@ -122,7 +116,6 @@ void fmtimer_setreg(REG8 reg, REG8 value break; case 0x27: -#if 1 fmtimer.reg = value; fmtimer.status &= ~((value & 0x30) >> 4); if (value & 0x01) { @@ -144,16 +137,6 @@ void fmtimer_setreg(REG8 reg, REG8 value if (!(value & 0x03)) { pic_resetirq(fmtimer.irq); } -#else - fmtimer.reg = value; - fmtimer.status &= ~((value & 0x30) >> 4); - if ((value & 0x10) && (!nevent_iswork(NEVENT_FMTIMERA))) { - set_fmtimeraevent(NEVENT_ABSOLUTE); - } - if ((value & 0x20) && (!nevent_iswork(NEVENT_FMTIMERB))) { - set_fmtimerbevent(NEVENT_ABSOLUTE); - } -#endif break; } }