--- np2/io/artic.c 2004/01/15 14:06:58 1.5 +++ np2/io/artic.c 2007/11/03 00:00:20 1.8 @@ -10,13 +10,13 @@ void artic_callback(void) { SINT32 leng; mul = pccore.multiple; - if (pccore.baseclock == PCBASECLOCK25) { - mul *= 16; + if (pccore.cpumode & CPUMODE_8MHZ) { + mul *= 13; } else { - mul *= 13; + mul *= 16; } - leng = CPU_CLOCK + CPU_BASECLOCK + CPU_REMCLOCK; + leng = CPU_CLOCK + CPU_BASECLOCK - CPU_REMCLOCK; leng *= 2; leng -= artic.lastclk2; if (leng > 0) { @@ -32,13 +32,13 @@ static UINT32 artic_getcnt(void) { SINT32 leng; mul = pccore.multiple; - if (pccore.baseclock != PCBASECLOCK20) { - mul *= 16; + if (pccore.cpumode & CPUMODE_8MHZ) { + mul *= 13; } else { - mul *= 13; + mul *= 16; } - leng = CPU_CLOCK + CPU_BASECLOCK + CPU_REMCLOCK; + leng = CPU_CLOCK + CPU_BASECLOCK - CPU_REMCLOCK; leng *= 2; leng -= artic.lastclk2; if (leng > 0) { @@ -79,9 +79,11 @@ static REG8 IOINPCALL artic_i5f(UINT por // ---- I/F -void artic_reset(void) { +void artic_reset(const NP2CFG *pConfig) { ZeroMemory(&artic, sizeof(artic)); + + (void)pConfig; } void artic_bind(void) {