--- np2/bios/sxsibios.c	2004/03/04 16:58:57	1.12
+++ np2/bios/sxsibios.c	2005/02/07 14:46:07	1.16
@@ -51,7 +51,7 @@ static REG8 sxsibios_write(UINT type, SX
 	long	pos;
 	UINT32	addr;
 	UINT	r;
-	BYTE	work[1024];
+	UINT8	work[1024];
 
 	size = CPU_BX;
 	if (!size) {
@@ -82,7 +82,7 @@ static REG8 sxsibios_read(UINT type, SXS
 	long	pos;
 	UINT32	addr;
 	UINT	r;
-	BYTE	work[1024];
+	UINT8	work[1024];
 
 	size = CPU_BX;
 	if (!size) {
@@ -249,7 +249,7 @@ REG8 sasibios_operate(void) {
 static void scsibios_set(REG8 drv, REG8 sectors, REG8 surfaces,
 									REG16 cylinders, REG16 size, BOOL hwsec) {
 
-	BYTE	*scsiinf;
+	UINT8	*scsiinf;
 	UINT16	inf;
 
 	scsiinf = mem + 0x00460 + ((drv & 7) * 4);
@@ -295,7 +295,7 @@ static REG8 scsibios_init(UINT type, SXS
 
 static REG8 scsibios_sense(UINT type, SXSIDEV sxsi) {
 
-	BYTE	*scsiinf;
+	UINT8	*scsiinf;
 
 	scsiinf = mem + 0x00460 + ((CPU_AL & 7) * 4);
 	if (CPU_AH == 0x24) {
@@ -374,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;
@@ -417,23 +417,23 @@ static void reg_pop(const REGBAK *r) {
 }
 
 typedef struct {
-	BYTE	r_ax[2];
-	BYTE	r_bx[2];
-	BYTE	r_cx[2];
-	BYTE	r_dx[2];
-	BYTE	r_bp[2];
-	BYTE	r_es[2];
-	BYTE	r_di[2];
-	BYTE	r_si[2];
-	BYTE	r_ds[2];
+	UINT8	r_ax[2];
+	UINT8	r_bx[2];
+	UINT8	r_cx[2];
+	UINT8	r_dx[2];
+	UINT8	r_bp[2];
+	UINT8	r_es[2];
+	UINT8	r_di[2];
+	UINT8	r_si[2];
+	UINT8	r_ds[2];
 } B1BREG;
 
 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);
@@ -458,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;