--- np2/bios/bios1b.c	2004/01/30 01:29:13	1.18
+++ np2/bios/bios1b.c	2004/03/07 04:09:27	1.24
@@ -17,10 +17,6 @@ enum {
 };
 
 
-static	BYTE	mtr_c = 0;
-static	UINT	mtr_r = 0;
-
-
 // ---- FDD
 
 static BOOL setfdcmode(REG8 drv, REG8 type, REG8 rpm) {
@@ -97,7 +93,6 @@ static BOOL biosfd_seek(REG8 track, BOOL
 		}
 	}
 	fdc.ncn = track;
-	mtr_c = track;
 	if (fdd_seek()) {
 		return(FAILURE);
 	}
@@ -298,8 +293,10 @@ static REG8 fdd_operate(REG8 type, REG8 
 	BYTE	hd;
 	int		result = FDCBIOS_NORESULT;
 	UINT32	addr;
+	UINT8	mtr_c;
+	UINT	mtr_r;
 
-	mtr_c = 0xff;
+	mtr_c = fdc.ncn;
 	mtr_r = 0;
 
 	// とりあえずBIOSの時は無視する
@@ -494,7 +491,7 @@ static REG8 fdd_operate(REG8 type, REG8 
 				else {
 					accesssize = size;
 				}
-				i286_memx_read(addr, fdc.buf, accesssize);
+				MEML_READ(addr, fdc.buf, accesssize);
 				if (fdd_write()) {
 					break;
 				}
@@ -563,7 +560,7 @@ static REG8 fdd_operate(REG8 type, REG8 
 				if (fdd_read()) {
 					break;
 				}
-				i286_memx_write(addr, fdc.buf, accesssize);
+				MEML_WRITE(addr, fdc.buf, accesssize);
 				addr += accesssize;
 				size -= accesssize;
 				mtr_r += accesssize;						// ver0.26
@@ -664,7 +661,7 @@ static REG8 fdd_operate(REG8 type, REG8 
 			fdd_formatinit();
 			pos = CPU_BP;
 			for (s=0; s<fdc.sc; s++) {
-				i286_memstr_read(CPU_ES, pos, ID, 4);
+				MEML_READSTR(CPU_ES, pos, ID, 4);
 				fdd_formating(ID);
 				pos += 4;
 				if (ID[3] < 8) {
@@ -678,7 +675,9 @@ static REG8 fdd_operate(REG8 type, REG8 
 			break;
 	}
 	fdd_int(result);
-	fddmtr_seek(fdc.us, mtr_c, mtr_r);
+	if (mtr_c != fdc.ncn) {
+		fddmtr_seek(fdc.us, mtr_c, mtr_r);
+	}
 	return(ret_ah);
 }
 
@@ -891,10 +890,12 @@ void bios0x1b(void) {
 		i286_memword_write(CPU_SS, sp - 14, CPU_CX);		// +4
 		i286_memword_write(CPU_SS, sp - 16, CPU_BX);		// +2
 		i286_memword_write(CPU_SS, sp - 18, CPU_AX);		// +0
+#if 0
 		TRACEOUT(("bypass to %.4x:0018", seg << 8));
 		TRACEOUT(("AX=%04x BX=%04x %02x:%02x:%02x:%02x ES=%04x BP=%04x",
 							CPU_AX, CPU_BX, CPU_CL, CPU_DH, CPU_DL, CPU_CH,
 							CPU_ES, CPU_BP));
+#endif
 		sp -= 18;
 		CPU_SP = sp;
 		CPU_BP = sp;