--- np2/bios/bios.c	2004/02/29 03:10:02	1.49
+++ np2/bios/bios.c	2004/03/08 14:56:47	1.55
@@ -26,6 +26,55 @@ static const char neccheck[] = "Copyrigh
 						// 00/05/18 MS-DOS6.2 on PC-9801VX calling proc
 static const BYTE printmain[] = {0x90, 0x5a, 0x1f, 0xcf};
 
+typedef struct {
+	UINT8	port;
+	UINT8	data;
+} IODATA;
+
+static const IODATA iodata[] = {
+			// DMA
+				{0x29, 0x00}, {0x29, 0x01}, {0x29, 0x02}, {0x29, 0x03},
+				{0x27, 0x00}, {0x21, 0x00}, {0x23, 0x00}, {0x25, 0x00},
+				{0x1b, 0x00}, {0x11, 0x40},
+
+			// PIT
+				{0x77, 0x30}, {0x71, 0x00}, {0x71, 0x00},
+				{0x77, 0x76}, {0x73, 0xcd}, {0x73, 0x04},
+				{0x77, 0xb6},
+
+			// PIC
+				{0x00, 0x11}, {0x02, 0x08}, {0x02, 0x80}, {0x02, 0x1d},
+				{0x08, 0x11}, {0x0a, 0x10}, {0x0a, 0x07}, {0x0a, 0x09},
+				{0x02, 0x7d}, {0x0a, 0x71}};
+
+static const UINT8 msw_default[8] =
+							{0x48, 0x05, 0x04, 0x00, 0x01, 0x00, 0x00, 0x6e};
+
+
+static void bios_itfprepare(void) {
+
+const IODATA	*p;
+const IODATA	*pterm;
+
+	p = iodata;
+	pterm = iodata + (sizeof(iodata) / sizeof(IODATA));
+	while(p < pterm) {
+		iocore_out8(p->port, p->data);
+		p++;
+	}
+
+	// GDCの初期化。
+	// …
+}
+
+static void bios_memclear(void) {
+
+//	ZeroMemory(mem, 0xa0000);					// 何が原因だ？
+	ZeroMemory(mem + VRAM0_B, 0x18000);
+	ZeroMemory(mem + VRAM0_E, 0x08000);
+	ZeroMemory(mem + VRAM1_B, 0x18000);
+	ZeroMemory(mem + VRAM1_E, 0x08000);
+}
 
 static void bios_reinitbyswitch(void) {
 
@@ -108,7 +157,7 @@ static void bios_reinitbyswitch(void) {
 	}
 	mem[MEMB_F2DD_MODE] = 0xff;
 
-#if defined(SUPPORT_31KHZ)
+#if defined(SUPPORT_CRT31KHZ)
 	mem[MEMB_CRT_BIOS] = 0x80;
 #endif
 #if defined(SUPPORT_PC9821)
@@ -123,13 +172,6 @@ static void bios_reinitbyswitch(void) {
 	}
 }
 
-static void bios_memclear(void) {
-
-	ZeroMemory(mem, 0xa0000);
-	ZeroMemory(mem + VRAM1_B, 0x18000);
-	ZeroMemory(mem + VRAM1_E, 0x08000);
-}
-
 static void bios_vectorset(void) {
 
 	UINT	i;
@@ -269,12 +311,15 @@ void bios_initialize(void) {
 
 static void bios_boot(void) {
 
+	int		i;
+
 	if (!(sysport.c & 0x80)) {
 		CPU_SP = GETBIOSMEM16(0x00404);
 		CPU_SS = GETBIOSMEM16(0x00406);
 //		TRACEOUT(("CPU Reset... SS:SP = %.4x:%.4x", CPU_SS, CPU_SP));
 	}
 	else {
+		bios_itfprepare();
 		bios_memclear();
 		bios_vectorset();
 		bios0x09_init();
@@ -292,6 +337,11 @@ static void bios_boot(void) {
 			SETBIOSMEM16(0x004fc, 0xffff);
 		}
 		else {
+			if (!np2cfg.ITF_WORK) {
+				for (i=0; i<8; i++) {
+					mem[MEMB_MSW + (i*4)] = msw_default[i];
+				}
+			}
 			CPU_IP = 0x0002;
 		}
 	}
@@ -307,7 +357,7 @@ static void bios0x1f(void) {
 	UINT	l;
 
 	if (CPU_AH == 0x90) {
-		i286_memstr_read(CPU_ES, CPU_BX + 0x10, work, 0x10);
+		MEML_READSTR(CPU_ES, CPU_BX + 0x10, work, 0x10);
 		src = work[2] + (work[3] << 8) + (work[4] << 16) + CPU_SI;
 		dst = work[10] + (work[11] << 8) + (work[12] << 16) + CPU_DI;
 		leng = LOW16(CPU_CX - 1) + 1;
@@ -322,8 +372,8 @@ static void bios0x1f(void) {
 		TRACEOUT(("src:%08x dst:%08x leng:%08x", src, dst, leng));
 		do {
 			l = min(leng, 256);
-			i286_memx_read(src, work, l);
-			i286_memx_write(dst, work, l);
+			MEML_READ(src, work, l);
+			MEML_WRITE(dst, work, l);
 			src += l;
 			dst += l;
 			leng -= l;