--- np2/bios/sxsibios.c	2004/01/27 03:24:19	1.7
+++ np2/bios/sxsibios.c	2004/03/22 05:38:47	1.15
@@ -47,28 +47,28 @@ static REG8 sxsi_pos(UINT type, SXSIDEV 
 static REG8 sxsibios_write(UINT type, SXSIDEV sxsi) {
 
 	REG8	ret;
-	UINT32	addr;
 	UINT	size;
 	long	pos;
+	UINT32	addr;
 	UINT	r;
 	BYTE	work[1024];
 
-	addr = (CPU_ES << 4) + CPU_BP;
 	size = CPU_BX;
 	if (!size) {
 		size = 0x10000;
 	}
 	ret = sxsi_pos(type, sxsi, &pos);
 	if (!ret) {
+		addr = (CPU_ES << 4) + CPU_BP;
 		while(size) {
 			r = min(size, sxsi->size);
-			i286_memx_read(addr, work, r);
+			MEML_READ(addr, work, r);
 			ret = sxsi_write(CPU_AL, pos, work, r);
 			if (ret >= 0x20) {
 				break;
 			}
-			size -= r;
 			addr += r;
+			size -= r;
 			pos++;
 		}
 	}
@@ -78,28 +78,28 @@ static REG8 sxsibios_write(UINT type, SX
 static REG8 sxsibios_read(UINT type, SXSIDEV sxsi) {
 
 	REG8	ret;
-	UINT32	addr;
 	UINT	size;
 	long	pos;
+	UINT32	addr;
 	UINT	r;
 	BYTE	work[1024];
 
-	addr = (CPU_ES << 4) + CPU_BP;
 	size = CPU_BX;
 	if (!size) {
 		size = 0x10000;
 	}
 	ret = sxsi_pos(type, sxsi, &pos);
 	if (!ret) {
+		addr = (CPU_ES << 4) + CPU_BP;
 		while(size) {
 			r = min(size, sxsi->size);
 			ret = sxsi_read(CPU_AL, pos, work, r);
 			if (ret >= 0x20) {
 				break;
 			}
-			i286_memx_write(addr, work, r);
-			size -= r;
+			MEML_WRITE(addr, work, r);
 			addr += r;
+			size -= r;
 			pos++;
 		}
 	}
@@ -186,7 +186,6 @@ static REG8 sasibios_init(UINT type, SXS
 
 static REG8 sasibios_sense(UINT type, SXSIDEV sxsi) {
 
-	TRACEOUT(("sasibios_sense type=%d", type));
 	if (type == SXSIBIOS_SASI) {
 		return((REG8)((sxsi->type >> 8) & 7));
 	}
@@ -246,11 +245,39 @@ REG8 sasibios_operate(void) {
 // ---- scsi
 
 #if defined(SUPPORT_SCSI)
+
+static void scsibios_set(REG8 drv, REG8 sectors, REG8 surfaces,
+									REG16 cylinders, REG16 size, BOOL hwsec) {
+
+	BYTE	*scsiinf;
+	UINT16	inf;
+
+	scsiinf = mem + 0x00460 + ((drv & 7) * 4);
+	inf = 0;
+
+	inf = (UINT16)(cylinders & 0xfff);
+	if (cylinders >= 0x1000) {
+		inf |= 0x4000;
+		surfaces |= (cylinders >> 8) & 0xf0;
+	}
+	if (size == 512) {
+		inf |= 0x1000;
+	}
+	else if (size == 1024) {
+		inf |= 0x2000;
+	}
+	if (hwsec) {
+		inf |= 0x8000;
+	}
+	scsiinf[0] = (UINT8)sectors;
+	scsiinf[1] = (UINT8)surfaces;
+	STOREINTELWORD(scsiinf + 2, inf);
+}
+
 static REG8 scsibios_init(UINT type, SXSIDEV sxsi) {
 
 	UINT8	i;
 	UINT8	bit;
-	UINT32	dat;
 
 	mem[MEMB_DISK_EQUIPS] = 0;
 	ZeroMemory(&mem[0x00460], 0x20);
@@ -258,25 +285,8 @@ static REG8 scsibios_init(UINT type, SXS
 		sxsi = sxsi_getptr((REG8)(0x20 + i));
 		if ((sxsi) && (sxsi->fname[0])) {
 			mem[MEMB_DISK_EQUIPS] |= bit;
-			dat = sxsi->sectors;
-			dat |= (sxsi->surfaces << 8);
-			dat |= sxsi->cylinders & 0xf000;
-			dat |= (sxsi->cylinders & 0xfff) << 16;
-			switch(sxsi->size) {
-				case 256:
-				//	dat |= 0 << (12 + 16);
-					break;
-
-				case 512:
-					dat |= 1 << (12 + 16);
-					break;
-
-				default:
-					dat |= 2 << (12 + 16);
-					break;
-			}
-			dat |= 0xc0000000;
-			SETBIOSMEM32(0x00460+i*4, dat);
+			scsibios_set(i, sxsi->sectors, sxsi->surfaces,
+							sxsi->cylinders, sxsi->size, TRUE);
 		}
 	}
 	(void)type;
@@ -285,16 +295,26 @@ static REG8 scsibios_init(UINT type, SXS
 
 static REG8 scsibios_sense(UINT type, SXSIDEV sxsi) {
 
-	if (CPU_AH == 0x44) {
-		CPU_BX = 1;
+	BYTE	*scsiinf;
+
+	scsiinf = mem + 0x00460 + ((CPU_AL & 7) * 4);
+	if (CPU_AH == 0x24) {
+		scsibios_set(CPU_AL, CPU_DL, CPU_DH, CPU_CX, CPU_BX, FALSE);
+	}
+	else if (CPU_AH == 0x44) {
+		CPU_BX = (scsiinf[3] & 0x80)?2:1;
 	}
 	else if (CPU_AH == 0x84) {
-		CPU_BX = sxsi->size;
-		CPU_CX = sxsi->cylinders;
-		CPU_DH = sxsi->surfaces;
-		CPU_DL = sxsi->sectors;
+		CPU_DL = scsiinf[0];
+		CPU_DH = scsiinf[1] & 0x0f;
+		CPU_CX = scsiinf[2] + ((scsiinf[3] & 0xf) << 8);
+		if (scsiinf[3] & 0x40) {
+			CPU_CX += (scsiinf[1] & 0xf0) << 8;
+		}
+		CPU_BX = 256 << ((scsiinf[3] >> 4) & 3);
 	}
 	(void)type;
+	(void)sxsi;
 	return(0x00);
 }
 
@@ -354,7 +374,7 @@ REG8 scsibios_operate(void) {
 
 // ---- np2sysp
 
-#if defined(SUPPORT_SASI) || defined(SUPPORT_SCSI)
+#if defined(SUPPORT_IDEIO) || defined(SUPPORT_SASI) || defined(SUPPORT_SCSI)
 typedef struct {
 	UINT16	ax;
 	UINT16	cx;
@@ -412,8 +432,8 @@ static void reg_load(UINT seg, UINT off)
 
 	B1BREG	r;
 
-	i286_memstr_read(seg, off, &r, sizeof(r));
-	CPU_FLAGL = i286_membyte_read(seg, off + 0x16);
+	MEML_READSTR(seg, off, &r, sizeof(r));
+	CPU_FLAGL = MEML_READ8(seg, off + 0x16);
 	CPU_AX = LOADINTELWORD(r.r_ax);
 	CPU_BX = LOADINTELWORD(r.r_bx);
 	CPU_CX = LOADINTELWORD(r.r_cx);
@@ -438,12 +458,12 @@ static void reg_store(UINT seg, UINT off
 	STOREINTELWORD(r.r_di, CPU_DI);
 	STOREINTELWORD(r.r_si, CPU_SI);
 	STOREINTELWORD(r.r_ds, CPU_DS);
-	i286_memstr_write(seg, off, &r, sizeof(r));
-	i286_membyte_write(seg, off + 0x16, CPU_FLAGL);
+	MEML_WRITESTR(seg, off, &r, sizeof(r));
+	MEML_WRITE8(seg, off + 0x16, CPU_FLAGL);
 }
 #endif
 
-#if defined(SUPPORT_SASI)
+#if defined(SUPPORT_IDEIO) || defined(SUPPORT_SASI)
 void np2sysp_sasi(const void *arg1, long arg2) {
 
 	UINT	seg;