--- np2/io/mouseif.c	2004/01/13 05:30:58	1.7
+++ np2/io/mouseif.c	2004/03/06 18:25:36	1.10
@@ -3,6 +3,7 @@
 #include	"cpucore.h"
 #include	"pccore.h"
 #include	"iocore.h"
+#include	"keystat.h"
 
 
 // マウス ver0.28
@@ -19,7 +20,7 @@ void mouseif_sync(void) {
 	// 今回の移動量を取得
 	mouseif.b = mousemng_getstat(&mouseif.sx, &mouseif.sy, 1);
 	if (np2cfg.KEY_MODE == 3) {
-		mouseif.b &= keyext_getmouse(&mouseif.sx, &mouseif.sy);
+		mouseif.b &= keystat_getmouse(&mouseif.sx, &mouseif.sy);
 	}
 	mouseif.rx = mouseif.sx;
 	mouseif.ry = mouseif.sy;
@@ -132,13 +133,7 @@ static void IOOUTCALL mouseif_o7fdd(UINT
 
 static void IOOUTCALL mouseif_o7fdf(UINT port, REG8 dat) {
 
-	if (dat & 0xf0) {
-		mouseif.mode = (UINT8)dat;
-		if (dat == 0x93) {
-			setportc(0);
-		}
-	}
-	else {
+	if (!(dat & 0xf0)) {
 		if (dat & 1) {
 			setportc((REG8)(mouseif.portc | (1 << (dat >> 1))));
 		}
@@ -146,6 +141,10 @@ static void IOOUTCALL mouseif_o7fdf(UINT
 			setportc((REG8)(mouseif.portc & (~(1 << (dat >> 1)))));
 		}
 	}
+	else if (dat & 0x80) {
+		mouseif.mode = (UINT8)dat;
+		setportc(0);
+	}
 	(void)port;
 }
 
@@ -181,7 +180,6 @@ static REG8 IOINPCALL mouseif_i7fd9(UINT
 	else {
 		ret |= (x >> 4) & 0x0f;
 	}
-//	TRACEOUT(("%x %x mouse [%x] %d -> %x", CPU_CS, CPU_IP, portc & 0x20, y, ret));
 	(void)port;
 	return(ret);
 }