--- xmil/io/fdc.c	2004/08/13 01:35:59	1.13
+++ xmil/io/fdc.c	2004/08/19 09:50:20	1.20
@@ -12,12 +12,34 @@
 
 static const UINT8 fdctype[] = {1,1,1,1,1,1,1,1,2,2,2,2,3,4,3,3};
 
+enum {
+	TAO_MODE_GAP	= 0x4e,
+	TAO_MODE_SYNC	= 0x00,
+	TAO_MODE_AM		= 0xf5,
+	TAO_MODE_IM		= 0xf6,
+	TAO_MODE_ID		= 0xfe,
+	TAO_MODE_DATA	= 0xfb,
+	TAO_ENDOFDATA	= 0xf7,
+
+	TAO_CMD_GAP		= 0x4e,
+	TAO_CMD_SYNC	= 0x00,
+	TAO_CMD_IM_IN	= 0xf6,
+	TAO_CMD_IM		= 0xfc,
+	TAO_CMD_AM_IN	= 0xf5,
+	TAO_CMD_IAM		= 0xfe,
+	TAO_CMD_DAM		= 0xfb,
+	TAO_CMD_DDAM	= 0xf8,
+	TAO_CMD_CRC		= 0xf7
+};
+
+
+// ----
 
 void neitem_fdcbusy(UINT id) {
 
 	fdc.s.busy = FALSE;
 	if (fdc.s.bufdir) {
-		TRACEOUT(("dma ready!"));
+//		TRACEOUT(("dma ready!"));
 		dmac_sendready(TRUE);
 	}
 	(void)id;
@@ -29,8 +51,13 @@ static void setbusy(SINT32 clock) {
 		fdc.s.busy = TRUE;
 		nevent_set(NEVENT_FDC, clock, neitem_fdcbusy, NEVENT_ABSOLUTE);
 	}
+	else {
+		fdc.s.busy = FALSE;
+		nevent_reset(NEVENT_FDC);
+	}
 }
 
+#if defined(SUPPORT_MOTORRISEUP)
 static void setmotor(REG8 drvcmd) {
 
 	UINT	drv;
@@ -76,6 +103,25 @@ void fdc_callback(void) {
 	}
 }
 
+static SINT32 motorwait(REG8 drv) {
+
+	SINT32	curclock;
+	SINT32	nextclock;
+
+	if (fdc.s.motorevent[drv] == FDCMOTOR_STARTING) {
+		curclock = CPU_CLOCK + CPU_BASECLOCK - CPU_REMCLOCK;
+		curclock -= fdc.s.motorclock[drv];
+		if (curclock < (SINT32)pccore.realclock) {
+			nextclock = pccore.realclock - curclock;
+//			TRACEOUT(("motor starting busy %d", nextclock));
+			return(nextclock);
+		}
+	}
+	return(0);
+}
+#endif
+
+
 static REG8 getstat(void) {
 
 	FDDFILE	fdd;
@@ -145,8 +191,8 @@ static REG8 type2cmd(REG8 sc) {
 	FDDFILE	fdd;
 	UINT	size;
 	REG8	stat;
-#if defined(SUPPORT_DISKEXT)
 	SINT32	clock;
+#if defined(SUPPORT_DISKEXT)
 	SINT32	curclock;
 	SINT32	nextclock;
 	UINT32	secinfo;
@@ -163,7 +209,7 @@ static REG8 type2cmd(REG8 sc) {
 	}
 	size = sizeof(fdc.s.buffer);
 	fdd = fddfile + fdc.s.drv;
-	TRACEOUT(("read %.2x %d %d", fdc.s.drv, track, sc));
+//	TRACEOUT(("read %.2x %d %d", fdc.s.drv, track, sc));
 	stat = fdd->read(fdd, fdc.s.media, track, sc, p, &size);
 	if (stat & FDDSTAT_RECNFND) {
 		size = 0;
@@ -186,18 +232,11 @@ static REG8 type2cmd(REG8 sc) {
 	fdc.s.bufsize = size;
 	fdc.s.curtime = 0;
 
-#if defined(SUPPORT_DISKEXT)
-	// ウェイト値を計算
 	clock = 0;
-	if (fdc.s.motorevent[fdc.s.drv] == FDCMOTOR_STARTING) {
-		curclock = CPU_CLOCK + CPU_BASECLOCK - CPU_REMCLOCK;
-		curclock -= fdc.s.motorclock[fdc.s.drv];
-		if (curclock < (SINT32)pccore.realclock) {
-			nextclock = pccore.realclock - curclock;
-			TRACEOUT(("motor starting busy %d", nextclock));
-			clock += nextclock;
-		}
-	}
+#if defined(SUPPORT_MOTORRISEUP)
+	clock += motorwait(fdc.s.drv);
+#endif
+#if defined(SUPPORT_DISKEXT)
 	secinfo = fdd->sec(fdd, fdc.s.media, track, sc);
 	if (secinfo) {
 		nextclock = LOW16(secinfo);
@@ -208,14 +247,12 @@ static REG8 type2cmd(REG8 sc) {
 		if (nextclock < 0) {
 			nextclock += fdc.s.loopclock;
 		}
-		TRACEOUT(("wait clock -> %d [%d/%d]", nextclock,
-									LOW16(secinfo), LOW16(secinfo >> 16)));
+//		TRACEOUT(("wait clock -> %d [%d/%d]", nextclock,
+//									LOW16(secinfo), LOW16(secinfo >> 16)));
 		clock += nextclock;
 	}
-	setbusy(max(clock, 500));
-#else
-	setbusy(500);
 #endif
+	setbusy(max(clock, 500));
 	return(stat);
 }
 
@@ -240,6 +277,7 @@ static REG8 crccmd(void) {
 
 	track = (fdc.s.c << 1) + fdc.s.h;
 	fdd = fddfile + fdc.s.drv;
+// TRACEOUT(("fdd->crc %d %d %d", fdc.s.drv, track, fdc.s.crcnum));
 	stat = fdd->crc(fdd, fdc.s.media, track, fdc.s.crcnum, fdc.s.buffer);
 	if (stat & FDDSTAT_RECNFND) {
 		fdc.s.crcnum = 0;
@@ -249,6 +287,7 @@ static REG8 crccmd(void) {
 		fdc.s.bufdir = FDCDIR_IN;
 		fdc.s.bufsize = 6;
 		fdc.s.rreg = fdc.s.buffer[0];
+		fdc.s.crcnum++;
 	}
 	else {
 		fdc.s.bufdir = FDCDIR_NONE;
@@ -310,7 +349,7 @@ void IOOUTCALL fdc_o(UINT port, REG8 val
 			fdc.s.cmd = value;
 			cmd = (REG8)(value >> 4);
 			fdc.s.type = fdctype[cmd];
-			TRACEOUT(("fdc cmd: %.2x", value));
+//			TRACEOUT(("fdc cmd: %.2x", value));
 			if (fdc.s.bufwrite) {
 				fdc.s.stat = type2flash();
 			}
@@ -322,9 +361,6 @@ void IOOUTCALL fdc_o(UINT port, REG8 val
 			setbusy(20);
 			switch(cmd) {
 				case 0x00:								// リストア
-				//	if (value & 8) {					// LAYDOCK
-				//		setbusy(0);
-				//	}
 					fdc.s.motor = 0x80;					// モーターOn?
 					fdc.s.c = 0;
 					fdc.s.step = 1;
@@ -387,6 +423,7 @@ void IOOUTCALL fdc_o(UINT port, REG8 val
 				case 0x0d:								// フォースインタラプト
 					setbusy(0);							// 必要ない？
 //					fdc.s.skip = 0;						// 000330
+					fdc.s.stat = 0;
 					dmac_sendready(FALSE);
 					break;
 
@@ -404,7 +441,7 @@ void IOOUTCALL fdc_o(UINT port, REG8 val
 			break;
 
 		case 1:									// トラック
-			fdc.s.c = value;
+			fdc.s.creg = value;
 			break;
 
 		case 2:									// セクタ
@@ -436,7 +473,9 @@ void IOOUTCALL fdc_o(UINT port, REG8 val
 				fdc.s.r = 0;						// SACOM TELENET
 				fdc.s.rreg = 0;
 			}
+#if defined(SUPPORT_MOTORRISEUP)
 			setmotor(value);
+#endif
 			break;
 	}
 }
@@ -445,7 +484,7 @@ REG8 IOINPCALL fdc_i(UINT port) {
 
 	REG8	ret;
 
-	TRACEOUT(("fdc inp %.4x", port));
+//	TRACEOUT(("fdc inp %.4x", port));
 
 	if ((port & (~7)) != 0x0ff8) {
 		return(0xff);
@@ -469,7 +508,7 @@ REG8 IOINPCALL fdc_i(UINT port) {
 			if (!(ret & 0x02)) {
 				dmac_sendready(FALSE);
 			}
-			TRACEOUT(("ret->%.2x", ret));
+//			TRACEOUT(("ret->%.2x", ret));
 			return(ret);
 
 		case 1:									// トラック
@@ -482,7 +521,7 @@ REG8 IOINPCALL fdc_i(UINT port) {
 			if (fdc.s.motor) {
 				if (fdc.s.bufdir == FDCDIR_IN) {
 					fdc.s.data = fdc.s.buffer[fdc.s.bufpos];
-// TRACEOUT(("read %.2x %.2x [%.4x]", fdc.s.data, fdc.s.bufpos, Z80_PC));
+// TRACEOUT(("read %.2x - %.2x [%.4x]", fdc.s.bufpos, fdc.s.data, Z80_PC));
 					bufposinc();
 				}
 			}