--- np2/io/mouseif.c	2007/11/03 00:00:20	1.16
+++ np2/io/mouseif.c	2011/01/15 18:04:43	1.18
@@ -30,11 +30,11 @@ void mouseif_sync(void) {
 
 static void calc_mousexy(void) {
 
-	UINT32	clock;
+	UINT32	clk;
 	SINT32	diff;
 
-	clock = CPU_CLOCK + CPU_BASECLOCK + CPU_REMCLOCK;
-	diff = clock - mouseif.lastc;
+	clk = CPU_CLOCK + CPU_BASECLOCK + CPU_REMCLOCK;
+	diff = clk - mouseif.lastc;
 	if (diff >= 2000) {
 		SINT32 dx;
 		SINT32 dy;
@@ -238,8 +238,8 @@ static REG8 IOINPCALL mouseif_i7fdd(UINT
 	if (mode & uPD8255_PORTCL) {
 		ret &= 0xf0;
 		ret |= 0x08;
-		ret |= (np2cfg.dipsw[2] >> 5) & 0x04;
-		ret |= ((~np2cfg.dipsw[0]) >> 4) & 0x03;
+		ret |= (pccore.dipsw[2] >> 5) & 0x04;
+		ret |= ((~pccore.dipsw[0]) >> 4) & 0x03;
 	}
 	(void)port;
 	return(ret);