--- xmil/fdd/fdd_d88.c	2004/08/14 12:16:17	1.11
+++ xmil/fdd/fdd_d88.c	2004/08/17 09:35:09	1.12
@@ -453,279 +453,8 @@ static	BYTE		D88_BUF[0x4000];
 static	BYTE		TAO_BUF[0x3000];
 
 
-//----------------------------------------------------------------------
-
-
-static int curdataflush(void) {
-
-	FDDFILE	fdd;
-	FILEH	fh;
-	int		ret = 0;
-
-	if ((!curfp) || (!cursize)) {
-		return(-1);
-	}
-	if (!curwrite) {
-		return(0);
-	}
-	curwrite = 0;
-	fdd = fddfile + curdrv;
-	fh = file_open(fdd->fname);
-	if (fh == FILEH_INVALID) {
-		return(-1);
-	}
-	if ((file_seek(fh, curfp, FSEEK_SET) != curfp) ||
-		(file_write(fh, D88_BUF, cursize) != cursize)) {
-		ret = -1;
-	}
-	if (file_close(fh)) {
-		ret = -1;
-	}
-	return(ret);
-}
-
-
-static DWORD read_d88track(REG8 drv, UINT track, REG8 media) {
-
-	FDDFILE	fdd;
-	FILEH	hdr;
-
-	curdataflush();
-	curdrv = drv;
-	curtrk = track;
-	curtype = media;
-	cursct = (UINT)-1;
-	curwrite = 0;
-	curtrkerr = 0;
-//	crcnum = 0;
-	crcerror = 0;
-
-	fdd = fddfile + drv;
-	if ((drv < 0) || (drv > 3) || (track > 163) ||
-		(media != (fdd->inf.d88.head.fd_type >> 4)) ||
-		((curfp = fdd->inf.d88.ptr[track]) == 0) ||
-		((cursize = nexttrackptr(fdd, curfp,
-								fdd->inf.d88.fd_size) - curfp) > 0x4000)) {
-		goto readd88_err;
-	}
-
-	if ((hdr = file_open(fdd->fname)) == FILEH_INVALID) {
-		goto readd88_err;
-	}
-	if (file_seek(hdr, curfp, FSEEK_SET) != curfp) {
-		file_close(hdr);
-		goto readd88_err;
-	}
-	if (file_read(hdr, D88_BUF, cursize) != cursize) {
-		file_close(hdr);
-		goto readd88_err;
-	}
-	if (file_close(hdr)) {
-		goto readd88_err;
-	}
-	return(TRUE);
-
-readd88_err:
-	curfp = 0;
-	cursize = 0;
-	curtrkerr = 1;
-	return(FALSE);
-}
-
-
-
-
-static int seeksector(REG8 drv, UINT track, UINT r) {
-
-static	int		lastflag = FALSE;
-
-const _D88SEC	*p;
-	UINT		sec;
-	UINT		sectors;
-	UINT		secsize;
-
-	if ((curdrv != drv) || (curtrk != track) || (curtype != fdc.s.media)) {
-		read_d88track(drv, track, fdc.s.media);
-	}
-	if (curtrkerr) {
-		cursct = r;
-		goto seekerror;
-	}
-	if (cursct != r) {
-		cursct = r;
-		p = (D88SEC)D88_BUF;
-		for (sec=0; sec<40; ) {
-			sectors = LOADINTELWORD(p->sectors);
-			secsize = LOADINTELWORD(p->size);
-			if (p->r == r) {
-				CopyMemory(&cursec, p, sizeof(_D88SEC));
-				curdata = (UINT8 *)(p + 1);
-				lastflag = TRUE;
-				break;
-			}
-			sec++;
-			if (sec >= sectors) {
-				goto seekerror;
-			}
-			p = (D88SEC)(((UINT8 *)(p + 1)) + secsize);
-		}
-		if (sec >= 40) {
-			goto seekerror;
-		}
-	}
-	return(lastflag);
-
-seekerror:;
-	ZeroMemory(&cursec, sizeof(_D88SEC));
-	curdata = &D88_BUF[16];
-	lastflag = FALSE;
-	return(FALSE);
-}
-
-
 // ----
 
-
-
-
-//**********************************************************************
-
-
-
-BYTE fdd_stat_d88(void) {
-
-	FDDFILE		fdd;
-	BYTE		type;
-	REG8		cmd;
-	UINT		trk;
-	BYTE		ans = 0;
-	int			seekable;
-
-	fdd = fddfile + fdc.s.drv;
-	if (fdd->type != DISKTYPE_D88) {
-		return(0x80);						// NOT READY
-	}
-	cmd = (REG8)(fdc.s.cmd >> 4);
-	type = fdc.s.type;
-	trk = (fdc.s.c << 1) + fdc.s.h;
-	seekable = seeksector(fdc.s.drv, trk, fdc.s.r);
-	if (!fdc.s.r) {
-		seekable = TRUE;
-	}
-
-	if (type == 0 || type == 1 || type == 4 ||
-		cmd == 0x0a || cmd == 0x0b || cmd == 0x0f) {
-		if (fdd->protect) {					// WRITE PROTECT
-			ans |= 0x40;
-		}
-	}
-	if (type == 2 || cmd == 0x0f) {
-		if (fdc.s.r && cursec.del_flg) {
-			ans |= 0x20;					// RECODE TYPE / WRITE FAULT
-		}
-	}
-	if (type == 1 || type == 2) {
-		if ((trk > 163) || (!seekable)) {
-			ans |= 0x10;					// SEEK ERROR / RECORD NOT FOUND
-		}
-		if ((!(ans & 0xf0)) && fdc.s.r && (cursec.stat)) {
-			ans |= 0x08;					// CRC ERROR
-		}
-	}
-	if (cmd == 0x0c) {
-		if (curtrkerr) {
-			ans |= 0x10;
-		}
-		if (crcerror) {
-			ans |= 0x08;					// CRC ERROR
-		}
-	}
-	if (type == 1 || type == 4) {
-		if (type == 1) {					// ver0.25
-			ans |= 0x20;					// HEAD ENGAGED (X1 デハ ツネニ 1)
-			if (!fdc.s.c) {					// TRACK00
-				ans |= 0x04;
-			}
-		}
-		if (++hole < 8) {					// ver0.25
-			ans |= 0x02;					// INDEX
-		}
-	}
-	else if (!(ans & 0xf0)) {
-		if ((type != 4) && (FDDMTR_BUSY)) {
-			ans |= 0x01;
-		}
-		if (type == 2) {
-			UINT secsize = LOADINTELWORD(cursec.size);
-			if ((UINT)fdc.off < secsize) {
-				ans |= 0x03; 					// DATA REQUEST / BUSY
-			}
-		}
-		else if ((cmd == 0x0c) && (fdc.s.bufpos < 6)) {
-			ans |= 0x03;
-		}
-		else if ((cmd == 0x0e) && (readdiag < 0x1a00)) {
-			ans |= 0x03;
-		}
-		else if (cmd == 0x0f) {
-			if (tao.flag == 3) {
-				if (++tao.lostdatacnt > LOSTDATA_COUNT) {
-					tao.flag = 4;
-				}
-			}
-			ans |= tao.flag;
-		}
-	}
-	return(ans);
-}
-
-
-//**********************************************************************
-
-void fdd_read_d88(void) {
-						// POCO:読めなかったらレジスタを変更させない
-	if ((fdd_stat_d88() & 0xf3) == 3) {
-		fdc.s.data = curdata[fdc.off];
-	}
-}
-
-void fdd_write_d88(void) {
-
-	if ((fdd_stat_d88() & 0xf3) == 3) {
-		curdata[fdc.off] = fdc.s.data;
-		curwrite = 1;
-	}
-}
-
-BYTE fdd_incoff_d88(void) {
-
-	REG8	cmd;
-	UINT	trk;
-	UINT	secsize;
-
-	cmd = (REG8)(fdc.s.cmd >> 4);
-	trk = (fdc.s.c << 1) + fdc.s.h;
-	seeksector(fdc.s.drv, trk, fdc.s.r);
-	fdc.off++;
-	secsize = LOADINTELWORD(cursec.size);
-	if ((UINT)fdc.off < secsize) {
-		return(0);
-	}
-	fdc.off = secsize;
-	if ((cmd == 0x09) || (cmd == 0x0b)) {
-		fdc.s.rreg = fdc.s.r + 1;						// ver0.25
-		if (seeksector(fdc.s.drv, trk, fdc.s.rreg)) {
-			fdc.s.r++;
-			fdc.off = 0;
-			return(0);
-		}
-	}
-	return(1);
-}
-
-
-// ---------------------------------------------------------------------------
-
 void init_tao_d88(void) {
 
 	FDDFILE		fdd;