--- np2/bios/bios.c	2004/02/13 14:52:21	1.37
+++ np2/bios/bios.c	2004/02/19 03:04:01	1.41
@@ -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
@@ -123,7 +122,7 @@ static void bios_reinitbyswitch(void) {
 	}
 }
 
-static void bios_vectorset(void) {									// ver0.30
+static void bios_vectorset(void) {
 
 	UINT	i;
 
@@ -139,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);
 }
 
 
@@ -164,7 +162,7 @@ static const UINT16 biosoffset[0x20] = {
 			BIOSOFST_1c,	BIOSOFST_IRET,	BIOSOFST_1e,	BIOSOFST_1f};
 
 
-void bios_init(void) {
+void bios_initialize(void) {
 
 	char	path[MAX_PATH];
 	FILEH	fh;
@@ -175,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) {
@@ -200,7 +198,7 @@ void bios_init(void) {
 	}
 	CopyMemory(mem + BIOS_BASE + BIOSOFST_PRT, printmain, sizeof(printmain));
 
-	bios_vectorset();												// ver0.29
+	bios_vectorset();
 	if (!biosrom) {
 		lio_init();
 	}
@@ -230,8 +228,8 @@ void bios_init(void) {
 	bios_reinitbyswitch();
 //	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);
@@ -299,7 +297,7 @@ UINT MEMCALL biosfunc(UINT32 adrs) {
 #endif
 	}
 
-	switch(adrs) {													// ver0.30
+	switch(adrs) {
 		case BIOS_BASE + BIOSOFST_EOIM:
 			CPU_REMCLOCK -= 300;
 			iocore_out8(0x00, 0x20);
@@ -374,7 +372,7 @@ UINT MEMCALL biosfunc(UINT32 adrs) {
 
 		case BIOS_BASE + BIOSOFST_WAIT:
 			CPU_STI;
-			if (fddmtr_biosbusy) {						// ver0.26
+			if (fddmtr.busy) {
 				CPU_IP--;
 				CPU_REMCLOCK = -1;
 			}