--- np2/bios/bios.c	2004/01/05 12:54:56	1.22
+++ np2/bios/bios.c	2004/01/13 05:30:58	1.25
@@ -60,7 +60,7 @@ static void bios_reinitbyswitch(void) {
 	mem[MEMB_PRXDUPD] = prxdupd;
 
 	biosflag = 0x20;
-	if (pc.cpumode & CPUMODE_8MHz) {
+	if (pccore.cpumode & CPUMODE_8MHz) {
 		biosflag |= 0x80;
 	}
 	biosflag |= mem[0xa3fea] & 7;
@@ -85,7 +85,7 @@ static void bios_reinitbyswitch(void) {
 	}
 	gdcs.textdisp |= GDCSCRN_EXT;
 
-	if (((pc.model & PCMODELMASK) >= PCMODEL_VX) && (usesound & 0x7e)) {
+	if (((pccore.model & PCMODELMASK) >= PCMODEL_VX) && (usesound & 0x7e)) {
 		iocore_out8(0x188, 0x27);
 		iocore_out8(0x18a, 0x3f);
 	}
@@ -179,7 +179,7 @@ void bios_init(void) {
 	mem[0xffff0] = 0xea;
 	STOREINTELDWORD(mem + 0xffff1, 0xfd800000);
 
-	if ((!biosrom) && (!(pc.model & PCMODEL_EPSON))) {
+	if ((!biosrom) && (!(pccore.model & PCMODEL_EPSON))) {
 		CopyMemory(mem + 0xe8dd8, neccheck, 0x25);
 		pos = LOADINTELWORD(itfrom + 2);
 		CopyMemory(mem + 0xf538e, itfrom + pos, 0x27);
@@ -187,7 +187,7 @@ void bios_init(void) {
 
 	bios_reinitbyswitch();
 	mem[MEMB_CRT_STS_FLAG] = 0x84;
-	mem[MEMB_BIOS_FLAG0] = 0x03;						// 00/05/17 beep tone
+	mem[MEMB_BIOS_FLAG0] = 0x03;
 	mem[MEMB_F2DD_MODE] = 0xff;										// ver0.29
  	SETBIOSMEM16(MEMW_DISK_EQUIP, 0x0003);							// ver0.29
 	SETBIOSMEM32(MEMD_F2DD_POINTER, 0xfd801ad7);
@@ -200,24 +200,26 @@ void bios_init(void) {
 	CopyMemory(mem + ITF_ADRS, itfrom, sizeof(itfrom));
 	mem[ITF_ADRS + 0x7ff0] = 0xea;
 	STOREINTELDWORD(mem + ITF_ADRS + 0x7ff1, 0xf8000000);
-	if (pc.model & PCMODEL_EPSON) {
+	if (pccore.model & PCMODEL_EPSON) {
 		mem[ITF_ADRS + 0x7ff1] = 0x04;
 	}
-	else if ((pc.model & PCMODELMASK) == PCMODEL_VM) {
+	else if ((pccore.model & PCMODELMASK) == PCMODEL_VM) {
 		mem[ITF_ADRS + 0x7ff1] = 0x08;
 	}
 #else
 	fh = file_open_c("itf.rom");
 	if (fh != FILEH_INVALID) {
-		file_read(fh, &mem[ITF_ADRS], 0x8000);
+		file_read(fh, mem + ITF_ADRS, 0x8000);
 		file_close(fh);
+		TRACEOUT(("load itf.rom"));
 	}
 	extmem_init(np2cfg.EXTMEM);
 #endif
 
 	CopyMemory(mem + 0xd0000, sxsibios, sizeof(sxsibios));
+	CPU_RAM_D000 &= ~(1 << 0);
 
-	CopyMemory(mem + 0x1c0000, mem + 0x1f8000, 0x08000);
+	CopyMemory(mem + 0x1c0000, mem + ITF_ADRS, 0x08000);
 	CopyMemory(mem + 0x1e8000, mem + 0x0e8000, 0x10000);
 }
 
@@ -240,7 +242,7 @@ static void bios_boot(void) {
 	else {
 		CPU_SP = GETBIOSMEM16(0x00404);
 		CPU_SS = GETBIOSMEM16(0x00406);
-		TRACEOUT(("Protect Disable... SS:SP = %.4x:%.4x", CPU_SS, CPU_SP));
+//		TRACEOUT(("CPU Reset... SS:SP = %.4x:%.4x", CPU_SS, CPU_SP));
 	}
 }
 
@@ -250,9 +252,13 @@ UINT MEMCALL biosfunc(UINT32 adrs) {
 	UINT16	bootseg;
 
 	if ((CPU_ITFBANK) && (adrs >= 0xf8000) && (adrs < 0x100000)) {
+#if 1					// for epson ITF
+		return(0);
+#else
 		CPU_IP--;
 		CPU_REMCLOCK = -1;
 		return(1);
+#endif
 	}
 
 	switch(adrs) {													// ver0.30
@@ -314,6 +320,7 @@ UINT MEMCALL biosfunc(UINT32 adrs) {
 			return(1);
 
 		case BIOS_BASE + BIOSOFST_1b:
+			CPU_STI;
 			CPU_REMCLOCK -= 200;
 			bios0x1b();
 			return(1);