diff options
author | andreasnaive <andreasnaive@gmail.com> | 2019-03-25 23:13:40 +0100 |
---|---|---|
committer | andreasnaive <andreasnaive@gmail.com> | 2019-03-25 23:13:40 +0100 |
commit | b380514764cf857469bae61c11143a19f79a74c5 (patch) | |
tree | 63c8012e262618f08a332da31dd714281aa2c5ed /src/devices/bus/dmv/k803.cpp | |
parent | c24473ddff715ecec2e258a6eb38960cf8c8e98e (diff) |
Revert "conflict resolution (nw)"
This reverts commit c24473ddff715ecec2e258a6eb38960cf8c8e98e, reversing
changes made to 009cba4fb8102102168ef32870892438327f3705.
Diffstat (limited to 'src/devices/bus/dmv/k803.cpp')
-rw-r--r-- | src/devices/bus/dmv/k803.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/devices/bus/dmv/k803.cpp b/src/devices/bus/dmv/k803.cpp index d0cf9cff336..04ed7445b0e 100644 --- a/src/devices/bus/dmv/k803.cpp +++ b/src/devices/bus/dmv/k803.cpp @@ -75,11 +75,10 @@ void dmv_k803_device::device_reset() // device_add_mconfig - add device configuration //------------------------------------------------- -void dmv_k803_device::device_add_mconfig(machine_config &config) -{ - MM58167(config, m_rtc, XTAL(32'768)); - m_rtc->irq().set(FUNC(dmv_k803_device::rtc_irq_w)); -} +MACHINE_CONFIG_START(dmv_k803_device::device_add_mconfig) + MCFG_DEVICE_ADD("rtc", MM58167, XTAL(32'768)) + MCFG_MM58167_IRQ_CALLBACK(WRITELINE(*this, dmv_k803_device, rtc_irq_w)) +MACHINE_CONFIG_END //------------------------------------------------- // input_ports - device-specific input ports @@ -90,23 +89,23 @@ ioport_constructor dmv_k803_device::device_input_ports() const return INPUT_PORTS_NAME( dmv_k803 ); } -void dmv_k803_device::io_read(int ifsel, offs_t offset, uint8_t &data) +void dmv_k803_device::io_read(address_space &space, int ifsel, offs_t offset, uint8_t &data) { uint8_t dsw = m_dsw->read() & 0x0f; if ((dsw >> 1) == ifsel && BIT(offset, 3) == BIT(dsw, 0)) { if (offset & 0x04) - data = m_rtc->read(((m_latch & 0x07) << 2) | (offset & 0x03)); + data = m_rtc->read(space, ((m_latch & 0x07) << 2) | (offset & 0x03)); } } -void dmv_k803_device::io_write(int ifsel, offs_t offset, uint8_t data) +void dmv_k803_device::io_write(address_space &space, int ifsel, offs_t offset, uint8_t data) { uint8_t dsw = m_dsw->read() & 0x0f; if ((dsw >> 1) == ifsel && BIT(offset, 3) == BIT(dsw, 0)) { if (offset & 0x04) - m_rtc->write(((m_latch & 0x07) << 2) | (offset & 0x03), data); + m_rtc->write(space, ((m_latch & 0x07) << 2) | (offset & 0x03), data); else { m_latch = data; |