--- np2/io/iocore.h	2003/12/08 00:55:32	1.3
+++ np2/io/iocore.h	2005/02/12 12:40:39	1.12
@@ -11,6 +11,7 @@ typedef	REG8 (IOINPCALL *IOINP)(UINT por
 
 typedef void (*IOCBFN)(void);
 
+#include	"lsidef.h"
 
 #include	"artic.h"
 #include	"cgrom.h"
@@ -19,16 +20,17 @@ typedef void (*IOCBFN)(void);
 #include	"dipsw.h"
 #include	"dmac.h"
 #include	"egc.h"
-#include	"extmem.h"
+#include	"epsonio.h"
+#include	"emsio.h"
 #include	"fdc.h"
 #include	"fdd320.h"
 #include	"gdc.h"
 #include	"gdc_cmd.h"
-#include	"gdc_sub.h"
-#include	"itf.h"
 #include	"mouseif.h"
+#include	"necio.h"
 #include	"nmiio.h"
 #include	"np2sysp.h"
+#include	"pcidev.h"
 #include	"pic.h"
 #include	"pit.h"
 #include	"printif.h"
@@ -47,13 +49,15 @@ extern	_CGWINDOW	cgwindow;
 extern	_CRTC		crtc;
 extern	_DMAC		dmac;
 extern	_EGC		egc;
-extern	_EXTMEM		extmem;
+extern	_EPSONIO	epsonio;
+extern	_EMSIO		emsio;
 extern	_FDC		fdc;
 extern	_GDC		gdc;
 extern	_GDCS		gdcs;
 extern	_GRCG		grcg;
-extern	_KEYB		keyb;
+extern	_KEYBRD		keybrd;
 extern	_MOUSEIF	mouseif;
+extern	_NECIO		necio;
 extern	_NMIIO		nmiio;
 extern	_NP2SYSP	np2sysp;
 extern	_PIC		pic;
@@ -62,6 +66,10 @@ extern	_RS232C		rs232c;
 extern	_SYSPORT	sysport;
 extern	_UPD4990	uPD4990;
 
+#if defined(SUPPORT_PC9821)
+extern	_PCIDEV		pcidev;
+#endif
+
 
 // I/O - 8bit decode
 void iocore_attachcmnout(UINT port, IOOUT func);
@@ -80,16 +88,16 @@ void iocore_attachsysinpex(UINT port, UI
 											const IOINP *func, UINT funcs);
 
 // サウンドI/O - 12bit decode
-BOOL iocore_attachsndout(UINT port, IOOUT func);
-BOOL iocore_attachsndinp(UINT port, IOINP func);
+BRESULT iocore_attachsndout(UINT port, IOOUT func);
+BRESULT iocore_attachsndinp(UINT port, IOINP func);
 
 // 拡張I/O - 16bit decode
-BOOL iocore_attachout(UINT port, IOOUT func);
-BOOL iocore_attachinp(UINT port, IOINP func);
+BRESULT iocore_attachout(UINT port, IOOUT func);
+BRESULT iocore_attachinp(UINT port, IOINP func);
 
 void iocore_create(void);
 void iocore_destroy(void);
-BOOL iocore_build(void);
+BRESULT iocore_build(void);
 
 void iocore_cb(const IOCBFN *cbfn, UINT count);
 void iocore_reset(void);