--- np2/bios/bios1c.c	2003/10/21 11:22:05	1.2
+++ np2/bios/bios1c.c	2005/05/20 13:59:46	1.11
@@ -1,8 +1,7 @@
 #include	"compiler.h"
 #include	"parts.h"
 #include	"timemng.h"
-#include	"i286.h"
-#include	"memory.h"
+#include	"cpucore.h"
 #include	"pccore.h"
 #include	"iocore.h"
 #include	"calendar.h"
@@ -10,44 +9,38 @@
 #include	"biosmem.h"
 
 
-void bios0x1c_03(void) {
-
-	iocore_out8(0x71, 0x00);
-	if (pc.cpumode & CPUMODE_8MHz) {
-		iocore_out8(0x71, 0x4e);				// 4MHz
-	}
-	else {
-		iocore_out8(0x71, 0x60);				// 5MHz
-	}
-	pic.pi[0].imr &= ~(PIC_SYSTEMTIMER);
-}
-
 void bios0x1c(void) {
 
-	BYTE	buf[6];
+	UINT8	buf[6];
 
-	switch(I286_AH) {
+	switch(CPU_AH) {
 		case 0x00:					// get system timer
 			calendar_get(buf);
-			i286_memstr_write(I286_ES, I286_BX, buf, 6);
+			MEMR_WRITES(CPU_ES, CPU_BX, buf, 6);
 			break;
 
 		case 0x01:					// put system timer
-			i286_memstr_read(I286_ES, I286_BX, buf, 6);
-			mem[MEMB_MSW8] = buf[0];								// ver0.29
+			MEMR_READS(CPU_ES, CPU_BX, buf, 6);
+			mem[MEMB_MSW8] = buf[0];
 			calendar_set(buf);
 			break;
 
 		case 0x02:					// set interval timer (single)
-			SETBIOSMEM16(0x0001c, I286_BX);
-			SETBIOSMEM16(0x0001e, I286_ES);
-			SETBIOSMEM16(0x0058a, I286_CX);
+			SETBIOSMEM16(0x0001c, CPU_BX);
+			SETBIOSMEM16(0x0001e, CPU_ES);
+			SETBIOSMEM16(0x0058a, CPU_CX);
 			iocore_out8(0x77, 0x36);
-			bios0x1c_03();
-			break;
+			/* through */
 
 		case 0x03:					// continue interval timer
-			bios0x1c_03();
+			iocore_out8(0x71, 0x00);
+			if (pccore.cpumode & CPUMODE_8MHZ) {
+				iocore_out8(0x71, 0x4e);				// 4MHz
+			}
+			else {
+				iocore_out8(0x71, 0x60);				// 5MHz
+			}
+			pic.pi[0].imr &= ~(PIC_SYSTEMTIMER);
 			break;
 	}
 }