--- np2/bios/bios.c	2003/10/16 17:58:19	1.1
+++ np2/bios/bios.c	2003/12/04 13:54:28	1.11
@@ -6,12 +6,14 @@
 #include	"iocore.h"
 #include	"bios.h"
 #include	"biosmem.h"
-#include	"keytable.res"
-#include	"itfrom.res"
+#include	"sound.h"
+#include	"fmboard.h"
 #include	"lio.h"
-#include	"fdfmt.h"
 #include	"fddfile.h"
 #include	"fdd_mtr.h"
+#include	"fdfmt.h"
+#include	"keytable.res"
+#include	"itfrom.res"
 
 
 	BOOL	biosrom = FALSE;
@@ -94,6 +96,11 @@ static void bios_reinitbyswitch(void) {
 		gdc.display |= 4;
 	}
 	gdcs.textdisp |= GDCSCRN_EXT;
+
+	if ((pc.model >= PCMODEL_VX) && (usesound & 0x7e)) {
+		iocore_out8(0x188, 0x27);
+		iocore_out8(0x18a, 0x3f);
+	}
 }
 
 static void bios_vectorset(void) {									// ver0.30
@@ -128,6 +135,7 @@ static const UINT16 biosoffset[0x20] = {
 
 void bios_init(void) {
 
+	char	path[MAX_PATH];
 	FILEH	fh;
 	UINT	i;
 	UINT	pos;
@@ -136,7 +144,8 @@ void bios_init(void) {
 
 	// まぁDISK BASIC動くようになるからいいんじゃないですか？
 	// BASIC BIOSは 8086コードのように見えるけど…
-	fh = file_open_c(file_biosrom);
+	getbiospath(path, file_biosrom, sizeof(path));
+	fh = file_open_rb(path);
 	if (fh != FILEH_INVALID) {
 		if (file_read(fh, mem + 0x0e8000, 0x18000) == 0x18000) {
 			biosrom = TRUE;
@@ -147,8 +156,6 @@ void bios_init(void) {
 		CopyMemory(mem + 0x0e8000, nosyscode, sizeof(nosyscode));
 	}
 
-	itf.bank = 0;
-
 	// BIOS hookのアドレス変更
 	for (i=0; i<0x20; i++) {
 		STOREINTELWORD(mem + 0xfd868 + i*2, biosoffset[i]);
@@ -231,7 +238,8 @@ static void bios_boot(void) {
 		I286_AL = 0x10;
 		mem[0x004f8] = 0xee;		// out	dx, al
 		mem[0x004f9] = 0xea;		// call	far
-		SETBIOSMEM32(0x004fa, 0xffff0000);
+		SETBIOSMEM16(0x004fa, 0x0000);
+		SETBIOSMEM16(0x004fc, 0xffff);
 	}
 	else {
 		I286_SP = GETBIOSMEM16(0x00404);
@@ -244,15 +252,15 @@ UINT MEMCALL biosfunc(UINT32 adrs) {
 
 	UINT16	bootseg;
 
-	if ((itf.bank) && (adrs >= 0xf8000) && (adrs < 0x100000)) {
+	if ((i286core.s.itfbank) && (adrs >= 0xf8000) && (adrs < 0x100000)) {
 		I286_IP--;
-		nevent.remainclock = -1;
+		I286_REMCLOCK = -1;
 		return(1);
 	}
 
 	switch(adrs) {													// ver0.30
 		case BIOS_BASE + BIOSOFST_EOIM:
-			nevent.remainclock -= 300;
+			I286_REMCLOCK -= 300;
 			iocore_out8(0x00, 0x20);
 			return(0);
 
@@ -264,57 +272,57 @@ UINT MEMCALL biosfunc(UINT32 adrs) {
 			return(0);
 
 		case BIOS_BASE + BIOSOFST_02:
-			nevent.remainclock -= 300;
+			I286_REMCLOCK -= 300;
 			bios0x02();
 			return(1);
 
 		case BIOS_BASE + BIOSOFST_08:
-			nevent.remainclock -= 300;
+			I286_REMCLOCK -= 300;
 			bios0x08();
 			return(1);
 
 		case BIOS_BASE + BIOSOFST_09:
-			nevent.remainclock -= 300;
+			I286_REMCLOCK -= 300;
 			bios0x09();
 			return(1);
 
 		case BIOS_BASE + BIOSOFST_0c:
-			nevent.remainclock -= 500;
+			I286_REMCLOCK -= 500;
 			bios0x0c();
 			return(1);
 
 		case BIOS_BASE + BIOSOFST_12:
-			nevent.remainclock -= 500;
+			I286_REMCLOCK -= 500;
 			bios0x12();
 			return(1);
 
 		case BIOS_BASE + BIOSOFST_13:
-			nevent.remainclock -= 500;
+			I286_REMCLOCK -= 500;
 			bios0x13();
 			return(1);
 
 		case BIOS_BASE + BIOSOFST_18:
-			nevent.remainclock -= 200;
+			I286_REMCLOCK -= 200;
 			bios0x18();
 			return(1);
 
 		case BIOS_BASE + BIOSOFST_19:
-			nevent.remainclock -= 200;
+			I286_REMCLOCK -= 200;
 			bios0x19();
 			return(1);
 
 		case BIOS_BASE + BIOSOFST_1a:
-			nevent.remainclock -= 200;
+			I286_REMCLOCK -= 200;
 			bios0x1a();
 			return(1);
 
 		case BIOS_BASE + BIOSOFST_1b:
-			nevent.remainclock -= 200;
+			I286_REMCLOCK -= 200;
 			bios0x1b();
 			return(1);
 
 		case BIOS_BASE + BIOSOFST_1c:
-			nevent.remainclock -= 200;
+			I286_REMCLOCK -= 200;
 			bios0x1c();
 			return(1);
 
@@ -322,20 +330,20 @@ UINT MEMCALL biosfunc(UINT32 adrs) {
 			I286_STI;
 			if (fddmtr_biosbusy) {						// ver0.26
 				I286_IP--;
-				nevent.remainclock = -1;
+				I286_REMCLOCK = -1;
 			}
 			else {
 				switch(CTRL_FDMEDIA) {
 					case DISKTYPE_2HD:
 						if (pic.pi[1].isr & PIC_INT42) {
 							I286_IP--;
-							nevent.remainclock -= 1000;
+							I286_REMCLOCK -= 1000;
 						}
 						break;
 					case DISKTYPE_2DD:
 						if (pic.pi[1].isr & PIC_INT41) {
 							I286_IP--;
-							nevent.remainclock -= 1000;
+							I286_REMCLOCK -= 1000;
 						}
 						break;
 				}
@@ -363,7 +371,7 @@ UINT MEMCALL biosfunc(UINT32 adrs) {
 			return(1);
 
 		case 0xfffe8:					// ブートストラップロード
-			nevent.remainclock -= 2000;
+			I286_REMCLOCK -= 2000;
 			bootseg = bootstrapload();
 			if (bootseg) {
 				I286_STI;
@@ -376,7 +384,7 @@ UINT MEMCALL biosfunc(UINT32 adrs) {
 			return(0);
 
 		case 0xfffec:
-			nevent.remainclock -= 2000;
+			I286_REMCLOCK -= 2000;
 			bootstrapload();
 			return(0);
 	}
@@ -392,7 +400,7 @@ UINT MEMCALL biosfunc(UINT32 adrs) {
 		return(0);
 	}
 	I286_IP--;
-	nevent.remainclock = -1;
+	I286_REMCLOCK = -1;
 	return(1);
 }