--- np2/bios/bios13.c	2003/10/16 17:58:20	1.1.1.1
+++ np2/bios/bios13.c	2005/02/07 14:46:07	1.5
@@ -1,20 +1,20 @@
 #include	"compiler.h"
-#include	"i286.h"
-#include	"memory.h"
+#include	"cpucore.h"
 #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	stat;
+	UINT8	result;
+	UINT8	*p;
+	UINT8	drv;
+	UINT8	drvbit;
 
 //	TRACE_("BIOS", 0x13);
 	iocore_out8(0x08, 0x20);
@@ -43,13 +43,13 @@ 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);
@@ -59,9 +59,9 @@ void bios0x13(void) {
 			}
 			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;