--- np2/bios/Attic/bios02.c	2003/10/16 17:58:19	1.1
+++ np2/bios/Attic/bios02.c	2004/03/07 23:04:50	1.5
@@ -1,6 +1,5 @@
 #include	"compiler.h"
-#include	"i286.h"
-#include	"memory.h"
+#include	"cpucore.h"
 #include	"pccore.h"
 #include	"iocore.h"
 #include	"bios.h"
@@ -17,8 +16,8 @@ static const char msg4[] = " MEMORY";
 static UINT16 textout(UINT16 ptr, const char *str) {
 
 	while(*str) {
-		i286_membyte_write(0xa000, ptr, *str);
-		i286_membyte_write(0xa200, ptr, 0x43);
+		MEML_WRITE8(0xa000, ptr, (UINT8)*str);
+		MEML_WRITE8(0xa200, ptr, 0x43);
 		str++;
 		ptr += 2;
 	}
@@ -42,8 +41,8 @@ void bios0x02(void) {
 		textout(ptr, msg4);
 		mem[0x004f8] = 0xfa;		// cli
 		mem[0x004f9] = 0xf4;		// hlt
-		I286_CS = 0;
-		I286_IP = 0x4f8;
+		CPU_CS = 0;
+		CPU_IP = 0x4f8;
 	}
 }