--- np2/bios/bios1c.c	2003/12/08 00:55:30	1.3
+++ np2/bios/bios1c.c	2004/03/04 17:36:05	1.8
@@ -2,7 +2,6 @@
 #include	"parts.h"
 #include	"timemng.h"
 #include	"cpucore.h"
-#include	"memory.h"
 #include	"pccore.h"
 #include	"iocore.h"
 #include	"calendar.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 {
@@ -29,12 +28,12 @@ void bios0x1c(void) {
 	switch(CPU_AH) {
 		case 0x00:					// get system timer
 			calendar_get(buf);
-			i286_memstr_write(CPU_ES, CPU_BX, buf, 6);
+			MEML_WRITESTR(CPU_ES, CPU_BX, buf, 6);
 			break;
 
 		case 0x01:					// put system timer
-			i286_memstr_read(CPU_ES, CPU_BX, buf, 6);
-			mem[MEMB_MSW8] = buf[0];								// ver0.29
+			MEML_READSTR(CPU_ES, CPU_BX, buf, 6);
+			mem[MEMB_MSW8] = buf[0];
 			calendar_set(buf);
 			break;