--- np2/io/iocore.h 2005/02/12 12:40:39 1.12 +++ np2/io/iocore.h 2007/11/03 00:00:20 1.14 @@ -6,11 +6,11 @@ #define IOINPCALL #endif +typedef void (*FNIORESET)(const NP2CFG *pConfig); +typedef void (*FNIOBIND)(void); typedef void (IOOUTCALL *IOOUT)(UINT port, REG8 val); typedef REG8 (IOINPCALL *IOINP)(UINT port); -typedef void (*IOCBFN)(void); - #include "lsidef.h" #include "artic.h" @@ -30,7 +30,6 @@ typedef void (*IOCBFN)(void); #include "necio.h" #include "nmiio.h" #include "np2sysp.h" -#include "pcidev.h" #include "pic.h" #include "pit.h" #include "printif.h" @@ -38,6 +37,10 @@ typedef void (*IOCBFN)(void); #include "sysport.h" #include "upd4990.h" +#if defined(SUPPORT_PC9821) +#include "pcidev.h" +#endif + #ifdef __cplusplus extern "C" { @@ -99,8 +102,9 @@ void iocore_create(void); void iocore_destroy(void); BRESULT iocore_build(void); -void iocore_cb(const IOCBFN *cbfn, UINT count); -void iocore_reset(void); +void iocore_cbreset(const FNIORESET *pfn, UINT uCount, const NP2CFG *pConfig); +void iocore_cbbind(const FNIOBIND *pfn, UINT uCount); +void iocore_reset(const NP2CFG *pConfig); void iocore_bind(void); void IOOUTCALL iocore_out8(UINT port, REG8 dat);