--- np2/io/fdc.c	2003/10/16 17:57:52	1.1
+++ np2/io/fdc.c	2003/11/12 00:55:38	1.4
@@ -4,8 +4,6 @@
 
 
 #include	"compiler.h"
-#include	"dosio.h"
-#include	"i286.h"
 #include	"pccore.h"
 #include	"iocore.h"
 #include	"fddfile.h"
@@ -74,6 +72,7 @@ void fdcbusy_error7(NEVENTITEM item) {
 	}
 }
 
+#if 0		// ↑イベントは残しとく...
 static void fdcderay_error7(SINT16 ms) {							// ver0.27
 
 	fdc.busy = 1;
@@ -81,6 +80,7 @@ static void fdcderay_error7(SINT16 ms) {
 	fdc.status &= ~FDCSTAT_RQM;
 	nevent_setbyms(NEVENT_FDCBUSY, ms, fdcbusy_error7, NEVENT_ABSOLUTE);
 }
+#endif
 
 
 // ----------------------------------------------------------------------
@@ -352,6 +352,7 @@ static void readsector(void) {
 		fdcsend_error7();
 		return;
 	}
+
 	fdc.event = FDCEVENT_BUFSEND2;
 	fdc.bufp = 0;
 #if 1															// ver0.27 ??
@@ -467,7 +468,16 @@ static void FDC_ReadID(void) {							// 
 
 	switch(fdc.event) {
 		case FDCEVENT_CMDRECV:
+			fdc.mf = fdc.cmd & 0x40;
 			get_hdus();
+			if (fdd_readid() == SUCCESS) {
+				fdcsend_success7();
+			}
+			else {
+				fdc.stat[fdc.us] = fdc.us | (fdc.hd << 2) |
+													FDCRLT_IC0 | FDCRLT_MA;
+				fdcsend_error7();
+			}
 			break;
 	}
 }
@@ -586,7 +596,7 @@ static const FDCOPE FDC_Ope[0x20] = {
 				FDC_Recalibrate,
 				FDC_SenceintStatus,
 				FDC_WriteData,
-				FDC_Invalid,			// FDC_ReadID,
+				FDC_ReadID,
 				FDC_Invalid,
 				FDC_ReadData,
 				FDC_WriteID,
@@ -704,6 +714,7 @@ BYTE DMACCALL fdc_DataRegRead(void) {
 
 static void IOOUTCALL fdc_o92(UINT port, BYTE dat) {
 
+//	TRACEOUT(("fdc out %x %x", port, dat));
 	CTRL_FDMEDIA = DISKTYPE_2HD;
 	if ((fdc.status & (FDCSTAT_RQM | FDCSTAT_DIO)) == FDCSTAT_RQM) {
 		fdc_DataRegWrite(dat);
@@ -713,6 +724,7 @@ static void IOOUTCALL fdc_o92(UINT port,
 
 static void IOOUTCALL fdc_o94(UINT port, BYTE dat) {
 
+//	TRACEOUT(("fdc out %x %x", port, dat));
 	CTRL_FDMEDIA = DISKTYPE_2HD;
 	if ((fdc.ctrlreg ^ dat) & 0x10) {
 		fdcstatusreset();
@@ -725,6 +737,7 @@ static void IOOUTCALL fdc_o94(UINT port,
 
 static BYTE IOINPCALL fdc_i90(UINT port) {
 
+//	TRACEOUT(("fdc in %x %x", port, fdc.status));
 	CTRL_FDMEDIA = DISKTYPE_2HD;
 
 	(void)port;
@@ -744,6 +757,7 @@ static BYTE IOINPCALL fdc_i92(UINT port)
 		ret = fdc.lastdata;
 	}
 	(void)port;
+//	TRACEOUT(("fdc in %x %x", port, ret));
 	return(ret);
 }