--- np2/bios/bios.c	2005/03/16 06:05:17	1.75
+++ np2/bios/bios.c	2007/11/11 13:54:14	1.77
@@ -88,7 +88,7 @@ static void bios_reinitbyswitch(void) {
 	UINT8	extmem;
 	UINT8	boot;
 
-	if (!(np2cfg.dipsw[2] & 0x80)) {
+	if (!(pccore.dipsw[2] & 0x80)) {
 #if defined(CPUCORE_IA32)
 		mem[MEMB_SYS_TYPE] = 0x03;		// 80386〜
 #else
@@ -101,13 +101,13 @@ static void bios_reinitbyswitch(void) {
 
 	mem[MEMB_BIOS_FLAG0] = 0x01;
 	prxcrt = 0x08;
-	if (!(np2cfg.dipsw[0] & 0x01)) {			// dipsw1-1 on
+	if (!(pccore.dipsw[0] & 0x01)) {			// dipsw1-1 on
 		prxcrt |= 0x40;
 	}
 	if (gdc.display & (1 << GDCDISP_ANALOG)) {
 		prxcrt |= 0x04;							// color16
 	}
-	if (!(np2cfg.dipsw[0] & 0x80)) {			// dipsw1-8 on
+	if (!(pccore.dipsw[0] & 0x80)) {			// dipsw1-8 on
 		prxcrt |= 0x01;
 	}
 	if (grcg.chip) {
@@ -119,7 +119,7 @@ static void bios_reinitbyswitch(void) {
 	if (grcg.chip >= 3) {
 		prxdupd |= 0x40;
 	}
-	if (!(np2cfg.dipsw[1] & 0x80)) {			// dipsw2-8 on
+	if (!(pccore.dipsw[1] & 0x80)) {			// dipsw2-8 on
 		prxdupd |= 0x20;
 	}
 	mem[MEMB_PRXDUPD] = prxdupd;
@@ -129,7 +129,7 @@ static void bios_reinitbyswitch(void) {
 		biosflag |= 0x80;
 	}
 	biosflag |= mem[0xa3fea] & 7;
-	if (np2cfg.dipsw[2] & 0x80) {
+	if (pccore.dipsw[2] & 0x80) {
 		biosflag |= 0x40;
 	}
 	mem[MEMB_BIOS_FLAG1] = biosflag;
@@ -193,8 +193,8 @@ static void bios_screeninit(void) {
 	REG8	al;
 
 	al = 4;
-	al += (np2cfg.dipsw[1] & 0x04) >> 1;
-	al += (np2cfg.dipsw[1] & 0x08) >> 3;
+	al += (pccore.dipsw[1] & 0x04) >> 1;
+	al += (pccore.dipsw[1] & 0x08) >> 3;
 	bios0x18_0a(al);
 }
 
@@ -364,12 +364,12 @@ UINT MEMCALL biosfunc(UINT32 adrs) {
 //	TRACEOUT(("biosfunc(%x)", adrs));
 #if defined(CPUCORE_IA32) && defined(TRACE)
 	if (CPU_STAT_PAGING) {
-		UINT32 pde = i286_memoryread_d(CPU_STAT_PDE_BASE);
+		UINT32 pde = MEMP_READ32(CPU_STAT_PDE_BASE);
 		if (!(pde & CPU_PDE_PRESENT)) {
 			TRACEOUT(("page0: PTE not present"));
 		}
 		else {
-			UINT32 pte = i286_memoryread_d(pde & CPU_PDE_BASEADDR_MASK);
+			UINT32 pte = MEMP_READ32(pde & CPU_PDE_BASEADDR_MASK);
 			if (!(pte & CPU_PTE_PRESENT)) {
 				TRACEOUT(("page0: not present"));
 			}
@@ -461,29 +461,7 @@ 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[MEMB_DISK_INTL] & (0x01 << fdc.us))) {
-						CPU_IP--;
-						CPU_REMCLOCK -= 1000;
-					}
-				}
-				else {
-					if (!(mem[MEMB_DISK_INTH] & (0x10 << fdc.us))) {
-						CPU_IP--;
-						CPU_REMCLOCK -= 1000;
-					}
-				}
-			}
-			return(1);
-#endif
 
 		case 0xfffe8:					// ブートストラップロード
 			CPU_REMCLOCK -= 2000;