--- np2/cbus/ideio.c	2004/03/19 03:36:52	1.1
+++ np2/cbus/ideio.c	2004/08/07 19:06:59	1.7
@@ -1,5 +1,7 @@
 #include	"compiler.h"
 
+// winでidentifyまでは取得に行くんだけどな…ってAnex86も同じか
+
 #if defined(SUPPORT_IDEIO)
 
 #include	"dosio.h"
@@ -9,6 +11,7 @@
 #include	"ideio.h"
 #include	"atapicmd.h"
 #include	"sxsi.h"
+#include	"idebios.res"
 
 
 	IDEIO	ideio;
@@ -16,26 +19,43 @@
 
 static IDEDEV getidedev(void) {
 
-	IDEDEV	ret;
+	UINT	bank;
 
-	ret = ideio.dev + (ideio.bank[1] & 1);
-	return(ret);
+	bank = ideio.bank[1] & 0x7f;
+	if (bank < 2) {
+		return(ideio.dev + bank);
+	}
+	else {
+		return(NULL);
+	}
 }
 
 static IDEDRV getidedrv(void) {
 
 	IDEDEV	dev;
+	IDEDRV	drv;
 
-	dev = ideio.dev + (ideio.bank[1] & 1);
-	return(dev->drv + dev->drivesel);
+	dev = getidedev();
+	if (dev) {
+		drv = dev->drv + dev->drivesel;
+		if (drv->device != IDETYPE_NONE) {
+			return(drv);
+		}
+	}
+	return(NULL);
 }
 
+static const char serial[] = "824919341192        ";
+static const char firm[] = "A5U.1200";
+static const char model[] = "QUANTUM FIREBALL CR                     ";
+
 static BOOL setidentify(IDEDRV drv) {
 
 	SXSIDEV sxsi;
 	UINT16	tmp[256];
 	BYTE	*p;
 	UINT	i;
+	UINT32	size;
 
 	sxsi = sxsi_getptr(drv->sxsidrv);
 	if ((sxsi == NULL) || (sxsi->fname[0] == '\0')) {
@@ -44,9 +64,43 @@ static BOOL setidentify(IDEDRV drv) {
 
 	ZeroMemory(tmp, sizeof(tmp));
 	// とりあえず使ってる部分だけ
+	tmp[0] = 0x0040;
 	tmp[1] = sxsi->cylinders;
 	tmp[3] = sxsi->surfaces;
+	tmp[4] = sxsi->sectors * 512;
 	tmp[6] = sxsi->sectors;
+	for (i=0; i<10; i++) {
+		tmp[10+i] = (serial[i*2] << 8) + serial[i*2+1];
+	}
+	tmp[22] = 4;
+	for (i=0; i<4; i++) {
+		tmp[23+i] = (firm[i*2] << 8) + firm[i*2+1];
+	}
+	for (i=0; i<20; i++) {
+		tmp[27+i] = (model[i*2] << 8) + model[i*2+1];
+	}
+#if IDEIO_MULTIPLE_MAX > 0
+	tmp[47] = 0x8000 | IDEIO_MULTIPLE_MAX;	// multiple
+#endif
+	tmp[49] = 0x0000;			// LBA(1 << 9)
+	tmp[51] = 0x0200;
+	tmp[53] = 0x0001;
+	tmp[54] = sxsi->cylinders;
+	tmp[55] = sxsi->surfaces;
+	tmp[56] = sxsi->sectors;
+	size = sxsi->cylinders * sxsi->surfaces * sxsi->sectors;
+	tmp[57] = (UINT16)size;
+	tmp[58] = (UINT16)(size >> 16);
+#if IDEIO_MULTIPLE_MAX > 0
+	tmp[59] = 0x0100 | drv->mulmode;	// current multiple mode
+#endif
+	tmp[60] = (UINT16)size;
+	tmp[61] = (UINT16)(size >> 16);
+	tmp[63] = 0x0000;			// no support multiword DMA
+
+	tmp[80] = 0x0006;			// only support ATA-1/2
+	tmp[81] = 0;
+	tmp[82] = 0x0000;			// DEVICE RESET(1 << 9)
 
 	p = drv->buf;
 	for (i=0; i<256; i++) {
@@ -54,6 +108,7 @@ static BOOL setidentify(IDEDRV drv) {
 		p[1] = (BYTE)(tmp[i] >> 8);
 		p += 2;
 	}
+	drv->bufdir = IDEDIR_IN;
 	drv->bufpos = 0;
 	drv->bufsize = 512;
 	return(SUCCESS);
@@ -61,16 +116,32 @@ static BOOL setidentify(IDEDRV drv) {
 
 static void setintr(IDEDRV drv) {
 
-	ideio.bank[0] = ideio.bank[1] | 0x80;			// ????
-	pic_setirq(IDE_IRQ);
+	if (!(drv->ctrl & IDECTRL_NIEN)) {
+		TRACEOUT(("ideio: setintr()"));
+		ideio.bank[0] = ideio.bank[1] | 0x80;			// ????
+		pic_setirq(IDE_IRQ);
+	}
 }
 
 static void cmdabort(IDEDRV drv) {
 
+	TRACEOUT(("ideio: cmdabort()"));
 	drv->status = IDESTAT_DRDY | IDESTAT_ERR;
 	drv->error = IDEERR_ABRT;
-	ideio.bank[0] = ideio.bank[1] | 0x80;			// ????
-	pic_setirq(IDE_IRQ);
+	setintr(drv);
+}
+
+static void panic(const char *str, ...) {
+
+	char	buf[2048];
+	va_list	ap;
+
+	va_start(ap, str);
+	vsnprintf(buf, sizeof(buf), str, ap);
+	va_end(ap);
+
+	msgbox("ide_panic", buf);
+	exit(1);
 }
 
 
@@ -78,36 +149,50 @@ static void cmdabort(IDEDRV drv) {
 
 static void incsec(IDEDRV drv) {
 
-	if (drv->dr & IDEDEV_LBA) {
-		TRACEOUT(("ideio: incsec() LBA mode?"));
-		return;
-	}
-	drv->sn++;
-	if (drv->sn <= drv->sectors) {
-		return;
+	if (!(drv->dr & IDEDEV_LBA)) {
+		drv->sn++;
+		if (drv->sn <= drv->sectors) {
+			return;
+		}
+		drv->sn = 1;
+		drv->hd++;
+		if (drv->hd < drv->surfaces) {
+			return;
+		}
+		drv->hd = 0;
+		drv->cy++;
 	}
-	drv->sn = 1;
-	drv->hd++;
-	if (drv->hd < drv->surfaces) {
-		return;
+	else {
+		TRACEOUT(("ideio: incsec() LBA mode?"));
+		drv->sn++;
+		if (drv->sn) {
+			return;
+		}
+		drv->cy++;
+		if (drv->cy) {
+			return;
+		}
+		drv->hd++;
 	}
-	drv->hd = 0;
-	drv->cy++;
 }
 
-static long getcursec(const _IDEDRV *drv) {
+static long getcursec(const IDEDRV drv) {
 
 	long	ret;
 
-	if (drv->dr & IDEDEV_LBA) {
+	if (!(drv->dr & IDEDEV_LBA)) {
+		ret = drv->cy;
+		ret *= drv->surfaces;
+		ret += drv->hd;
+		ret *= drv->sectors;
+		ret += (drv->sn - 1);
+	}
+	else {
 		TRACEOUT(("ideio: getcursec() LBA mode?"));
-		return(-1);
+		ret = drv->sn;
+		ret |= (drv->cy << 8);
+		ret |= (drv->hd << 24);
 	}
-	ret = drv->cy;
-	ret *= drv->surfaces;
-	ret += drv->hd;
-	ret *= drv->sectors;
-	ret += (drv->sn - 1);
 	return(ret);
 }
 
@@ -119,18 +204,22 @@ static void readsec(IDEDRV drv) {
 		goto read_err;
 	}
 	sec = getcursec(drv);
-	TRACEOUT(("readsec->drv %d sec %x", drv->sxsidrv, sec));
+	TRACEOUT(("readsec->drv %d sec %x cnt %d thr %d",
+								drv->sxsidrv, sec, drv->mulcnt, drv->multhr));
 	if (sxsi_read(drv->sxsidrv, sec, drv->buf, 512)) {
-		TRACEOUT(("readerror!"));
+		TRACEOUT(("read error!"));
 		goto read_err;
 	}
 	drv->bufdir = IDEDIR_IN;
 	drv->bufpos = 0;
 	drv->bufsize = 512;
 
-	drv->status = IDESTAT_DRDY | IDESTAT_DSC | IDESTAT_DRQ;
-	drv->error = 0;
-	setintr(drv);
+	if ((drv->mulcnt & (drv->multhr - 1)) == 0) {
+		drv->status = IDESTAT_DRDY | IDESTAT_DSC | IDESTAT_DRQ;
+		drv->error = 0;
+		setintr(drv);
+	}
+	drv->mulcnt++;
 	return;
 
 read_err:
@@ -142,9 +231,9 @@ read_err:
 
 static void IOOUTCALL ideio_o430(UINT port, REG8 dat) {
 
-	TRACEOUT(("ideio setbank%d %.2x [%.4x:%.4x]",
-									(port >> 1) & 1, dat, CPU_CS, CPU_IP));
-	if ((dat == 0) || (dat == 1)) {
+	TRACEOUT(("ideio setbank%d %.2x [%.4x:%.8x]",
+									(port >> 1) & 1, dat, CPU_CS, CPU_EIP));
+	if (!(dat & 0x80)) {
 		ideio.bank[(port >> 1) & 1] = dat;
 	}
 }
@@ -157,9 +246,9 @@ static REG8 IOINPCALL ideio_i430(UINT po
 	bank = (port >> 1) & 1;
 	ret = ideio.bank[bank];
 	ideio.bank[bank] = ret & (~0x80);
-	TRACEOUT(("ideio getbank%d %.2x [%.4x:%.4x]",
-									(port >> 1) & 1, ret, CPU_CS, CPU_IP));
-	return(ret);
+	TRACEOUT(("ideio getbank%d %.2x [%.4x:%.8x]",
+									(port >> 1) & 1, ret, CPU_CS, CPU_EIP));
+	return(ret & 0x81);
 }
 
 
@@ -170,17 +259,24 @@ static void IOOUTCALL ideio_o642(UINT po
 	IDEDRV	drv;
 
 	drv = getidedrv();
-	drv->wp = dat;
-	TRACEOUT(("ideio set WP %.2x [%.4x:%.4x]", dat, CPU_CS, CPU_IP));
+	if (drv) {
+		drv->wp = dat;
+		TRACEOUT(("ideio set WP %.2x [%.4x:%.8x]", dat, CPU_CS, CPU_EIP));
+	}
+	(void)port;
 }
 
 static void IOOUTCALL ideio_o644(UINT port, REG8 dat) {
 
 	IDEDRV	drv;
 
+	(void)port;
 	drv = getidedrv();
-	drv->sc = dat;
-	TRACEOUT(("ideio set SC %.2x [%.4x:%.4x]", dat, CPU_CS, CPU_IP));
+	if (drv) {
+		drv->sc = dat;
+		TRACEOUT(("ideio set SC %.2x [%.4x:%.8x]", dat, CPU_CS, CPU_EIP));
+	}
+	(void)port;
 }
 
 static void IOOUTCALL ideio_o646(UINT port, REG8 dat) {
@@ -188,8 +284,11 @@ static void IOOUTCALL ideio_o646(UINT po
 	IDEDRV	drv;
 
 	drv = getidedrv();
-	drv->sn = dat;
-	TRACEOUT(("ideio set SN %.2x [%.4x:%.4x]", dat, CPU_CS, CPU_IP));
+	if (drv) {
+		drv->sn = dat;
+		TRACEOUT(("ideio set SN %.2x [%.4x:%.8x]", dat, CPU_CS, CPU_EIP));
+	}
+	(void)port;
 }
 
 static void IOOUTCALL ideio_o648(UINT port, REG8 dat) {
@@ -197,9 +296,12 @@ static void IOOUTCALL ideio_o648(UINT po
 	IDEDRV	drv;
 
 	drv = getidedrv();
-	drv->cy &= 0xff00;
-	drv->cy |= dat;
-	TRACEOUT(("ideio set CYL %.2x [%.4x:%.4x]", dat, CPU_CS, CPU_IP));
+	if (drv) {
+		drv->cy &= 0xff00;
+		drv->cy |= dat;
+		TRACEOUT(("ideio set CYL %.2x [%.4x:%.8x]", dat, CPU_CS, CPU_EIP));
+	}
+	(void)port;
 }
 
 static void IOOUTCALL ideio_o64a(UINT port, REG8 dat) {
@@ -207,9 +309,12 @@ static void IOOUTCALL ideio_o64a(UINT po
 	IDEDRV	drv;
 
 	drv = getidedrv();
-	drv->cy &= 0x00ff;
-	drv->cy |= dat << 8;
-	TRACEOUT(("ideio set CYH %.2x [%.4x:%.4x]", dat, CPU_CS, CPU_IP));
+	if (drv) {
+		drv->cy &= 0x00ff;
+		drv->cy |= dat << 8;
+		TRACEOUT(("ideio set CYH %.2x [%.4x:%.8x]", dat, CPU_CS, CPU_EIP));
+	}
+	(void)port;
 }
 
 static void IOOUTCALL ideio_o64c(UINT port, REG8 dat) {
@@ -217,42 +322,114 @@ static void IOOUTCALL ideio_o64c(UINT po
 	IDEDEV	dev;
 	UINT	drvnum;
 
+	dev = getidedev();
+	if (dev == NULL) {
+		return;
+	}
 #if defined(TRACE)
 	if ((dat & 0xf0) != 0xa0) {
 		TRACEOUT(("ideio set SDH illegal param? (%.2x)", dat));
 	}
 #endif
 	drvnum = (dat >> 4) & 1;
-	dev = getidedev();
 	dev->drivesel = drvnum;
 	dev->drv[drvnum].dr = dat & 0xf0;
 	dev->drv[drvnum].hd = dat & 0x0f;
-	TRACEOUT(("ideio set DRHD %.2x [%.4x:%.4x]", dat, CPU_CS, CPU_IP));
+	TRACEOUT(("ideio set DRHD %.2x [%.4x:%.8x]", dat, CPU_CS, CPU_EIP));
+	(void)port;
 }
 
 static void IOOUTCALL ideio_o64e(UINT port, REG8 dat) {
 
 	IDEDRV	drv;
+	IDEDEV	dev;
+
+	// execute device diagnostic
+	if (dat == 0x90) {
+		TRACEOUT(("ideio set cmd %.2x [%.4x:%.8x]", dat, CPU_CS, CPU_EIP));
+		TRACEOUT(("ideio: execute device diagnostic"));
+		dev = getidedev();
+		if (dev) {
+			IDEDRV d;
+			int i;
+
+			for (i = 0; i < 2; i++) {
+				d = dev->drv + i;
+				d->hd = 0x00;
+				d->sc = 0x01;
+				d->sn = 0x01;
+				d->cy = 0x0000;
+				d->status = IDESTAT_DRDY;
+				d->error = 0x01;
+				if (i == 0) {
+					if (dev->drv[0].device == IDETYPE_NONE) {
+						d->error = 0x00;
+					}
+					if (dev->drv[1].device == IDETYPE_NONE) {
+						d->error |= 0x80;
+					}
+				}
+				else {
+					if (dev->drv[1].device == IDETYPE_NONE) {
+						d->error = 0x00;
+					}
+				}
+			}
+		}
+		return;
+	}
 
 	drv = getidedrv();
+	if (drv == NULL) {
+		return;
+	}
 	drv->cmd = dat;
-	TRACEOUT(("ideio set cmd %.2x [%.4x:%.4x]", dat, CPU_CS, CPU_IP));
+	TRACEOUT(("ideio set cmd %.2x [%.4x:%.8x]", dat, CPU_CS, CPU_EIP));
 	switch(dat) {
-		case 0x08:		// atapi reset
-			if (drv->device == IDETYPE_CDROM) {
-				drv->hd = 0;
-				drv->sc = 1;
-				drv->sn = 1;
+		case 0x08:		// device reset
+			TRACEOUT(("ideio: device reset"));
+			if (drv->device == IDETYPE_NONE) {
+				cmdabort(drv);
+				break;
+			}
+			else if (drv->device == IDETYPE_HDD) {
+				drv->hd = 0x00;
+				drv->sc = 0x01;
+				drv->sn = 0x01;
+				drv->cy = 0x0000;
+			}
+			else if (drv->device == IDETYPE_CDROM) {
+				drv->hd = 0x10;
+				drv->sc = 0x01;
+				drv->sn = 0x01;
 				drv->cy = 0xeb14;
-				drv->status = 0;
-				drv->error = 0;
 			}
+			drv->status = 0x00;
+			drv->error = 0x01;
+			dev = getidedev();
+			if (dev) {
+				if (dev->drivesel == 0) {
+					if (dev->drv[0].device == IDETYPE_NONE) {
+						drv->error = 0x00;
+					}
+					if (dev->drv[1].device == IDETYPE_NONE) {
+						drv->error |= 0x80;
+					}
+				}
+				else {
+					if (dev->drv[1].device == IDETYPE_NONE) {
+						drv->error = 0x00;
+					}
+				}
+			}
+			setintr(drv);
 			break;
 
 		case 0x10:		// calibrate
 //		case 0x11: case 0x12: case 0x13: case 0x14: case 0x15:
 //		case 0x16: case 0x17: case 0x18: case 0x19: case 0x1a:
 //		case 0x1b: case 0x1c: case 0x1d: case 0x1e: case 0x1f:
+			TRACEOUT(("ideio: calibrate"));
 			if (drv->device) {
 				drv->status = IDESTAT_DRDY | IDESTAT_DSC;
 				drv->error = 0;
@@ -266,13 +443,16 @@ static void IOOUTCALL ideio_o64e(UINT po
 
 		case 0x20:		// read (with retry)
 		case 0x21:		// read
+			TRACEOUT(("ideio: read sector"));
+			drv->mulcnt = 0;
+			drv->multhr = 1;
 			readsec(drv);
 			break;
 
 		case 0x91:		// set parameters
 			TRACEOUT(("ideio: set parameters dh=%x sec=%x",
 											drv->dr | drv->hd, drv->sc));
-			if (drv->device) {
+			if (drv->device != IDETYPE_NONE) {
 				drv->surfaces = drv->hd + 1;
 				drv->sectors = drv->sc;
 				drv->status &= ~(IDESTAT_BSY | IDESTAT_DRQ | IDESTAT_ERR);
@@ -298,8 +478,9 @@ static void IOOUTCALL ideio_o64e(UINT po
 			}
 			break;
 
-		case 0xec:		// indentify
-			TRACEOUT(("ideio: indentify"));
+		case 0xa1:		// identify
+		case 0xec:		// identify
+			TRACEOUT(("ideio: identify"));
 			if (setidentify(drv) == SUCCESS) {
 				drv->status = IDESTAT_DRDY | IDESTAT_DSC | IDESTAT_DRQ;
 				drv->error = 0;
@@ -310,9 +491,45 @@ static void IOOUTCALL ideio_o64e(UINT po
 			}
 			break;
 
+		case 0xc4:		// read multiple
+#if IDEIO_MULTIPLE_MAX > 0
+			TRACEOUT(("ideio: read multiple"));
+			drv->mulcnt = 0;
+			drv->multhr = drv->mulmode;
+			readsec(drv);
+#else
+			cmdabort(drv);
+#endif
+			break;
+
+		case 0xc6:		// set multiple mode
+			TRACEOUT(("ideio: set multiple mode"));
+			switch(drv->sc) {
+#if IDEIO_MULTIPLE_MAX > 0
+				case 2: case 4: case 8: case 16: case 32: case 64: case 128:
+					if (drv->sc <= IDEIO_MULTIPLE_MAX) {
+						drv->mulmode = drv->sc;
+						setintr(drv);
+						break;
+					}
+					/*FALLTHROUGH*/
+#endif
+				default:
+					cmdabort(drv);
+					break;
+			}
+			break;
+
+		case 0xef:		// set features
+			TRACEOUT(("ideio: set features reg = %.2x", drv->wp));
+			cmdabort(drv);
+			break;
+
 		default:
+			panic("ideio: unknown command %.2x", dat);
 			break;
 	}
+	(void)port;
 }
 
 static void IOOUTCALL ideio_o74c(UINT port, REG8 dat) {
@@ -321,6 +538,9 @@ static void IOOUTCALL ideio_o74c(UINT po
 	REG8	modify;
 
 	dev = getidedev();
+	if (dev == NULL) {
+		return;
+	}
 	modify = dev->drv[0].ctrl ^ dat;
 	dev->drv[0].ctrl = dat;
 	dev->drv[1].ctrl = dat;
@@ -342,12 +562,16 @@ static void IOOUTCALL ideio_o74c(UINT po
 			}
 		}
 	}
-	TRACEOUT(("ideio %.4x,%.2x [%.4x:%.4x]", port, dat, CPU_CS, CPU_IP));
+	TRACEOUT(("ideio interrupt %sable", (dat & IDECTRL_NIEN) ? "dis" : "en"));
+	TRACEOUT(("ideio devctrl %.2x [%.4x:%.8x]", dat, CPU_CS, CPU_EIP));
+	(void)port;
 }
 
 static void IOOUTCALL ideio_o74e(UINT port, REG8 dat) {
 
-	TRACEOUT(("ideio %.4x,%.2x [%.4x:%.4x]", port, dat, CPU_CS, CPU_IP));
+	TRACEOUT(("ideio %.4x,%.2x [%.4x:%.8x]", port, dat, CPU_CS, CPU_EIP));
+	(void)port;
+	(void)dat;
 }
 
 
@@ -357,46 +581,82 @@ static REG8 IOINPCALL ideio_i642(UINT po
 
 	IDEDRV	drv;
 
+	(void)port;
+
 	drv = getidedrv();
-	drv->status &= ~IDESTAT_ERR;
-	TRACEOUT(("ideio get error %.2x [%.4x:%.4x]", drv->error, CPU_CS, CPU_IP));
-	return(drv->error);
+	if (drv) {
+		drv->status &= ~IDESTAT_ERR;
+		TRACEOUT(("ideio get error %.2x [%.4x:%.8x]",
+												drv->error, CPU_CS, CPU_EIP));
+		return(drv->error);
+	}
+	else {
+		return(0xff);
+	}
 }
 
 static REG8 IOINPCALL ideio_i644(UINT port) {
 
 	IDEDRV	drv;
 
+	(void)port;
+
 	drv = getidedrv();
-	TRACEOUT(("ideio get SC %.2x [%.4x:%.4x]", drv->sc, CPU_CS, CPU_IP));
-	return(drv->sc);
+	if (drv) {
+		TRACEOUT(("ideio get SC %.2x [%.4x:%.8x]", drv->sc, CPU_CS, CPU_EIP));
+		return(drv->sc);
+	}
+	else {
+		return(0xff);
+	}
 }
 
 static REG8 IOINPCALL ideio_i646(UINT port) {
 
 	IDEDRV	drv;
 
+	(void)port;
+
 	drv = getidedrv();
-	TRACEOUT(("ideio get SN %.2x [%.4x:%.4x]", drv->sn, CPU_CS, CPU_IP));
-	return(drv->sn);
+	if (drv) {
+		TRACEOUT(("ideio get SN %.2x [%.4x:%.8x]", drv->sn, CPU_CS, CPU_EIP));
+		return(drv->sn);
+	}
+	else {
+		return(0xff);
+	}
 }
 
 static REG8 IOINPCALL ideio_i648(UINT port) {
 
 	IDEDRV	drv;
 
+	(void)port;
+
 	drv = getidedrv();
-	TRACEOUT(("ideio get CYL %.4x [%.4x:%.4x]", drv->cy, CPU_CS, CPU_IP));
-	return((UINT8)drv->cy);
+	if (drv) {
+		TRACEOUT(("ideio get CYL %.4x [%.4x:%.8x]", drv->cy, CPU_CS, CPU_EIP));
+		return((UINT8)drv->cy);
+	}
+	else {
+		return(0xff);
+	}
 }
 
 static REG8 IOINPCALL ideio_i64a(UINT port) {
 
 	IDEDRV	drv;
 
+	(void)port;
+
 	drv = getidedrv();
-	TRACEOUT(("ideio get CYH %.4x [%.4x:%.4x]", drv->cy, CPU_CS, CPU_IP));
-	return((REG8)(drv->cy >> 8));
+	if (drv) {
+		TRACEOUT(("ideio get CYH %.4x [%.4x:%.8x]", drv->cy, CPU_CS, CPU_EIP));
+		return((REG8)(drv->cy >> 8));
+	}
+	else {
+		return(0xff);
+	}
 }
 
 static REG8 IOINPCALL ideio_i64c(UINT port) {
@@ -404,25 +664,55 @@ static REG8 IOINPCALL ideio_i64c(UINT po
 	IDEDRV	drv;
 	REG8	ret;
 
+	(void)port;
+
 	drv = getidedrv();
-	ret = drv->dr | drv->hd;
-	TRACEOUT(("ideio get DRHD %.2x [%.4x:%.4x]", ret, CPU_CS, CPU_IP));
-	return(ret);
+	if (drv) {
+		ret = drv->dr | drv->hd;
+		TRACEOUT(("ideio get DRHD %.2x [%.4x:%.8x]", ret, CPU_CS, CPU_EIP));
+		return(ret);
+	}
+	else {
+		return(0xff);
+	}
 }
 
 static REG8 IOINPCALL ideio_i64e(UINT port) {
 
 	IDEDRV	drv;
 
+	(void)port;
+
 	drv = getidedrv();
-	TRACEOUT(("ideio status %.2x [%.4x:%.4x]", drv->status, CPU_CS, CPU_IP));
-	return(drv->status);
+	if (drv) {
+		TRACEOUT(("ideio status %.2x [%.4x:%.8x]",
+											drv->status, CPU_CS, CPU_EIP));
+		if (!(drv->ctrl & IDECTRL_NIEN)) {
+			TRACEOUT(("ideio: resetirq"));
+			pic_resetirq(IDE_IRQ);
+		}
+		return(drv->status);
+	}
+	else {
+		return(0xff);
+	}
 }
 
 static REG8 IOINPCALL ideio_i74c(UINT port) {
 
-	TRACEOUT(("ideio %.4x [%.4x:%.4x]", port, CPU_CS, CPU_IP));
-	return(0xff);
+	IDEDRV	drv;
+
+	(void)port;
+
+	drv = getidedrv();
+	if (drv) {
+		TRACEOUT(("ideio alt status %.2x [%.4x:%.8x]",
+											drv->status, CPU_CS, CPU_EIP));
+		return(drv->status);
+	}
+	else {
+		return(0xff);
+	}
 }
 
 
@@ -434,12 +724,13 @@ void IOOUTCALL ideio_w16(UINT port, REG1
 	BYTE	*p;
 
 	drv = getidedrv();
-	if ((drv->status & IDESTAT_DRQ) && (drv->bufdir == IDEDIR_OUT)) {
+	if ((drv != NULL) &&
+		(drv->status & IDESTAT_DRQ) && (drv->bufdir == IDEDIR_OUT)) {
 		p = drv->buf + drv->bufpos;
 		p[0] = (BYTE)value;
 		p[1] = (BYTE)(value >> 8);
-		TRACEOUT(("ide-data send %4x (%.4x) [%.4x:%.4x]",
-										value, drv->bufpos, CPU_CS, CPU_IP));
+		TRACEOUT(("ide-data send %4x (%.4x) [%.4x:%.8x]",
+										value, drv->bufpos, CPU_CS, CPU_EIP));
 		drv->bufpos += 2;
 		if (drv->bufpos >= drv->bufsize) {
 			drv->status &= ~IDESTAT_DRQ;
@@ -450,27 +741,34 @@ void IOOUTCALL ideio_w16(UINT port, REG1
 			}
 		}
 	}
+	(void)port;
 }
 
-REG16 IOOUTCALL ideio_r16(UINT port) {
+REG16 IOINPCALL ideio_r16(UINT port) {
 
-	REG16	ret;
 	IDEDRV	drv;
+	REG16	ret;
 	BYTE	*p;
 
-	ret = 0;
+	(void)port;
+
 	drv = getidedrv();
+	if (drv == NULL) {
+		return(0xff);
+	}
+	ret = 0;
 	if ((drv->status & IDESTAT_DRQ) && (drv->bufdir == IDEDIR_IN)) {
 		p = drv->buf + drv->bufpos;
 		ret = p[0] + (p[1] << 8);
-		TRACEOUT(("ide-data recv %4x (%.4x) [%.4x:%.4x]",
-										ret, drv->bufpos, CPU_CS, CPU_IP));
+		TRACEOUT(("ide-data recv %.4x (%.4x) [%.4x:%.8x]",
+										ret, drv->bufpos, CPU_CS, CPU_EIP));
 		drv->bufpos += 2;
 		if (drv->bufpos >= drv->bufsize) {
 			drv->status &= ~IDESTAT_DRQ;
 			switch(drv->cmd) {
 				case 0x20:
 				case 0x21:
+				case 0xc4:
 					incsec(drv);
 					drv->sc--;
 					if (drv->sc) {
@@ -507,10 +805,12 @@ static void devinit(IDEDRV drv, REG8 sxs
 		drv->device = IDETYPE_HDD;
 		drv->surfaces = sxsi->surfaces;
 		drv->sectors = sxsi->sectors;
+		drv->mulmode = 1;
 	}
 	else {
 		drv->status = IDESTAT_ERR;
 		drv->error = IDEERR_TR0;
+		drv->device = IDETYPE_NONE;
 	}
 }
 
@@ -525,7 +825,7 @@ void ideio_reset(void) {
 		devinit(drv, i);
 	}
 
-#if 1		// CD-ROM test
+#if 0		// CD-ROM test
 	drv = ideio.dev[1].drv;
 	drv->hd = 0;
 	drv->sc = 1;
@@ -547,6 +847,9 @@ void ideio_reset(void) {
 	ideio.dev[1].drv[0].sxsidrv = 0x02;
 	ideio.dev[1].drv[1].sxsidrv = 0x03;
 #endif
+
+	CopyMemory(mem + 0xd0000, idebios, sizeof(idebios));
+	TRACEOUT(("use simulate ide.rom"));
 }
 
 void ideio_bind(void) {
@@ -577,5 +880,5 @@ void ideio_bind(void) {
 		iocore_attachinp(0x074c, ideio_i74c);
 	}
 }
-#endif
 
+#endif	/* SUPPORT_IDEIO */