--- np2/io/iocore.c 2004/03/23 04:45:04 1.15 +++ np2/io/iocore.c 2004/07/01 11:42:54 1.19 @@ -67,10 +67,12 @@ static UINT8 ioterminate[0x100]; static void IOOUTCALL defout8(UINT port, REG8 dat) { +#if !defined(DISABLE_SOUND) if ((port & 0xfff0) == cs4231.port) { cs4231io_w8(port, dat); return; } +#endif if ((port & 0xf0ff) == 0x801e) { dipsw_w8(port, dat); return; @@ -80,9 +82,11 @@ static void IOOUTCALL defout8(UINT port, static REG8 IOINPCALL definp8(UINT port) { +#if !defined(DISABLE_SOUND) if ((port & 0xfff0) == cs4231.port) { return(cs4231io_r8(port)); } +#endif if ((port & 0xf0ff) == 0x801e) { return(dipsw_r8(port)); } @@ -435,10 +439,7 @@ static const IOCBFN resetfn[] = { // extend artic_reset, egc_reset, np2sysp_reset, - necio_reset, epsonio_reset, -#if !defined(CPUCORE_IA32) - emsio_reset, -#endif + necio_reset, epsonio_reset, emsio_reset, #if defined(SUPPORT_PC9821) pcidev_reset, #endif @@ -457,10 +458,7 @@ static const IOCBFN bindfn[] = { // extend artic_bind, egc_bind, np2sysp_bind, - necio_bind, epsonio_bind, -#if !defined(CPUCORE_IA32) - emsio_bind, -#endif + necio_bind, epsonio_bind, emsio_bind, #if defined(SUPPORT_PC9821) pcidev_bind, #endif @@ -490,7 +488,7 @@ void IOOUTCALL iocore_out8(UINT port, RE IOFUNC iof; -// VERBOSE(("iocore_out8(%x, %x)", port, dat)); +// TRACEOUT(("iocore_out8(%.2x, %.2x)", port, dat)); CPU_REMCLOCK -= iocore.busclock; iof = iocore.base[(port >> 8) & 0xff]; iof->ioout[port & 0xff](port, dat); @@ -499,17 +497,20 @@ void IOOUTCALL iocore_out8(UINT port, RE REG8 IOINPCALL iocore_inp8(UINT port) { IOFUNC iof; + REG8 ret; -// VERBOSE(("iocore_inp8(%x)", port)); CPU_REMCLOCK -= iocore.busclock; iof = iocore.base[(port >> 8) & 0xff]; - return(iof->ioinp[port & 0xff](port)); + ret = iof->ioinp[port & 0xff](port); +// TRACEOUT(("iocore_inp8(%.2x) -> %.2x", port, ret)); + return(ret); } void IOOUTCALL iocore_out16(UINT port, REG16 dat) { IOFUNC iof; +// TRACEOUT(("iocore_out16(%.4x, %.4x)", port, dat)); CPU_REMCLOCK -= iocore.busclock; #if defined(SUPPORT_IDEIO) if (port == 0x0640) {