diff options
Diffstat (limited to 'src/devices/machine/i82357.cpp')
-rw-r--r-- | src/devices/machine/i82357.cpp | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/src/devices/machine/i82357.cpp b/src/devices/machine/i82357.cpp index 7fa9a62d556..0d8c14c4bbe 100644 --- a/src/devices/machine/i82357.cpp +++ b/src/devices/machine/i82357.cpp @@ -22,8 +22,6 @@ #include "emu.h" #include "i82357.h" -#define LOG_GENERAL (1U << 0) - //#define VERBOSE (LOG_GENERAL) #include "logmacro.h" @@ -35,7 +33,7 @@ i82357_device::i82357_device(const machine_config &mconfig, const char *tag, dev , m_pic(*this, "pic%u", 0) , m_pit(*this, "pit%u", 0) , m_dma(*this, "dma%u", 0) - , m_out_rtc(*this) + , m_out_rtc_address(*this) , m_out_nmi(*this) , m_out_spkr(*this) { @@ -46,12 +44,12 @@ void i82357_device::device_add_mconfig(machine_config &config) PIC8259(config, m_pic[0], 0); m_pic[0]->in_sp_callback().set_constant(1); m_pic[0]->read_slave_ack_callback().set( - [this](offs_t offset) + [this](offs_t offset) -> u8 { if (offset == 2) return m_pic[1]->acknowledge(); - return u32(0); + return 0; }); PIC8259(config, m_pic[1], 0); @@ -130,7 +128,7 @@ void i82357_device::map(address_map &map) { m_nmi_enabled = !BIT(data, 7); - m_out_rtc(0, data & 0x7f); + m_out_rtc_address(data & 0x7f); m_nmi_check->adjust(attotime::zero); }, "nmi_rtc").umask64(0xff); @@ -206,11 +204,7 @@ void i82357_device::map(address_map &map) void i82357_device::device_start() { - m_out_rtc.resolve_safe(); - m_out_nmi.resolve_safe(); - m_out_spkr.resolve_safe(); - - m_nmi_check = machine().scheduler().timer_alloc(timer_expired_delegate(FUNC(i82357_device::nmi_check), this)); + m_nmi_check = timer_alloc(FUNC(i82357_device::nmi_check), this); } void i82357_device::device_reset() @@ -267,7 +261,7 @@ void i82357_device::nmi_ext_w(u8 data) m_nmi_check->adjust(attotime::zero); } -WRITE_LINE_MEMBER(i82357_device::in_iochk) +void i82357_device::in_iochk(int state) { if (!state && !(m_nmi_reg & NMI_PARITY_DISABLE)) { @@ -279,7 +273,7 @@ WRITE_LINE_MEMBER(i82357_device::in_iochk) m_nmi_reg &= ~NMI_IOCHK; } -WRITE_LINE_MEMBER(i82357_device::in_parity) +void i82357_device::in_parity(int state) { if (!state && !(m_nmi_reg & NMI_IOCHK_DISABLE)) { |