--- np2/bios/bios1c.c	2003/10/16 17:58:22	1.1
+++ np2/bios/bios1c.c	2004/02/19 11:32:11	1.7
@@ -1,10 +1,9 @@
 #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	"parts.h"
 #include	"calendar.h"
 #include	"bios.h"
 #include	"biosmem.h"
@@ -13,7 +12,7 @@
 void bios0x1c_03(void) {
 
 	iocore_out8(0x71, 0x00);
-	if (pc.cpumode & CPUMODE_8MHz) {
+	if (pccore.cpumode & CPUMODE_8MHZ) {
 		iocore_out8(0x71, 0x4e);				// 4MHz
 	}
 	else {
@@ -26,22 +25,22 @@ void bios0x1c(void) {
 
 	BYTE	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);
+			i286_memstr_write(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
+			i286_memstr_read(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;