--- np2/bios/bios.c	2004/02/20 16:20:41	1.44
+++ 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) {
 
@@ -62,7 +111,7 @@ static void bios_reinitbyswitch(void) {
 	if (!(np2cfg.dipsw[0] & 0x01)) {			// dipsw1-1 on
 		prxcrt |= 0x40;
 	}
-	if (gdc.display & 2) {
+	if (gdc.display & (1 << GDCDISP_ANALOG)) {
 		prxcrt |= 0x04;							// color16
 	}
 	if (!(np2cfg.dipsw[0] & 0x80)) {			// dipsw1-8 on
@@ -94,12 +143,6 @@ static void bios_reinitbyswitch(void) {
 	mem[MEMB_EXPMMSZ] = (BYTE)(pccore.extmem << 3);
 	mem[MEMB_CRT_RASTER] = 0x0f;
 
-	gdc.display &= ~4;
-	if (!(np2cfg.dipsw[0] & 0x04)) {			// dipsw1-3 on
-		gdc.display |= 4;
-	}
-	gdcs.textdisp |= GDCSCRN_EXT;
-
 	// FDD initialize
 	SETBIOSMEM32(MEMD_F2DD_POINTER, 0xfd801ad7);
 	SETBIOSMEM32(MEMD_F2HD_POINTER, 0xfd801aaf);
@@ -114,6 +157,13 @@ static void bios_reinitbyswitch(void) {
 	}
 	mem[MEMB_F2DD_MODE] = 0xff;
 
+#if defined(SUPPORT_CRT31KHZ)
+	mem[MEMB_CRT_BIOS] = 0x80;
+#endif
+#if defined(SUPPORT_PC9821)
+	mem[0x45c] = 0x40;
+#endif
+
 	// IDE initialize
 	if (pccore.hddif & PCHDD_IDE) {
 		mem[MEMB_SYS_TYPE] |= 0x80;		// IDE
@@ -198,7 +248,7 @@ void bios_initialize(void) {
 	}
 	CopyMemory(mem + BIOS_BASE + BIOSOFST_PRT, printmain, sizeof(printmain));
 
-	bios_vectorset();
+//	bios_vectorset();
 	if (!biosrom) {
 		lio_initialize();
 	}
@@ -225,7 +275,7 @@ void bios_initialize(void) {
 		CopyMemory(mem + 0xf538e, itfrom + pos, 0x27);
 	}
 
-	bios_reinitbyswitch();
+//	bios_reinitbyswitch();
 //	mem[MEMB_CRT_STS_FLAG] = 0x84;		// -> bios_screeninit()
 //	mem[MEMB_BIOS_FLAG0] = 0x03;
 //	mem[MEMB_F2DD_MODE] = 0xff;
@@ -233,7 +283,7 @@ void bios_initialize(void) {
 	mem[0x005ae] |= 0x03;											// ver0.31
 
 	CopyMemory(mem + 0x0fde00, keytable[0], 0x300);
-	bios0x09_init();
+//	bios0x09_init();
 
 	CopyMemory(mem + ITF_ADRS, itfrom, sizeof(itfrom));
 	mem[ITF_ADRS + 0x7ff0] = 0xea;
@@ -261,27 +311,78 @@ void bios_initialize(void) {
 
 static void bios_boot(void) {
 
-	if (sysport.c & 0x80) {
-		if (!(sysport.c & 0x20)) {
-			bios_reinitbyswitch();
-		}
-		CPU_CS = 0x0000;
-		CPU_IP = 0x04f8;
-		CPU_DS = 0x0000;
-		CPU_DX = 0x43d;
-		CPU_AL = 0x10;
-		mem[0x004f8] = 0xee;		// out	dx, al
-		mem[0x004f9] = 0xea;		// call	far
-		SETBIOSMEM16(0x004fa, 0x0000);
-		SETBIOSMEM16(0x004fc, 0xffff);
-	}
-	else {
+	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();
+		bios_reinitbyswitch();
+
+		if (sysport.c & 0x20) {
+			CPU_CS = 0x0000;
+			CPU_IP = 0x04f8;
+			CPU_DS = 0x0000;
+			CPU_DX = 0x43d;
+			CPU_AL = 0x10;
+			mem[0x004f8] = 0xee;		// out	dx, al
+			mem[0x004f9] = 0xea;		// call	far
+			SETBIOSMEM16(0x004fa, 0x0000);
+			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;
+		}
+	}
 }
 
+// テスト(こんなんじゃだめぽ
+static void bios0x1f(void) {
+
+	BYTE	work[256];
+	UINT32	src;
+	UINT32	dst;
+	UINT	leng;
+	UINT	l;
+
+	if (CPU_AH == 0x90) {
+		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;
+		TRACEOUT(("protect bios: memmove"));
+		TRACEOUT(("%.2x %.2x %.2x %.2x %.2x %.2x %.2x %.2x",
+				work[0], work[1], work[2], work[3],
+				work[4], work[5], work[6], work[7]));
+		TRACEOUT(("%.2x %.2x %.2x %.2x %.2x %.2x %.2x %.2x",
+				work[8], work[9], work[10], work[11],
+				work[12], work[13], work[14], work[15]));
+		TRACEOUT(("SI=%.4x DI=%.4x CX=%.4x", CPU_SI, CPU_DI, CPU_CX));
+		TRACEOUT(("src:%08x dst:%08x leng:%08x", src, dst, leng));
+		do {
+			l = min(leng, 256);
+			MEML_READ(src, work, l);
+			MEML_WRITE(dst, work, l);
+			src += l;
+			dst += l;
+			leng -= l;
+		} while(leng);
+	}
+	else {
+		TRACEOUT(("unsupport protect bios AH=%.2x", CPU_AH));
+	}
+}
 
 UINT MEMCALL biosfunc(UINT32 adrs) {
 
@@ -363,7 +464,7 @@ UINT MEMCALL biosfunc(UINT32 adrs) {
 
 		case BIOS_BASE + BIOSOFST_1f:
 			CPU_REMCLOCK -= 200;
-			TRACEOUT(("unsupport protect bios"));
+			bios0x1f();
 			return(1);
 
 		case BIOS_BASE + BIOSOFST_WAIT:
@@ -439,6 +540,7 @@ UINT MEMCALL biosfunc(UINT32 adrs) {
 
 	if ((adrs >= 0xf9a00) && (adrs < 0x0f9a44)) {
 		if (!(adrs & 3)) {
+			CPU_REMCLOCK -= 500;
 			bios_lio((REG8)((adrs - 0xf9a00) >> 2));
 		}
 		else {