--- np2/bios/bios.c	2004/01/29 10:04:05	1.35
+++ np2/bios/bios.c	2004/02/20 16:20:41	1.44
@@ -1,4 +1,5 @@
 #include	"compiler.h"
+#include	"strres.h"
 #include	"dosio.h"
 #include	"cpucore.h"
 #include	"pccore.h"
@@ -20,8 +21,6 @@
 
 	BOOL	biosrom = FALSE;
 
-static const char file_biosrom[] = "bios.rom";
-
 static const char neccheck[] = "Copyright (C) 1983 by NEC Corporation";
 
 						// 00/05/18 MS-DOS6.2 on PC-9801VX calling proc
@@ -59,7 +58,10 @@ static void bios_reinitbyswitch(void) {
 	}
 
 	mem[MEMB_BIOS_FLAG0] = 0x01;
-	prxcrt = 0x48;								// ver0.74
+	prxcrt = 0x08;
+	if (!(np2cfg.dipsw[0] & 0x01)) {			// dipsw1-1 on
+		prxcrt |= 0x40;
+	}
 	if (gdc.display & 2) {
 		prxcrt |= 0x04;							// color16
 	}
@@ -81,7 +83,7 @@ static void bios_reinitbyswitch(void) {
 	mem[MEMB_PRXDUPD] = prxdupd;
 
 	biosflag = 0x20;
-	if (pccore.cpumode & CPUMODE_8MHz) {
+	if (pccore.cpumode & CPUMODE_8MHZ) {
 		biosflag |= 0x80;
 	}
 	biosflag |= mem[0xa3fea] & 7;
@@ -120,7 +122,7 @@ static void bios_reinitbyswitch(void) {
 	}
 }
 
-static void bios_vectorset(void) {									// ver0.30
+static void bios_vectorset(void) {
 
 	UINT	i;
 
@@ -136,13 +138,12 @@ static void bios_vectorset(void) {						
 
 static void bios_screeninit(void) {
 
-	UINT	ax;
+	REG8	al;
 
-	ax = 0x0a04;
-	ax += (np2cfg.dipsw[1] & 0x04) >> 1;
-	ax += (np2cfg.dipsw[1] & 0x08) >> 3;
-	CPU_AX = ax;
-	bios0x18();
+	al = 4;
+	al += (np2cfg.dipsw[1] & 0x04) >> 1;
+	al += (np2cfg.dipsw[1] & 0x08) >> 3;
+	bios0x18_0a(al);
 }
 
 
@@ -158,10 +159,10 @@ static const UINT16 biosoffset[0x20] = {
 			BIOSOFST_EOIS,	BIOSOFST_EOIS,	BIOSOFST_EOIS,	BIOSOFST_EOIS,
 
 			BIOSOFST_18,	BIOSOFST_19,	BIOSOFST_1a,	BIOSOFST_1b,
-			BIOSOFST_1c,	BIOSOFST_IRET,	BIOSOFST_1e,	BIOSOFST_IRET};
+			BIOSOFST_1c,	BIOSOFST_IRET,	BIOSOFST_1e,	BIOSOFST_1f};
 
 
-void bios_init(void) {
+void bios_initialize(void) {
 
 	char	path[MAX_PATH];
 	FILEH	fh;
@@ -172,7 +173,7 @@ void bios_init(void) {
 
 	// まぁDISK BASIC動くようになるからいいんじゃないですか？
 	// BASIC BIOSは 8086コードのように見えるけど…
-	getbiospath(path, file_biosrom, sizeof(path));
+	getbiospath(path, str_biosrom, sizeof(path));
 	fh = file_open_rb(path);
 	if (fh != FILEH_INVALID) {
 		if (file_read(fh, mem + 0x0e8000, 0x18000) == 0x18000) {
@@ -192,14 +193,14 @@ void bios_init(void) {
 	}
 	SETBIOSMEM16(BIOS_BASE + BIOSOFST_IRET, 0x50cf);
 	SETBIOSMEM16(BIOS_BASE + BIOSOFST_WAIT, 0xcf90);
-	for (i=(BIOS_BASE+BIOSOFST_EOIM); i<=(BIOS_BASE+BIOSOFST_1c); i+=2) {
+	for (i=(BIOS_BASE+BIOSOFST_EOIM); i<=(BIOS_BASE+BIOSOFST_1f); i+=2) {
 		SETBIOSMEM16(i, 0xcf90);
 	}
 	CopyMemory(mem + BIOS_BASE + BIOSOFST_PRT, printmain, sizeof(printmain));
 
-	bios_vectorset();												// ver0.29
+	bios_vectorset();
 	if (!biosrom) {
-		lio_init();
+		lio_initialize();
 	}
 
 	SETBIOSMEM16(0xfd800, 0xcb90);
@@ -225,10 +226,10 @@ void bios_init(void) {
 	}
 
 	bios_reinitbyswitch();
-	mem[MEMB_CRT_STS_FLAG] = 0x84;
+//	mem[MEMB_CRT_STS_FLAG] = 0x84;		// -> bios_screeninit()
 //	mem[MEMB_BIOS_FLAG0] = 0x03;
-//	mem[MEMB_F2DD_MODE] = 0xff;										// ver0.29
-// 	SETBIOSMEM16(MEMW_DISK_EQUIP, 0x0003);							// ver0.29
+//	mem[MEMB_F2DD_MODE] = 0xff;
+// 	SETBIOSMEM16(MEMW_DISK_EQUIP, 0x0003);
 	mem[0x005ae] |= 0x03;											// ver0.31
 
 	CopyMemory(mem + 0x0fde00, keytable[0], 0x300);
@@ -287,16 +288,11 @@ UINT MEMCALL biosfunc(UINT32 adrs) {
 	UINT16	bootseg;
 
 	if ((CPU_ITFBANK) && (adrs >= 0xf8000) && (adrs < 0x100000)) {
-#if 1					// for epson ITF
+		// for epson ITF
 		return(0);
-#else
-		CPU_IP--;
-		CPU_REMCLOCK = -1;
-		return(1);
-#endif
 	}
 
-	switch(adrs) {													// ver0.30
+	switch(adrs) {
 		case BIOS_BASE + BIOSOFST_EOIM:
 			CPU_REMCLOCK -= 300;
 			iocore_out8(0x00, 0x20);
@@ -365,9 +361,14 @@ UINT MEMCALL biosfunc(UINT32 adrs) {
 			bios0x1c();
 			return(1);
 
+		case BIOS_BASE + BIOSOFST_1f:
+			CPU_REMCLOCK -= 200;
+			TRACEOUT(("unsupport protect bios"));
+			return(1);
+
 		case BIOS_BASE + BIOSOFST_WAIT:
 			CPU_STI;
-			if (fddmtr_biosbusy) {						// ver0.26
+			if (fddmtr.busy) {
 				CPU_IP--;
 				CPU_REMCLOCK = -1;
 			}
@@ -436,9 +437,16 @@ UINT MEMCALL biosfunc(UINT32 adrs) {
 			return(0);
 	}
 
-	if ((adrs >= 0xf9a00) && (adrs < 0x0f9a24)) {
-		if (!(adrs & 1)) {
-			bios_lio((BYTE)((adrs - 0xf9a00) >> 1));
+	if ((adrs >= 0xf9a00) && (adrs < 0x0f9a44)) {
+		if (!(adrs & 3)) {
+			bios_lio((REG8)((adrs - 0xf9a00) >> 2));
+		}
+		else {
+			if (nevent_iswork(NEVENT_GDCSLAVE)) {
+				CPU_IP--;
+				CPU_REMCLOCK = -1;
+				return(1);
+			}
 		}
 		return(0);
 	}