--- np2/bios/bios13.c	2003/12/12 01:04:39	1.3
+++ np2/bios/bios13.c	2011/01/15 18:04:42	1.6
@@ -3,17 +3,18 @@
 #include	"pccore.h"
 #include	"iocore.h"
 #include	"bios.h"
+#include	"biosmem.h"
 
 
 #define	baseport 0x0090
 
 void bios0x13(void) {
 
-	BYTE	stat;
-	BYTE	result;
-	BYTE	*p;
-	BYTE	drv;
-	BYTE	drvbit;
+	UINT8	status;
+	UINT8	result;
+	UINT8	*p;
+	UINT8	drv;
+	UINT8	drvbit;
 
 //	TRACE_("BIOS", 0x13);
 	iocore_out8(0x08, 0x20);
@@ -21,16 +22,16 @@ void bios0x13(void) {
 		iocore_out8(0x00, 0x20);
 	}
 
-	stat = iocore_inp8(baseport);
+	status = iocore_inp8(baseport);
 	while(1) {
-		if (!(stat & FDCSTAT_CB)) {
-			if ((stat & (FDCSTAT_RQM | FDCSTAT_DIO)) != FDCSTAT_RQM) {
+		if (!(status & FDCSTAT_CB)) {
+			if ((status & (FDCSTAT_RQM | FDCSTAT_DIO)) != FDCSTAT_RQM) {
 				break;
 			}
 			iocore_out8(baseport+2, 0x08);
-			stat = iocore_inp8(baseport);
+			status = iocore_inp8(baseport);
 		}
-		if ((stat & (FDCSTAT_RQM | FDCSTAT_DIO | FDCSTAT_CB))
+		if ((status & (FDCSTAT_RQM | FDCSTAT_DIO | FDCSTAT_CB))
 							!= (FDCSTAT_RQM | FDCSTAT_DIO | FDCSTAT_CB)) {
 			break;
 		}
@@ -42,25 +43,25 @@ void bios0x13(void) {
 		drvbit = 1 << drv;
 #if 0
 		if (result & FDCRLT_IC1) {
-			if (mem[0x0055e] & drvbit) {
+			if (mem[MEMB_DISK_INTL] & drvbit) {
 				continue;
 			}
 			drvbit = 0;
 		}
 #endif
-		p = &mem[0x00564 + (drv * 8)];
+		p = mem + MEMX_DISK_RESULT + (drv * 8);
 		while(1) {
 			*p++ = result;
-			stat = iocore_inp8(baseport);
-			if ((stat & (FDCSTAT_RQM | FDCSTAT_DIO | FDCSTAT_CB))
+			status = iocore_inp8(baseport);
+			if ((status & (FDCSTAT_RQM | FDCSTAT_DIO | FDCSTAT_CB))
 							!= (FDCSTAT_RQM | FDCSTAT_DIO | FDCSTAT_CB)) {
 				break;
 			}
 			result = iocore_inp8(baseport+2);
 		}
-		mem[0x0055e] |= drvbit;
+		mem[MEMB_DISK_INTL] |= drvbit;
 	}
-	if (mem[0x00480] & 0x10) {
+	if (mem[MEMB_SYS_TYPE] & 0x10) {
 		if (mem[0x00485]) {
 			if (!(--mem[0x00485])) {
 				mem[0x005a4] |= 0x0f;