--- np2/io/Attic/extmem.c	2003/12/08 00:55:32	1.4
+++ np2/io/Attic/extmem.c	2004/01/23 12:04:08	1.7
@@ -1,6 +1,5 @@
 #include	"compiler.h"
 #include	"cpucore.h"
-#include	"memory.h"
 #include	"pccore.h"
 #include	"iocore.h"
 
@@ -91,7 +90,7 @@ BOOL extmem_init(BYTE usemem) {
 		return(FAILURE);
 	}
 	extmem.maxmem = usemem + 1;
-#if defined(CPU386)
+#if defined(CPUCORE_IA32)
 	init_cpumem(usemem);
 #endif
 	return(SUCCESS);
@@ -102,11 +101,15 @@ void extmem_reset(void) {
 
 void extmem_bind(void) {
 
-	iocore_attachout(0x08e1, emm_o08e1);
-	iocore_attachout(0x08e3, emm_o08e1);
-	iocore_attachout(0x08e5, emm_o08e1);
-	iocore_attachout(0x08e7, emm_o08e1);
-	iocore_attachout(0x08e9, emm_o08e9);
-	iocore_attachinp(0x08e9, emm_i08e9);
+#if !defined(CPUCORE_IA32)
+	if (!(np2cfg.dipsw[2] & 0x80)) {
+		iocore_attachout(0x08e1, emm_o08e1);
+		iocore_attachout(0x08e3, emm_o08e1);
+		iocore_attachout(0x08e5, emm_o08e1);
+		iocore_attachout(0x08e7, emm_o08e1);
+		iocore_attachout(0x08e9, emm_o08e9);
+		iocore_attachinp(0x08e9, emm_i08e9);
+	}
+#endif
 }