--- xmil/io/memio.c	2004/08/08 17:45:52	1.2
+++ xmil/io/memio.c	2008/06/02 20:07:31	1.6
@@ -1,52 +1,61 @@
 #include	"compiler.h"
+#include	"dosio.h"
 #include	"z80core.h"
 #include	"pccore.h"
 #include	"iocore.h"
+#include	"defipl.res"
+
+
+	UINT8	biosmem[0x8000];
+#if defined(SUPPORT_BANKMEM)
+	UINT8	bankmem[16][0x8000];
+#endif
 
 
 void memio_update(void) {
 
-#if defined(SUPPORT_EMS)
-	if (memio.ems & 0x10) {
+#if defined(SUPPORT_BANKMEM)
+	if (iocore.s.bankmem & 0x10) {
 #endif
-		if (!memio.ram) {
-			RAM0r = mBIOS;
-			RAM0w = mMAIN;
+		if (!(iocore.s.ppib & 0x10)) {
+			z80core.e.memread = biosmem;
 		}
 		else {
-			RAM0r = RAM0w = mMAIN;
+			z80core.e.memread = mainmem;
 		}
-#if defined(SUPPORT_EMS)
+		z80core.e.memwrite = mainmem;
+#if defined(SUPPORT_BANKMEM)
 	}
 	else {
-		RAM0r = RAM0w = mBANK[memio.ems & 15];
+		z80core.e.memread = bankmem[iocore.s.bankmem & 15];
+		z80core.e.memwrite = bankmem[iocore.s.bankmem & 15];
 	}
 #endif
 }
 
-#if defined(SUPPORT_EMS)
-void IOOUTCALL memio_ems_o(UINT port, REG8 dat) {
+#if defined(SUPPORT_BANKMEM)
+void IOOUTCALL memio_bank_o(UINT port, REG8 dat) {
 
-	memio.ems = dat;
+	iocore.s.bankmem = dat;
 	memio_update();
 	(void)port;
 }
 
-REG8 IOINPCALL memio_ems_i(UINT port) {
+REG8 IOINPCALL memio_bank_i(UINT port) {
 
 	(void)port;
-	return(memio.ems);
+	return(iocore.s.bankmem);
 }
 #endif
 
 void IOOUTCALL memio_rom(UINT port, REG8 dat) {
 
-	memio.ram = 0x00;
-#if defined(SUPPORT_EMS)
-	if (memio.ems & 0x10) {
+	iocore.s.ppib &= ~0x10;
+#if defined(SUPPORT_BANKMEM)
+	if (iocore.s.bankmem & 0x10) {
 #endif
-		RAM0r = mBIOS;
-#if defined(SUPPORT_EMS)
+		z80core.e.memread = biosmem;
+#if defined(SUPPORT_BANKMEM)
 	}
 #endif
 	(void)port;
@@ -55,12 +64,12 @@ void IOOUTCALL memio_rom(UINT port, REG8
 
 void IOOUTCALL memio_ram(UINT port, REG8 dat) {
 
-	memio.ram = 0x10;
-#if defined(SUPPORT_EMS)
-	if (memio.ems & 0x10) {
+	iocore.s.ppib |= 0x10;
+#if defined(SUPPORT_BANKMEM)
+	if (iocore.s.bankmem & 0x10) {
 #endif
-		RAM0r = mMAIN;
-#if defined(SUPPORT_EMS)
+		z80core.e.memread = mainmem;
+#if defined(SUPPORT_BANKMEM)
 	}
 #endif
 	(void)port;
@@ -68,13 +77,37 @@ void IOOUTCALL memio_ram(UINT port, REG8
 }
 
 
-// ----
+/* ---- */
+
+static const OEMCHAR iplromx1[] = OEMTEXT("IPLROM.X1");
+static const OEMCHAR iplromx1t[] = OEMTEXT("IPLROM.X1T");
 
 void memio_reset(void) {
 
-	memio.ram = 0x00;
-#if defined(SUPPORT_EMS)
-	memio.ems = 0x78;
+const OEMCHAR	*iplfile;
+	UINT		iplsize;
+	FILEH		fh;
+
+	ZeroMemory(biosmem, 0x8000);
+	CopyMemory(biosmem, defaultiplrom, sizeof(defaultiplrom));
+	if (pccore.ROM_TYPE >= 1) {
+		if (pccore.ROM_TYPE >= 2) {
+			iplfile = iplromx1t;
+			iplsize = 0x8000;
+		}
+		else {
+			iplfile = iplromx1;
+			iplsize = 0x8000;
+		}
+		fh = file_open_rb_c(iplfile);
+		if (fh != FILEH_INVALID) {
+			file_read(fh, biosmem, iplsize);
+			file_close(fh);
+		}
+	}
+
+#if defined(SUPPORT_BANKMEM)
+	iocore.s.bankmem = 0x78;
 #endif
 	memio_update();
 }