--- np2/io/printif.c	2003/10/16 17:57:57	1.1.1.1
+++ np2/io/printif.c	2003/12/21 16:05:25	1.3
@@ -1,14 +1,14 @@
 #include	"compiler.h"
-#include	"i286.h"
+#include	"cpucore.h"
 #include	"pccore.h"
 #include	"iocore.h"
 
 
 // ---- I/O
 
-static BYTE IOINPCALL prt_i42(UINT port) {
+static REG8 IOINPCALL prt_i42(UINT port) {
 
-	BYTE	ret;
+	REG8	ret;
 
 	ret = 0x84;
 	if (pc.cpumode & CPUMODE_8MHz) {
@@ -20,15 +20,16 @@ static BYTE IOINPCALL prt_i42(UINT port)
 	if (np2cfg.dipsw[0] & 0x80) {
 		ret |= 0x08;
 	}
-#ifndef EPSON_286
-	if (CPUTYPE & CPUTYPE_V30) {
-		ret |= 0x02;
+	if (!(pc.model & PCMODEL_EPSON)) {
+		if (CPU_TYPE & CPUTYPE_V30) {
+			ret |= 0x02;
+		}
 	}
-#else
-	if (np2cfg.dipsw[2] & 0x80) {
-		ret |= 0x02;
+	else {
+		if (np2cfg.dipsw[2] & 0x80) {
+			ret |= 0x02;
+		}
 	}
-#endif
 	(void)port;
 	return(ret);
 }