--- np2/io/artic.c	2004/01/15 14:06:58	1.5
+++ np2/io/artic.c	2005/04/05 18:43:52	1.7
@@ -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) {