--- np2/io/cpuio.c	2003/12/25 19:26:55	1.6
+++ np2/io/cpuio.c	2004/01/23 15:05:05	1.10
@@ -2,25 +2,20 @@
 #include	"cpucore.h"
 #include	"pccore.h"
 #include	"iocore.h"
-#include	"sound.h"
-#include	"fmboard.h"
-
-// ¸å¤ÇÄ´À°
-#if defined(CPUCORE_IA32)
-DWORD cpumem_addrmask = 0xfffff;
-#endif
 
 
 // ---- I/O
 
 static void IOOUTCALL cpuio_of0(UINT port, REG8 dat) {
 
-	CPU_ADRSMASK = 0x0fffff;
-#if defined(CPUCORE_IA32)
-	cpumem_addrmask = 0xfffff;
+#if defined(TRACE)
+	if (CPU_MSW & 1) {
+		TRACEOUT(("80286 ProtectMode Disable"));
+	}
 #endif
+	epsonio.cpumode = (CPU_MSW & 1)?'P':'R';
+	CPU_ADRSMASK = 0x0fffff;
 	CPU_RESETREQ = 1;
-//	CPU_INTERRUPT(0x02);
 	nevent_forceexit();
 	(void)port;
 	(void)dat;
@@ -29,9 +24,6 @@ static void IOOUTCALL cpuio_of0(UINT por
 static void IOOUTCALL cpuio_of2(UINT port, REG8 dat) {
 
 	CPU_ADRSMASK = 0xffffffff;
-#if defined(CPUCORE_IA32)
-	cpumem_addrmask = 0xffffffff;
-#endif
 	(void)port;
 	(void)dat;
 }
@@ -40,7 +32,7 @@ static REG8 IOINPCALL cpuio_if0(UINT por
 
 	BYTE	ret;
 
-	if (!(usesound & 0x80)) {
+	if (!(pccore.sound & 0x80)) {
 		ret = 0x00;
 	}
 	else {				// for AMD-98
@@ -67,17 +59,10 @@ static void IOOUTCALL cpuio_of6(UINT por
 	switch(dat) {
 		case 0x02:
 			CPU_ADRSMASK = 0xffffffff;
-#if defined(CPUCORE_IA32)
-			cpumem_addrmask = 0xffffffff;
-#endif
 			break;
 
 		case 0x03:
 			CPU_ADRSMASK = 0x0fffff;
-#if defined(CPUCORE_IA32)
-			cpumem_addrmask = 0xfffff;
-#endif
-			break;
 	}
 	(void)port;
 }