--- np2/bios/bios.c	2003/12/08 00:55:30	1.12
+++ np2/bios/bios.c	2003/12/27 11:55:22	1.19
@@ -1,7 +1,6 @@
 #include	"compiler.h"
 #include	"dosio.h"
 #include	"cpucore.h"
-#include	"memory.h"
 #include	"pccore.h"
 #include	"iocore.h"
 #include	"bios.h"
@@ -14,8 +13,11 @@
 #include	"fdfmt.h"
 #include	"keytable.res"
 #include	"itfrom.res"
+#include	"startup.res"
 
 
+#define	BIOS_SIMULATE
+
 	BOOL	biosrom = FALSE;
 
 static const char file_biosrom[] = "bios.rom";
@@ -25,22 +27,6 @@ static const char neccheck[] = "Copyrigh
 						// 00/05/18 MS-DOS6.2 on PC-9801VX calling proc
 static const BYTE printmain[] = {0x90, 0x5a, 0x1f, 0xcf};
 
-static const BYTE nosyscode[] = {
-			0xeb,0x05,0xbe,0x6f,0x00,0xeb,0x03,0xbe,0x47,0x00,0xb8,0x00,
-			0x10,0xbb,0x00,0x80,0x8e,0xd0,0x8b,0xe3,0x8c,0xc8,0x8e,0xd8,
-			0xb8,0x00,0xa0,0x8e,0xc0,0xb9,0x00,0x10,0xb8,0x20,0x00,0x33,
-			0xff,0xfc,0xf3,0xab,0xb0,0xe1,0xb9,0xe0,0x1f,0xaa,0x47,0xe2,
-			0xfc,0x2e,0xad,0x8b,0xf8,0x2e,0xad,0x85,0xc0,0x74,0x0a,0xab,
-			0x0a,0xe4,0x74,0xf5,0x83,0xc7,0x02,0xeb,0xf0,0xeb,0xfe,0xac,
-			0x07,0x05,0x37,0x05,0x39,0x05,0x46,0x05,0x60,0x05,0x47,0x05,
-			0x23,0x05,0x39,0x05,0x2f,0x04,0x72,0x05,0x3b,0x05,0x43,0x05,
-			0x48,0x04,0x37,0x04,0x46,0x04,0x2f,0x04,0x40,0x04,0x35,0x04,
-			0x24,0x00,0x00,0xae,0x07,0x42,0x00,0x41,0x00,0x53,0x00,0x49,
-			0x00,0x43,0x00,0x04,0x4e,0x15,0x2f,0x26,0x30,0x04,0x4b,0x04,
-			0x4f,0x20,0x00,0x42,0x00,0x49,0x00,0x4f,0x00,0x53,0x00,0x2e,
-			0x00,0x52,0x00,0x4f,0x00,0x4d,0x00,0x04,0x2c,0x29,0x2c,0x2d,
-			0x57,0x04,0x47,0x04,0x39,0x00,0x00};
-
 
 static void bios_reinitbyswitch(void) {
 
@@ -97,7 +83,7 @@ static void bios_reinitbyswitch(void) {
 	}
 	gdcs.textdisp |= GDCSCRN_EXT;
 
-	if ((pc.model >= PCMODEL_VX) && (usesound & 0x7e)) {
+	if (((pc.model & PCMODELMASK) >= PCMODEL_VX) && (usesound & 0x7e)) {
 		iocore_out8(0x188, 0x27);
 		iocore_out8(0x18a, 0x3f);
 	}
@@ -156,6 +142,7 @@ void bios_init(void) {
 		CopyMemory(mem + 0x0e8000, nosyscode, sizeof(nosyscode));
 	}
 
+#if defined(BIOS_SIMULATE)
 	// BIOS hookのアドレス変更
 	for (i=0; i<0x20; i++) {
 		STOREINTELWORD(mem + 0xfd868 + i*2, biosoffset[i]);
@@ -188,25 +175,7 @@ void bios_init(void) {
 	mem[0xffff0] = 0xea;
 	STOREINTELDWORD(mem + 0xffff1, 0xfd800000);
 
-#if 1
-	CopyMemory(mem + ITF_ADRS, itfrom, sizeof(itfrom));
-	mem[ITF_ADRS + 0x7ff0] = 0xea;
-	STOREINTELDWORD(mem + ITF_ADRS + 0x7ff1, 0xf8000000);
-#if 0
-fh = file_create("itf.rom");
-if (fh != FILEH_INVALID) {
-	file_write(fh, itfrom, sizeof(itfrom));
-	file_close(fh);
-}
-#endif
-#else
-	fh = file_open_c("itf.rom");
-	if (fh != FILEH_INVALID) {
-		file_read(fh, &mem[ITF_ADRS], 0x8000);
-		file_close(fh);
-	}
-#endif
-	if (!biosrom) {
+	if ((!biosrom) && (!(pc.model & PCMODEL_EPSON))) {
 		CopyMemory(mem + 0xe8dd8, neccheck, 0x25);
 		pos = LOADINTELWORD(itfrom + 2);
 		CopyMemory(mem + 0xf538e, itfrom + pos, 0x27);
@@ -223,6 +192,24 @@ if (fh != FILEH_INVALID) {
 
 	CopyMemory(mem + 0x0fde00, keytable[0], 0x300);
 	bios0x09_init();
+
+	CopyMemory(mem + ITF_ADRS, itfrom, sizeof(itfrom));
+	mem[ITF_ADRS + 0x7ff0] = 0xea;
+	STOREINTELDWORD(mem + ITF_ADRS + 0x7ff1, 0xf8000000);
+	if (pc.model & PCMODEL_EPSON) {
+		mem[ITF_ADRS + 0x7ff1] = 0x04;
+	}
+	else if ((pc.model & PCMODELMASK) == PCMODEL_VM) {
+		mem[ITF_ADRS + 0x7ff1] = 0x08;
+	}
+#else
+	fh = file_open_c("itf.rom");
+	if (fh != FILEH_INVALID) {
+		file_read(fh, &mem[ITF_ADRS], 0x8000);
+		file_close(fh);
+	}
+	extmem_init(np2cfg.EXTMEM);
+#endif
 }
 
 static void bios_boot(void) {
@@ -244,6 +231,7 @@ static void bios_boot(void) {
 	else {
 		CPU_SP = GETBIOSMEM16(0x00404);
 		CPU_SS = GETBIOSMEM16(0x00406);
+		TRACEOUT(("Protect Disable... SS:SP = %.4x:%.4x", CPU_SS, CPU_SP));
 	}
 }