--- np2/bios/bios1b.c	2004/01/28 23:36:13	1.15
+++ np2/bios/bios1b.c	2004/01/30 01:29:13	1.18
@@ -23,6 +23,25 @@ static	UINT	mtr_r = 0;
 
 // ---- FDD
 
+static BOOL setfdcmode(REG8 drv, REG8 type, REG8 rpm) {
+
+	if (drv >= 4) {
+		return(FAILURE);
+	}
+	if ((rpm) && (!fdc.support144)) {
+		return(FAILURE);
+	}
+	fdc.chgreg = type;
+	fdc.rpm[drv] = rpm;
+	if (type & 2) {
+		CTRL_FDMEDIA = DISKTYPE_2HD;
+	}
+	else {
+		CTRL_FDMEDIA = DISKTYPE_2DD;
+	}
+	return(SUCCESS);
+}
+
 void fddbios_equip(REG8 type, BOOL clear) {
 
 	REG16	diskequip;
@@ -31,11 +50,13 @@ void fddbios_equip(REG8 type, BOOL clear
 	if (clear) {
 		diskequip &= 0x0f00;
 	}
-	if (type == DISKTYPE_2HD) {
-		diskequip |= 0x0003;
+	if (type & 1) {
+		diskequip &= 0xfff0;
+		diskequip |= (fdc.equip & 0x0f);
 	}
-	if (type == DISKTYPE_2DD) {
-		diskequip |= 0x0300;
+	else {
+		diskequip &= 0x0fff;
+		diskequip |= (fdc.equip & 0x0f) << 12;
 	}
 	SETBIOSMEM16(MEMW_DISK_EQUIP, diskequip);
 }
@@ -83,7 +104,7 @@ static BOOL biosfd_seek(REG8 track, BOOL
 	return(SUCCESS);
 }
 
-static UINT16 fdfmt_biospara(REG8 fmt, REG8 rpm) {					// ver0.31
+static UINT16 fdfmt_biospara(REG8 type, REG8 rpm, REG8 fmt) {
 
 	UINT	seg;
 	UINT	off;
@@ -93,7 +114,7 @@ static UINT16 fdfmt_biospara(REG8 fmt, R
 	if (n >= 4) {
 		n = 3;
 	}
-	if (CTRL_FDMEDIA == DISKTYPE_2HD) {
+	if (type & 2) {
 		seg = GETBIOSMEM16(MEMW_F2HD_P_SEG);
 		off = GETBIOSMEM16(MEMW_F2HD_P_OFF);
 	}
@@ -116,14 +137,6 @@ static UINT16 fdfmt_biospara(REG8 fmt, R
 	return(i286_memword_read(seg, off));
 }
 
-static void change_rpm(REG8 rpm) {									// ver0.31
-
-	if (np2cfg.usefd144) {
-		fdc.rpm = rpm;
-	}
-}
-
-
 
 enum {
 	FDCBIOS_NORESULT,
@@ -152,6 +165,7 @@ static void fdd_int(int result) {
 		case 0x0a:								// READ ID
 		case 0x0d:								// フォーマット
 			break;
+
 		default:
 			return;
 	}
@@ -188,7 +202,17 @@ static void fdd_int(int result) {
 			fdc.stat[fdc.us] |= FDCRLT_IC0 | FDCRLT_NW;
 			fdcsend_error7();
 			break;
+
+		default:
+			return;
+	}
+	if (fdc.chgreg & 1) {
+		mem[0x0055e] &= ~(0x01 << fdc.us);
+	}
+	else {
+		mem[0x0055f] &= ~(0x10 << fdc.us);
 	}
+	CPU_IP = BIOSOFST_WAIT;
 }
 
 #if 1
@@ -261,7 +285,7 @@ static void b0clr(void) {
 }
 #endif
 
-static REG8 fdd_operate(REG8 type, BOOL ndensity, REG8 rpm) {		// ver0.31
+static REG8 fdd_operate(REG8 type, REG8 rpm, BOOL ndensity) {
 
 	REG8	ret_ah = 0x60;
 	UINT16	size;
@@ -278,29 +302,28 @@ static REG8 fdd_operate(REG8 type, BOOL 
 	mtr_c = 0xff;
 	mtr_r = 0;
 
-
 	// とりあえずBIOSの時は無視する
 	fdc.mf = 0xff;						// ver0.29
 
 //	TRACE_("int 1Bh", CPU_AH);
 
-	change_rpm(rpm);												// ver0.31
+	if (setfdcmode((REG8)(CPU_AL & 3), type, rpm) != SUCCESS) {
+		return(0x40);
+	}
+
 	if ((CPU_AH & 0x0f) != 0x0a) {
 		fdc.crcn = 0;
 	}
 	if ((CPU_AH & 0x0f) != 0x03) {
-		CTRL_FDMEDIA = type;
-		switch(type) {
-			case DISKTYPE_2HD:
-				if (pic.pi[1].imr & PIC_INT42) {
-					return(0xd0);
-				}
-				break;
-			case DISKTYPE_2DD:
-				if (pic.pi[1].imr & PIC_INT41) {
-					return(0xd0);
-				}
-				break;
+		if (type & 2) {
+			if (pic.pi[1].imr & PIC_INT42) {
+				return(0x40);
+			}
+		}
+		else {
+			if (pic.pi[1].imr & PIC_INT41) {
+				return(0x40);
+			}
 		}
 		if (fdc.us != (CPU_AL & 0x03)) {
 			fdc.us = CPU_AL & 0x03;
@@ -317,7 +340,7 @@ static REG8 fdd_operate(REG8 type, BOOL 
 				return(0x68);			// 新センスは 両用ドライブ情報も
 			}
 			if (CPU_AH == 0xc4) {								// ver0.31
-				if (np2cfg.usefd144) {
+				if (fdc.support144) {
 					return(0x6c);
 				}
 				return(0x68);
@@ -358,7 +381,7 @@ static REG8 fdd_operate(REG8 type, BOOL 
 				}
 			}
 			biosfd_setchrn();
-			para = fdfmt_biospara(0, rpm);
+			para = fdfmt_biospara(type, rpm, 0);
 			if (!para) {
 				ret_ah = 0xd0;
 				break;
@@ -428,8 +451,7 @@ static REG8 fdd_operate(REG8 type, BOOL 
 			}
 			if (CPU_AH & 0x80) {				// ver0.30
 				ret_ah |= 8;					// 1MB/640KB両用ドライブ
-				if ((CPU_AH & 0x40) &&
-					(np2cfg.usefd144)) {		// ver0.31
+				if ((CPU_AH & 0x40) && (fdc.support144)) {
 					ret_ah |= 4;				// 1.44対応ドライブ
 				}
 			}
@@ -447,7 +469,7 @@ static REG8 fdd_operate(REG8 type, BOOL 
 				}
 			}
 			biosfd_setchrn();
-			para = fdfmt_biospara(0, rpm);
+			para = fdfmt_biospara(type, rpm, 0);
 			if (!para) {
 				ret_ah = 0xd0;
 				break;
@@ -512,7 +534,7 @@ static REG8 fdd_operate(REG8 type, BOOL 
 				}
 			}
 			biosfd_setchrn();
-			para = fdfmt_biospara(0, rpm);
+			para = fdfmt_biospara(type, rpm, 0);
 			if (!para) {
 				ret_ah = 0xd0;
 				break;
@@ -633,7 +655,7 @@ static REG8 fdd_operate(REG8 type, BOOL 
 			}
 			fdc.d = CPU_DL;
 			fdc.N = CPU_CH;
-			para = fdfmt_biospara(1, rpm);
+			para = fdfmt_biospara(type, rpm, 1);
 			if (!para) {
 				ret_ah = 0xd0;
 				break;
@@ -657,21 +679,22 @@ static REG8 fdd_operate(REG8 type, BOOL 
 	}
 	fdd_int(result);
 	fddmtr_seek(fdc.us, mtr_c, mtr_r);
-	CPU_IP = BIOSOFST_WAIT;											// ver0.30
 	return(ret_ah);
 }
 
 
 // -------------------------------------------------------------------- BIOS
 
-static UINT16 boot_fd1(REG8 rpm) {									// ver0.31
+static UINT16 boot_fd1(REG8 type, REG8 rpm) {
 
 	UINT	remain;
 	UINT	size;
 	UINT32	pos;
 	UINT16	bootseg;
 
-	change_rpm(rpm);												// ver0.31
+	if (setfdcmode(fdc.us, type, rpm) != SUCCESS) {
+		return(0);
+	}
 	if (biosfd_seek(0, 0)) {
 		return(0);
 	}
@@ -722,36 +745,34 @@ static UINT16 boot_fd(REG8 drv, REG8 typ
 	if (drv >= 4) {
 		return(0);
 	}
-	fdc.us = drv & 3;
+	fdc.us = drv;
 	if (!fdd_diskready(fdc.us)) {
 		return(0);
 	}
 
 	// 2HD
 	if (type & 1) {
-		CTRL_FDMEDIA = DISKTYPE_2HD;
 		// 1.25MB
-		bootseg = boot_fd1(0);
+		bootseg = boot_fd1(3, 0);
 		if (bootseg) {
 			mem[MEMB_DISK_BOOT] = (UINT8)(0x90 + drv);
-			fddbios_equip(DISKTYPE_2HD, TRUE);
+			fddbios_equip(3, TRUE);
 			return(bootseg);
 		}
 		// 1.44MB
-		bootseg = boot_fd1(1);
+		bootseg = boot_fd1(3, 1);
 		if (bootseg) {
 			mem[MEMB_DISK_BOOT] = (UINT8)(0x30 + drv);
-			fddbios_equip(DISKTYPE_2HD, TRUE);
+			fddbios_equip(3, TRUE);
 			return(bootseg);
 		}
 	}
 	if (type & 2) {										// ver0.29
 		// 2DD
-		CTRL_FDMEDIA = DISKTYPE_2DD;
-		bootseg = boot_fd1(0);
+		bootseg = boot_fd1(0, 0);
 		if (bootseg) {
 			mem[MEMB_DISK_BOOT] = (BYTE)(0x70 + drv);
-			fddbios_equip(DISKTYPE_2DD, TRUE);
+			fddbios_equip(0, TRUE);
 			return(bootseg);
 		}
 	}
@@ -889,22 +910,25 @@ void bios0x1b(void) {
 
 	switch(CPU_AL & 0xf0) {
 		case 0x90:
-			ret_ah = fdd_operate(DISKTYPE_2HD, 0, 0);
+			ret_ah = fdd_operate(3, 0, 0);
 			break;
 
 		case 0x30:
 		case 0xb0:
-			ret_ah = fdd_operate(DISKTYPE_2HD, 0, 1);
+			ret_ah = fdd_operate(3, 1, 0);
 			break;
 
 		case 0x10:
+			ret_ah = fdd_operate(1, 0, 0);
+			break;
+
 		case 0x70:
 		case 0xf0:
-			ret_ah = fdd_operate(DISKTYPE_2DD, 0, 0);
+			ret_ah = fdd_operate(0, 0, 0);
 			break;
 
 		case 0x50:
-			ret_ah = fdd_operate(DISKTYPE_2DD, 1, 0);
+			ret_ah = fdd_operate(0, 0, 1);
 			break;
 
 		case 0x00: