--- np2/io/fdc.c	2004/01/29 09:41:50	1.8
+++ np2/io/fdc.c	2005/02/12 12:40:39	1.17
@@ -20,7 +20,6 @@ static const UINT8 FDCCMD_TABLE[32] = {
 
 
 #define FDC_FORCEREADY (1)
-#define	FDC_MAXDRIVE	2
 #define	FDC_DELAYERROR7
 
 
@@ -54,7 +53,7 @@ static BOOL fdc_isfdcinterrupt(void) {
 
 REG8 DMACCALL fdc_dmafunc(REG8 func) {
 
-	TRACEOUT(("fdc_dmafunc = %d", func));
+//	TRACEOUT(("fdc_dmafunc = %d", func));
 	switch(func) {
 		case DMAEXT_START:
 			return(1);
@@ -85,9 +84,9 @@ void fdcsend_error7(void) {
 	fdc.event = FDCEVENT_BUFSEND;
 	fdc.bufp = 0;
 	fdc.bufcnt = 7;
-	fdc.buf[0] = (BYTE)(fdc.stat[fdc.us] >>  0);
-	fdc.buf[1] = (BYTE)(fdc.stat[fdc.us] >>  8);
-	fdc.buf[2] = (BYTE)(fdc.stat[fdc.us] >> 16);
+	fdc.buf[0] = (UINT8)(fdc.stat[fdc.us] >>  0);
+	fdc.buf[1] = (UINT8)(fdc.stat[fdc.us] >>  8);
+	fdc.buf[2] = (UINT8)(fdc.stat[fdc.us] >> 16);
 	fdc.buf[3] = fdc.C;
 	fdc.buf[4] = fdc.H;
 	fdc.buf[5] = fdc.R;
@@ -239,7 +238,7 @@ static void FDC_SenseDeviceStatus(void) 
 			get_hdus();
 			fdc.buf[0] = (fdc.hd << 2) | fdc.us;
 			fdc.stat[fdc.us] = (fdc.hd << 2) | fdc.us;
-			if (fdc.us < FDC_MAXDRIVE) {
+			if (fdc.equip & (1 << fdc.us)) {
 				fdc.buf[0] |= 0x08;
 				if (!fdc.treg[fdc.us]) {
 					fdc.buf[0] |= 0x10;
@@ -254,7 +253,7 @@ static void FDC_SenseDeviceStatus(void) 
 			else {
 				fdc.buf[0] |= 0x80;
 			}
-			TRACEOUT(("FDC_SenseDeviceStatus %.2x", fdc.buf[0]));
+//			TRACEOUT(("FDC_SenseDeviceStatus %.2x", fdc.buf[0]));
 			fdc.event = FDCEVENT_BUFSEND;
 			fdc.bufcnt = 1;
 			fdc.bufp = 0;
@@ -268,7 +267,7 @@ static void FDC_SenseDeviceStatus(void) 
 	}
 }
 
-static BOOL writesector(void) {
+static BRESULT writesector(void) {
 
 	fdc.stat[fdc.us] = (fdc.hd << 2) | fdc.us;
 	if (!FDC_DriveCheck(TRUE)) {
@@ -403,7 +402,7 @@ static void FDC_Recalibrate(void) {					
 			fdc.ncn = 0;
 			fdc.stat[fdc.us] = (fdc.hd << 2) | fdc.us;
 			fdc.stat[fdc.us] |= FDCRLT_SE;
-			if (fdc.us >= FDC_MAXDRIVE) {
+			if (!(fdc.equip & (1 << fdc.us))) {
 				fdc.stat[fdc.us] |= FDCRLT_NR | FDCRLT_IC0;
 			}
 			else if (!fddfile[fdc.us].fname[0]) {
@@ -431,20 +430,20 @@ static void FDC_SenceintStatus(void) {		
 	if (fdc_isfdcinterrupt()) {
 		i = 0;
 		if (fdc.stat[fdc.us]) {
-			fdc.buf[0] = (BYTE)fdc.stat[fdc.us];
+			fdc.buf[0] = (UINT8)fdc.stat[fdc.us];
 			fdc.buf[1] = fdc.treg[fdc.us];
 			fdc.bufcnt = 2;
 			fdc.stat[fdc.us] = 0;
-			TRACEOUT(("fdc stat - %d [%.2x]", fdc.us, fdc.buf[0]));
+//			TRACEOUT(("fdc stat - %d [%.2x]", fdc.us, fdc.buf[0]));
 		}
 		else {
 			for (; i<4; i++) {
 				if (fdc.stat[i]) {
-					fdc.buf[0] = (BYTE)fdc.stat[i];
+					fdc.buf[0] = (UINT8)fdc.stat[i];
 					fdc.buf[1] = fdc.treg[i];
 					fdc.bufcnt = 2;
 					fdc.stat[i] = 0;
-					TRACEOUT(("fdc stat - %d [%.2x]", i, fdc.buf[0]));
+//					TRACEOUT(("fdc stat - %d [%.2x]", i, fdc.buf[0]));
 					break;
 				}
 			}
@@ -553,7 +552,8 @@ static void FDC_Seek(void) {							// cm
 			fdc.ncn = fdc.cmds[1];
 			fdc.stat[fdc.us] = (fdc.hd << 2) | fdc.us;
 			fdc.stat[fdc.us] |= FDCRLT_SE;
-			if ((fdc.us >= FDC_MAXDRIVE) || (!fddfile[fdc.us].fname[0])) {
+			if ((!(fdc.equip & (1 << fdc.us))) ||
+				(!fddfile[fdc.us].fname[0])) {
 				fdc.stat[fdc.us] |= FDCRLT_NR | FDCRLT_IC0;
 			}
 			else {
@@ -712,7 +712,7 @@ REG8 DMACCALL fdc_dataread(void) {
 
 static void IOOUTCALL fdc_o92(UINT port, REG8 dat) {
 
-	TRACEOUT(("fdc out %.2x %.2x [%.4x:%.4x]", port, dat, CPU_CS, CPU_IP));
+//	TRACEOUT(("fdc out %.2x %.2x [%.4x:%.4x]", port, dat, CPU_CS, CPU_IP));
 
 	if (((port >> 4) ^ fdc.chgreg) & 1) {
 		return;
@@ -724,7 +724,7 @@ static void IOOUTCALL fdc_o92(UINT port,
 
 static void IOOUTCALL fdc_o94(UINT port, REG8 dat) {
 
-	TRACEOUT(("fdc out %.2x %.2x [%.4x:%.4x]", port, dat, CPU_CS, CPU_IP));
+//	TRACEOUT(("fdc out %.2x %.2x [%.4x:%.4x]", port, dat, CPU_CS, CPU_IP));
 
 	if (((port >> 4) ^ fdc.chgreg) & 1) {
 		return;
@@ -739,8 +739,8 @@ static void IOOUTCALL fdc_o94(UINT port,
 
 static REG8 IOINPCALL fdc_i90(UINT port) {
 
-	TRACEOUT(("fdc in %.2x %.2x [%.4x:%.4x]", port, fdc.status,
-															CPU_CS, CPU_IP));
+//	TRACEOUT(("fdc in %.2x %.2x [%.4x:%.4x]", port, fdc.status,
+//															CPU_CS, CPU_IP));
 
 	if (((port >> 4) ^ fdc.chgreg) & 1) {
 		return(0xff);
@@ -762,7 +762,7 @@ static REG8 IOINPCALL fdc_i92(UINT port)
 	else {
 		ret = fdc.lastdata;
 	}
-	TRACEOUT(("fdc in %.2x %.2x [%.4x:%.4x]", port, ret, CPU_CS, CPU_IP));
+//	TRACEOUT(("fdc in %.2x %.2x [%.4x:%.4x]", port, ret, CPU_CS, CPU_IP));
 	return(ret);
 }
 
@@ -771,7 +771,12 @@ static REG8 IOINPCALL fdc_i94(UINT port)
 	if (((port >> 4) ^ fdc.chgreg) & 1) {
 		return(0xff);
 	}
-	return(0x40);
+	if (port & 0x10) {		// 94
+		return(0x40);
+	}
+	else {					// CC
+		return(0x70);		// readyを立てるるる
+	}
 }
 
 
@@ -793,6 +798,21 @@ static REG8 IOINPCALL fdc_ibe(UINT port)
 	return((fdc.chgreg & 3) | 8);
 }
 
+static void IOOUTCALL fdc_o4be(UINT port, REG8 dat) {
+
+	fdc.reg144 = dat;
+	if (dat & 0x10) {
+		fdc.rpm[(dat >> 5) & 3] = dat & 1;
+	}
+	(void)port;
+}
+
+static REG8 IOINPCALL fdc_i4be(UINT port) {
+
+	(void)port;
+	return(fdc.rpm[(fdc.reg144 >> 5) & 3] | 0xf0);
+}
+
 
 // ---- I/F
 
@@ -806,6 +826,12 @@ static const IOINP fdcibe[1] = {fdc_ibe}
 void fdc_reset(void) {
 
 	ZeroMemory(&fdc, sizeof(fdc));
+	fdc.equip = np2cfg.fddequip;
+#if defined(SUPPORT_PC9821)
+	fdc.support144 = 1;
+#else
+	fdc.support144 = np2cfg.usefd144;
+#endif
 	fdcstatusreset();
 	dmac_attach(DMADEV_2HD, FDC_DMACH2HD);
 	dmac_attach(DMADEV_2DD, FDC_DMACH2DD);
@@ -817,9 +843,13 @@ void fdc_bind(void) {
 
 	iocore_attachcmnoutex(0x0090, 0x00f9, fdco90, 4);
 	iocore_attachcmninpex(0x0090, 0x00f9, fdci90, 4);
-//	iocore_attachcmnoutex(0x00c8, 0x00f9, fdco90, 4);
-//	iocore_attachcmninpex(0x00c8, 0x00f9, fdci90, 4);
+	iocore_attachcmnoutex(0x00c8, 0x00f9, fdco90, 4);
+	iocore_attachcmninpex(0x00c8, 0x00f9, fdci90, 4);
 
+	if (fdc.support144) {
+		iocore_attachout(0x04be, fdc_o4be);
+		iocore_attachinp(0x04be, fdc_i4be);
+	}
 	iocore_attachsysoutex(0x00be, 0x0cff, fdcobe, 1);
 	iocore_attachsysinpex(0x00be, 0x0cff, fdcibe, 1);
 }