--- np2/bios/bios.c	2004/06/04 16:11:02	1.66
+++ np2/bios/bios.c	2005/03/16 06:05:17	1.75
@@ -56,7 +56,7 @@ const IODATA	*pterm;
 	gdc_biosreset();
 
 	p = iodata;
-	pterm = iodata + (sizeof(iodata) / sizeof(IODATA));
+	pterm = iodata + NELEMENTS(iodata);
 	while(p < pterm) {
 		iocore_out8(p->port, p->data);
 		p++;
@@ -82,9 +82,10 @@ static void bios_memclear(void) {
 
 static void bios_reinitbyswitch(void) {
 
-	BYTE	prxcrt;
-	BYTE	prxdupd;
-	BYTE	biosflag;
+	UINT8	prxcrt;
+	UINT8	prxdupd;
+	UINT8	biosflag;
+	UINT8	extmem;
 	UINT8	boot;
 
 	if (!(np2cfg.dipsw[2] & 0x80)) {
@@ -132,7 +133,12 @@ static void bios_reinitbyswitch(void) {
 		biosflag |= 0x40;
 	}
 	mem[MEMB_BIOS_FLAG1] = biosflag;
-	mem[MEMB_EXPMMSZ] = (BYTE)(pccore.extmem << 3);
+	extmem = pccore.extmem;
+	extmem = min(extmem, 14);
+	mem[MEMB_EXPMMSZ] = (UINT8)(extmem << 3);
+	if (pccore.extmem >= 15) {
+		mem[0x0594] = pccore.extmem - 15;
+	}
 	mem[MEMB_CRT_RASTER] = 0x0f;
 
 	// FDD initialize
@@ -147,12 +153,14 @@ static void bios_reinitbyswitch(void) {
 		fddbios_equip(0, TRUE);
 		mem[MEMB_BIOS_FLAG0] &= ~0x02;
 	}
+	mem[MEMB_F2HD_MODE] = 0xff;
 	mem[MEMB_F2DD_MODE] = 0xff;
 
 #if defined(SUPPORT_CRT31KHZ)
-	mem[MEMB_CRT_BIOS] = 0x80;
+	mem[MEMB_CRT_BIOS] |= 0x80;
 #endif
 #if defined(SUPPORT_PC9821)
+	mem[MEMB_CRT_BIOS] |= 0x04;		// 05/02/03
 	mem[0x45c] = 0x40;
 #endif
 
@@ -190,18 +198,33 @@ static void bios_screeninit(void) {
 	bios0x18_0a(al);
 }
 
+static void setbiosseed(UINT8 *ptr, UINT size, UINT seedpos) {
+
+	UINT8	x;
+	UINT8	y;
+	UINT	i;
+
+	x = 0;
+	y = 0;
+	for (i=0; i<size; i+=2) {
+		x += ptr[i + 0];
+		y += ptr[i + 1];
+	}
+	ptr[seedpos + 0] -= x;
+	ptr[seedpos + 1] -= y;
+}
 
 void bios_initialize(void) {
 
 	BOOL	biosrom;
-	char	path[MAX_PATH];
+	OEMCHAR	path[MAX_PATH];
 	FILEH	fh;
 	UINT	i;
 	UINT32	tmp;
 	UINT	pos;
 
 	biosrom = FALSE;
-	getbiospath(path, str_biosrom, sizeof(path));
+	getbiospath(path, str_biosrom, NELEMENTS(path));
 	fh = file_open_rb(path);
 	if (fh != FILEH_INVALID) {
 		biosrom = (file_read(fh, mem + 0x0e8000, 0x18000) == 0x18000);
@@ -215,16 +238,24 @@ void bios_initialize(void) {
 			tmp = LOADINTELDWORD(mem + 0xf0000 + i);
 			if (tmp == 0x506e5024) {
 				TRACEOUT(("found PnP BIOS at %.5x", 0xf0000 + i));
-				STOREINTELDWORD(mem + 0xf0000 + i, 0x32504e24);
+				mem[0xf0000 + i] = 0x6e;
+				mem[0xf0002 + i] = 0x24;
+				break;
 			}
 		}
 	}
 	else {
 		CopyMemory(mem + 0x0e8000, nosyscode, sizeof(nosyscode));
+		if ((!biosrom) && (!(pccore.model & PCMODEL_EPSON))) {
+			CopyMemory(mem + 0xe8dd8, neccheck, 0x25);
+			pos = LOADINTELWORD(itfrom + 2);
+			CopyMemory(mem + 0xf538e, itfrom + pos, 0x27);
+		}
+		setbiosseed(mem + 0x0e8000, 0x10000, 0xb1f0);
 	}
 
 #if defined(SUPPORT_PC9821)
-	getbiospath(path, "bios9821.rom", sizeof(path));
+	getbiospath(path, OEMTEXT("bios9821.rom"), sizeof(path));
 	fh = file_open_rb(path);
 	if (fh != FILEH_INVALID) {
 		if (file_read(fh, mem + 0x0d8000, 0x2000) == 0x2000) {
@@ -234,6 +265,16 @@ void bios_initialize(void) {
 		}
 		file_close(fh);
 	}
+#if defined(BIOS_SIMULATE)
+	mem[0xf8e80] = 0x98;
+	mem[0xf8e81] = 0x21;
+	mem[0xf8e82] = 0x1f;
+	mem[0xf8e83] = 0x20;	// Model Number?
+	mem[0xf8e84] = 0x2c;
+	mem[0xf8e85] = 0xb0;
+
+	// mem[0xf8eaf] = 0x21;		// <- これって何だっけ？
+#endif
 #endif
 
 #if defined(BIOS_SIMULATE)
@@ -256,12 +297,6 @@ void bios_initialize(void) {
 	mem[0xffff0] = 0xea;
 	STOREINTELDWORD(mem + 0xffff1, 0xfd800000);
 
-	if ((!biosrom) && (!(pccore.model & PCMODEL_EPSON))) {
-		CopyMemory(mem + 0xe8dd8, neccheck, 0x25);
-		pos = LOADINTELWORD(itfrom + 2);
-		CopyMemory(mem + 0xf538e, itfrom + pos, 0x27);
-	}
-
 	CopyMemory(mem + 0x0fd800 + 0x0e00, keytable[0], 0x300);
 
 	CopyMemory(mem + ITF_ADRS, itfrom, sizeof(itfrom));
@@ -273,6 +308,7 @@ void bios_initialize(void) {
 	else if ((pccore.model & PCMODELMASK) == PCMODEL_VM) {
 		mem[ITF_ADRS + 0x7ff1] = 0x08;
 	}
+	setbiosseed(mem + 0x0f8000, 0x08000, 0x7ffe);
 #else
 	fh = file_open_c("itf.rom");
 	if (fh != FILEH_INVALID) {
@@ -300,7 +336,7 @@ static void bios_itfcall(void) {
 
 	if (!np2cfg.ITF_WORK) {
 		for (i=0; i<8; i++) {
-			mem[MEMB_MSW + (i*4)] = msw_default[i];
+			mem[MEMX_MSW + (i*4)] = msw_default[i];
 		}
 		CPU_FLAGL |= C_FLAG;
 	}
@@ -425,25 +461,29 @@ UINT MEMCALL biosfunc(UINT32 adrs) {
 
 		case BIOS_BASE + BIOSOFST_WAIT:
 			CPU_STI;
+#if 1
+			return(bios0x1b_wait());								// ver0.78
+#else
 			if (fddmtr.busy) {
 				CPU_IP--;
 				CPU_REMCLOCK = -1;
 			}
 			else {
 				if (fdc.chgreg & 1) {
-					if (!(mem[0x0055e] & (0x01 << fdc.us))) {
+					if (!(mem[MEMB_DISK_INTL] & (0x01 << fdc.us))) {
 						CPU_IP--;
 						CPU_REMCLOCK -= 1000;
 					}
 				}
 				else {
-					if (!(mem[0x0055f] & (0x10 << fdc.us))) {
+					if (!(mem[MEMB_DISK_INTH] & (0x10 << fdc.us))) {
 						CPU_IP--;
 						CPU_REMCLOCK -= 1000;
 					}
 				}
 			}
 			return(1);
+#endif
 
 		case 0xfffe8:					// ブートストラップロード
 			CPU_REMCLOCK -= 2000;
@@ -462,19 +502,16 @@ UINT MEMCALL biosfunc(UINT32 adrs) {
 			return(0);
 	}
 
-	if ((adrs >= 0xf9a00) && (adrs < 0x0f9a44)) {
-		if (!(adrs & 3)) {
-			CPU_REMCLOCK -= 500;
-			bios_lio((REG8)((adrs - 0xf9a00) >> 2));
-		}
-		else {
-			if (nevent_iswork(NEVENT_GDCSLAVE)) {
-				CPU_IP--;
-				CPU_REMCLOCK = -1;
-				return(1);
-			}
+	if ((adrs >= 0xf9950) && (adrs <= 0x0f9990) && (!(adrs & 3))) {
+		CPU_REMCLOCK -= 500;
+		bios_lio((REG8)((adrs - 0xf9950) >> 2));
+	}
+	else if (adrs == 0xf9994) {
+		if (nevent_iswork(NEVENT_GDCSLAVE)) {
+			CPU_IP--;
+			CPU_REMCLOCK = -1;
+			return(1);
 		}
-		return(0);
 	}
 	return(0);
 }