From 4b14d5876a5db6883e940a810011dafc4372f8c2 Mon Sep 17 00:00:00 2001 From: AJR Date: Sun, 24 Feb 2019 23:38:14 -0500 Subject: bus/bw2, bus/dmv, mm58167, apple3: Eliminate address_space arguments from handlers (nw) --- src/devices/bus/bw2/exp.cpp | 24 +++++++++--------- src/devices/bus/bw2/exp.h | 24 +++++++++--------- src/devices/bus/bw2/ramcard.cpp | 6 ++--- src/devices/bus/bw2/ramcard.h | 6 ++--- src/devices/bus/dmv/dmvbus.cpp | 8 +++--- src/devices/bus/dmv/dmvbus.h | 8 +++--- src/devices/bus/dmv/k210.cpp | 4 +-- src/devices/bus/dmv/k210.h | 4 +-- src/devices/bus/dmv/k233.cpp | 2 +- src/devices/bus/dmv/k233.h | 2 +- src/devices/bus/dmv/k801.cpp | 8 +++--- src/devices/bus/dmv/k801.h | 8 +++--- src/devices/bus/dmv/k803.cpp | 8 +++--- src/devices/bus/dmv/k803.h | 4 +-- src/devices/bus/dmv/k806.cpp | 8 +++--- src/devices/bus/dmv/k806.h | 4 +-- src/devices/machine/mm58167.cpp | 4 +-- src/devices/machine/mm58167.h | 4 +-- src/mame/drivers/bw2.cpp | 4 +-- src/mame/drivers/dmv.cpp | 56 ++++++++++++++++++++--------------------- src/mame/includes/apple3.h | 16 ++++++------ src/mame/machine/apple3.cpp | 24 +++++++++--------- 22 files changed, 117 insertions(+), 119 deletions(-) diff --git a/src/devices/bus/bw2/exp.cpp b/src/devices/bus/bw2/exp.cpp index ae02f1f10fa..50f776b066e 100644 --- a/src/devices/bus/bw2/exp.cpp +++ b/src/devices/bus/bw2/exp.cpp @@ -95,11 +95,11 @@ void bw2_expansion_slot_device::device_reset() // cd_r - cartridge data read //------------------------------------------------- -uint8_t bw2_expansion_slot_device::cd_r(address_space &space, offs_t offset, uint8_t data, int ram2, int ram3, int ram4, int ram5, int ram6) +uint8_t bw2_expansion_slot_device::cd_r(offs_t offset, uint8_t data, int ram2, int ram3, int ram4, int ram5, int ram6) { if (m_cart != nullptr) { - data = m_cart->bw2_cd_r(space, offset, data, ram2, ram3, ram4, ram5, ram6); + data = m_cart->bw2_cd_r(offset, data, ram2, ram3, ram4, ram5, ram6); } return data; @@ -110,11 +110,11 @@ uint8_t bw2_expansion_slot_device::cd_r(address_space &space, offs_t offset, uin // cd_w - cartridge data write //------------------------------------------------- -void bw2_expansion_slot_device::cd_w(address_space &space, offs_t offset, uint8_t data, int ram2, int ram3, int ram4, int ram5, int ram6) +void bw2_expansion_slot_device::cd_w(offs_t offset, uint8_t data, int ram2, int ram3, int ram4, int ram5, int ram6) { if (m_cart != nullptr) { - m_cart->bw2_cd_w(space, offset, data, ram2, ram3, ram4, ram5, ram6); + m_cart->bw2_cd_w(offset, data, ram2, ram3, ram4, ram5, ram6); } } @@ -123,13 +123,13 @@ void bw2_expansion_slot_device::cd_w(address_space &space, offs_t offset, uint8_ // slot_r - slot read //------------------------------------------------- -READ8_MEMBER( bw2_expansion_slot_device::slot_r ) +uint8_t bw2_expansion_slot_device::slot_r(offs_t offset) { uint8_t data = 0xff; if (m_cart != nullptr) { - data = m_cart->bw2_slot_r(space, offset); + data = m_cart->bw2_slot_r(offset); } return data; @@ -140,11 +140,11 @@ READ8_MEMBER( bw2_expansion_slot_device::slot_r ) // slot_w - slot write //------------------------------------------------- -WRITE8_MEMBER( bw2_expansion_slot_device::slot_w ) +void bw2_expansion_slot_device::slot_w(offs_t offset, uint8_t data) { if (m_cart != nullptr) { - m_cart->bw2_slot_w(space, offset, data); + m_cart->bw2_slot_w(offset, data); } } @@ -153,13 +153,13 @@ WRITE8_MEMBER( bw2_expansion_slot_device::slot_w ) // modsel_r - modsel read //------------------------------------------------- -READ8_MEMBER( bw2_expansion_slot_device::modsel_r ) +uint8_t bw2_expansion_slot_device::modsel_r(offs_t offset) { uint8_t data = 0xff; if (m_cart != nullptr) { - data = m_cart->bw2_modsel_r(space, offset); + data = m_cart->bw2_modsel_r(offset); } return data; @@ -170,11 +170,11 @@ READ8_MEMBER( bw2_expansion_slot_device::modsel_r ) // modsel_w - modsel write //------------------------------------------------- -WRITE8_MEMBER( bw2_expansion_slot_device::modsel_w ) +void bw2_expansion_slot_device::modsel_w(offs_t offset, uint8_t data) { if (m_cart != nullptr) { - m_cart->bw2_modsel_w(space, offset, data); + m_cart->bw2_modsel_w(offset, data); } } diff --git a/src/devices/bus/bw2/exp.h b/src/devices/bus/bw2/exp.h index 70c8bf55f50..d37e5c66879 100644 --- a/src/devices/bus/bw2/exp.h +++ b/src/devices/bus/bw2/exp.h @@ -76,14 +76,14 @@ public: virtual ~bw2_expansion_slot_device(); // computer interface - uint8_t cd_r(address_space &space, offs_t offset, uint8_t data, int ram2, int ram3, int ram4, int ram5, int ram6); - void cd_w(address_space &space, offs_t offset, uint8_t data, int ram2, int ram3, int ram4, int ram5, int ram6); + uint8_t cd_r(offs_t offset, uint8_t data, int ram2, int ram3, int ram4, int ram5, int ram6); + void cd_w(offs_t offset, uint8_t data, int ram2, int ram3, int ram4, int ram5, int ram6); - DECLARE_READ8_MEMBER( slot_r ); - DECLARE_WRITE8_MEMBER( slot_w ); + uint8_t slot_r(offs_t offset); + void slot_w(offs_t offset, uint8_t data); - DECLARE_READ8_MEMBER( modsel_r ); - DECLARE_WRITE8_MEMBER( modsel_w ); + uint8_t modsel_r(offs_t offset); + void modsel_w(offs_t offset, uint8_t data); protected: // device-level overrides @@ -103,14 +103,14 @@ public: // construction/destruction virtual ~device_bw2_expansion_slot_interface(); - virtual uint8_t bw2_cd_r(address_space &space, offs_t offset, uint8_t data, int ram2, int ram3, int ram4, int ram5, int ram6) { return data; }; - virtual void bw2_cd_w(address_space &space, offs_t offset, uint8_t data, int ram2, int ram3, int ram4, int ram5, int ram6) { }; + virtual uint8_t bw2_cd_r(offs_t offset, uint8_t data, int ram2, int ram3, int ram4, int ram5, int ram6) { return data; } + virtual void bw2_cd_w(offs_t offset, uint8_t data, int ram2, int ram3, int ram4, int ram5, int ram6) { } - virtual uint8_t bw2_slot_r(address_space &space, offs_t offset) { return 0xff; } - virtual void bw2_slot_w(address_space &space, offs_t offset, uint8_t data) { } + virtual uint8_t bw2_slot_r(offs_t offset) { return 0xff; } + virtual void bw2_slot_w(offs_t offset, uint8_t data) { } - virtual uint8_t bw2_modsel_r(address_space &space, offs_t offset) { return 0xff; } - virtual void bw2_modsel_w(address_space &space, offs_t offset, uint8_t data) { } + virtual uint8_t bw2_modsel_r(offs_t offset) { return 0xff; } + virtual void bw2_modsel_w(offs_t offset, uint8_t data) { } protected: device_bw2_expansion_slot_interface(const machine_config &mconfig, device_t &device); diff --git a/src/devices/bus/bw2/ramcard.cpp b/src/devices/bus/bw2/ramcard.cpp index b59159cd5b1..48de6cffdec 100644 --- a/src/devices/bus/bw2/ramcard.cpp +++ b/src/devices/bus/bw2/ramcard.cpp @@ -88,7 +88,7 @@ void bw2_ramcard_device::device_reset() // bw2_cd_r - cartridge data read //------------------------------------------------- -uint8_t bw2_ramcard_device::bw2_cd_r(address_space &space, offs_t offset, uint8_t data, int ram2, int ram3, int ram4, int ram5, int ram6) +uint8_t bw2_ramcard_device::bw2_cd_r(offs_t offset, uint8_t data, int ram2, int ram3, int ram4, int ram5, int ram6) { if (!ram2) { @@ -107,7 +107,7 @@ uint8_t bw2_ramcard_device::bw2_cd_r(address_space &space, offs_t offset, uint8_ // bw2_cd_r - cartridge data write //------------------------------------------------- -void bw2_ramcard_device::bw2_cd_w(address_space &space, offs_t offset, uint8_t data, int ram2, int ram3, int ram4, int ram5, int ram6) +void bw2_ramcard_device::bw2_cd_w(offs_t offset, uint8_t data, int ram2, int ram3, int ram4, int ram5, int ram6) { if (m_en && !ram5) { @@ -120,7 +120,7 @@ void bw2_ramcard_device::bw2_cd_w(address_space &space, offs_t offset, uint8_t d // bw2_slot_w - slot write //------------------------------------------------- -void bw2_ramcard_device::bw2_slot_w(address_space &space, offs_t offset, uint8_t data) +void bw2_ramcard_device::bw2_slot_w(offs_t offset, uint8_t data) { m_en = 1; m_bank = data & 0x0f; diff --git a/src/devices/bus/bw2/ramcard.h b/src/devices/bus/bw2/ramcard.h index 9ac2b0433fa..029d9b91feb 100644 --- a/src/devices/bus/bw2/ramcard.h +++ b/src/devices/bus/bw2/ramcard.h @@ -37,9 +37,9 @@ protected: virtual void device_reset() override; // device_bw2_expansion_slot_interface overrides - virtual uint8_t bw2_cd_r(address_space &space, offs_t offset, uint8_t data, int ram2, int ram3, int ram4, int ram5, int ram6) override; - virtual void bw2_cd_w(address_space &space, offs_t offset, uint8_t data, int ram2, int ram3, int ram4, int ram5, int ram6) override; - virtual void bw2_slot_w(address_space &space, offs_t offset, uint8_t data) override; + virtual uint8_t bw2_cd_r(offs_t offset, uint8_t data, int ram2, int ram3, int ram4, int ram5, int ram6) override; + virtual void bw2_cd_w(offs_t offset, uint8_t data, int ram2, int ram3, int ram4, int ram5, int ram6) override; + virtual void bw2_slot_w(offs_t offset, uint8_t data) override; private: required_memory_region m_rom; diff --git a/src/devices/bus/dmv/dmvbus.cpp b/src/devices/bus/dmv/dmvbus.cpp index de328f6df06..7ad4ae3a2bb 100644 --- a/src/devices/bus/dmv/dmvbus.cpp +++ b/src/devices/bus/dmv/dmvbus.cpp @@ -279,10 +279,10 @@ void dmvcart_slot_device::ram_write(uint8_t cas, offs_t offset, uint8_t data) IO read -------------------------------------------------*/ -void dmvcart_slot_device::io_read(address_space &space, int ifsel, offs_t offset, uint8_t &data) +void dmvcart_slot_device::io_read(int ifsel, offs_t offset, uint8_t &data) { if (m_cart) - m_cart->io_read(space, ifsel, offset, data); + m_cart->io_read(ifsel, offset, data); } @@ -290,10 +290,10 @@ void dmvcart_slot_device::io_read(address_space &space, int ifsel, offs_t offset IO write -------------------------------------------------*/ -void dmvcart_slot_device::io_write(address_space &space, int ifsel, offs_t offset, uint8_t data) +void dmvcart_slot_device::io_write(int ifsel, offs_t offset, uint8_t data) { if (m_cart) - m_cart->io_write(space, ifsel, offset, data); + m_cart->io_write(ifsel, offset, data); } /*------------------------------------------------- diff --git a/src/devices/bus/dmv/dmvbus.h b/src/devices/bus/dmv/dmvbus.h index 17acae097e7..22c81767151 100644 --- a/src/devices/bus/dmv/dmvbus.h +++ b/src/devices/bus/dmv/dmvbus.h @@ -25,8 +25,8 @@ public: virtual bool read(offs_t offset, uint8_t &data) { return false; } virtual bool write(offs_t offset, uint8_t data) { return false; } - virtual void io_read(address_space &space, int ifsel, offs_t offset, uint8_t &data) { } - virtual void io_write(address_space &space, int ifsel, offs_t offset, uint8_t data) { } + virtual void io_read(int ifsel, offs_t offset, uint8_t &data) { } + virtual void io_write(int ifsel, offs_t offset, uint8_t data) { } // slot 1 virtual void ram_read(uint8_t cas, offs_t offset, uint8_t &data) { } @@ -87,8 +87,8 @@ public: virtual bool write(offs_t offset, uint8_t data); virtual void ram_read(uint8_t cas, offs_t offset, uint8_t &data); virtual void ram_write(uint8_t cas, offs_t offset, uint8_t data); - virtual void io_read(address_space &space, int ifsel, offs_t offset, uint8_t &data); - virtual void io_write(address_space &space, int ifsel, offs_t offset, uint8_t data); + virtual void io_read(int ifsel, offs_t offset, uint8_t &data); + virtual void io_write(int ifsel, offs_t offset, uint8_t data); virtual void hold_w(int state); virtual void switch16_w(int state); virtual void timint_w(int state); diff --git a/src/devices/bus/dmv/k210.cpp b/src/devices/bus/dmv/k210.cpp index 1c3955bdf04..d73f2dfb9a9 100644 --- a/src/devices/bus/dmv/k210.cpp +++ b/src/devices/bus/dmv/k210.cpp @@ -99,13 +99,13 @@ void dmv_k210_device::device_add_mconfig(machine_config &config) m_centronics->set_output_latch(*m_cent_data_out); } -void dmv_k210_device::io_read(address_space &space, int ifsel, offs_t offset, uint8_t &data) +void dmv_k210_device::io_read(int ifsel, offs_t offset, uint8_t &data) { if (ifsel == 0) data = m_ppi->read(offset & 0x03); } -void dmv_k210_device::io_write(address_space &space, int ifsel, offs_t offset, uint8_t data) +void dmv_k210_device::io_write(int ifsel, offs_t offset, uint8_t data) { if (ifsel == 0) m_ppi->write(offset & 0x03, data); diff --git a/src/devices/bus/dmv/k210.h b/src/devices/bus/dmv/k210.h index dcc51a374ed..501178f6fcf 100644 --- a/src/devices/bus/dmv/k210.h +++ b/src/devices/bus/dmv/k210.h @@ -33,8 +33,8 @@ protected: virtual void device_add_mconfig(machine_config &config) override; // dmvcart_interface overrides - virtual void io_read(address_space &space, int ifsel, offs_t offset, uint8_t &data) override; - virtual void io_write(address_space &space, int ifsel, offs_t offset, uint8_t data) override; + virtual void io_read(int ifsel, offs_t offset, uint8_t &data) override; + virtual void io_write(int ifsel, offs_t offset, uint8_t data) override; private: DECLARE_READ8_MEMBER(porta_r); diff --git a/src/devices/bus/dmv/k233.cpp b/src/devices/bus/dmv/k233.cpp index 2ba68d3f53f..2c8b13cff00 100644 --- a/src/devices/bus/dmv/k233.cpp +++ b/src/devices/bus/dmv/k233.cpp @@ -54,7 +54,7 @@ void dmv_k233_device::device_reset() m_enabled = false; } -void dmv_k233_device::io_write(address_space &space, int ifsel, offs_t offset, uint8_t data) +void dmv_k233_device::io_write(int ifsel, offs_t offset, uint8_t data) { if (ifsel == 1) m_enabled = !m_enabled; diff --git a/src/devices/bus/dmv/k233.h b/src/devices/bus/dmv/k233.h index 8aa2f0d235b..e73ae71a9df 100644 --- a/src/devices/bus/dmv/k233.h +++ b/src/devices/bus/dmv/k233.h @@ -27,7 +27,7 @@ protected: virtual void device_reset() override; // dmvcart_interface overrides - virtual void io_write(address_space &space, int ifsel, offs_t offset, uint8_t data) override; + virtual void io_write(int ifsel, offs_t offset, uint8_t data) override; virtual bool read(offs_t offset, uint8_t &data) override; virtual bool write(offs_t offset, uint8_t data) override; diff --git a/src/devices/bus/dmv/k801.cpp b/src/devices/bus/dmv/k801.cpp index 64098400288..7c4892f4fb0 100644 --- a/src/devices/bus/dmv/k801.cpp +++ b/src/devices/bus/dmv/k801.cpp @@ -206,7 +206,7 @@ WRITE_LINE_MEMBER(dmv_k801_device::epci_irq_w) m_bus->m_out_irq_cb(state); } -void dmv_k801_device::io_read(address_space &space, int ifsel, offs_t offset, uint8_t &data) +void dmv_k801_device::io_read(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)) @@ -218,7 +218,7 @@ void dmv_k801_device::io_read(address_space &space, int ifsel, offs_t offset, ui } } -void dmv_k801_device::io_write(address_space &space, int ifsel, offs_t offset, uint8_t data) +void dmv_k801_device::io_write(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)) @@ -230,7 +230,7 @@ void dmv_k801_device::io_write(address_space &space, int ifsel, offs_t offset, u } } -void dmv_k211_device::io_read(address_space &space, int ifsel, offs_t offset, uint8_t &data) +void dmv_k211_device::io_read(int ifsel, offs_t offset, uint8_t &data) { uint8_t jumpers = m_dsw->read() & 0x03; if ((BIT(jumpers, 0) && ifsel == 0) || (BIT(jumpers, 1) && ifsel == 1)) @@ -242,7 +242,7 @@ void dmv_k211_device::io_read(address_space &space, int ifsel, offs_t offset, ui } } -void dmv_k211_device::io_write(address_space &space, int ifsel, offs_t offset, uint8_t data) +void dmv_k211_device::io_write(int ifsel, offs_t offset, uint8_t data) { uint8_t jumpers = m_dsw->read() & 0x03; if ((BIT(jumpers, 0) && ifsel == 0) || (BIT(jumpers, 1) && ifsel == 1)) diff --git a/src/devices/bus/dmv/k801.h b/src/devices/bus/dmv/k801.h index 26f314b2149..db4b557bbb1 100644 --- a/src/devices/bus/dmv/k801.h +++ b/src/devices/bus/dmv/k801.h @@ -36,8 +36,8 @@ protected: virtual void device_add_mconfig(machine_config &config) override; // dmvcart_interface overrides - virtual void io_read(address_space &space, int ifsel, offs_t offset, uint8_t &data) override; - virtual void io_write(address_space &space, int ifsel, offs_t offset, uint8_t data) override; + virtual void io_read(int ifsel, offs_t offset, uint8_t &data) override; + virtual void io_write(int ifsel, offs_t offset, uint8_t data) override; required_device m_epci; required_device m_rs232; @@ -67,8 +67,8 @@ protected: virtual void device_add_mconfig(machine_config &config) override; // dmvcart_interface overrides - virtual void io_read(address_space &space, int ifsel, offs_t offset, uint8_t &data) override; - virtual void io_write(address_space &space, int ifsel, offs_t offset, uint8_t data) override; + virtual void io_read(int ifsel, offs_t offset, uint8_t &data) override; + virtual void io_write(int ifsel, offs_t offset, uint8_t data) override; }; // ======================> dmv_k212_device diff --git a/src/devices/bus/dmv/k803.cpp b/src/devices/bus/dmv/k803.cpp index b56f0daf156..d0cf9cff336 100644 --- a/src/devices/bus/dmv/k803.cpp +++ b/src/devices/bus/dmv/k803.cpp @@ -90,23 +90,23 @@ ioport_constructor dmv_k803_device::device_input_ports() const return INPUT_PORTS_NAME( dmv_k803 ); } -void dmv_k803_device::io_read(address_space &space, int ifsel, offs_t offset, uint8_t &data) +void dmv_k803_device::io_read(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(space, ((m_latch & 0x07) << 2) | (offset & 0x03)); + data = m_rtc->read(((m_latch & 0x07) << 2) | (offset & 0x03)); } } -void dmv_k803_device::io_write(address_space &space, int ifsel, offs_t offset, uint8_t data) +void dmv_k803_device::io_write(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(space, ((m_latch & 0x07) << 2) | (offset & 0x03), data); + m_rtc->write(((m_latch & 0x07) << 2) | (offset & 0x03), data); else { m_latch = data; diff --git a/src/devices/bus/dmv/k803.h b/src/devices/bus/dmv/k803.h index 0e1e190e89f..e8455646d1e 100644 --- a/src/devices/bus/dmv/k803.h +++ b/src/devices/bus/dmv/k803.h @@ -31,8 +31,8 @@ protected: virtual ioport_constructor device_input_ports() const override; virtual void device_add_mconfig(machine_config &config) override; - virtual void io_read(address_space &space, int ifsel, offs_t offset, uint8_t &data) override; - virtual void io_write(address_space &space, int ifsel, offs_t offset, uint8_t data) override; + virtual void io_read(int ifsel, offs_t offset, uint8_t &data) override; + virtual void io_write(int ifsel, offs_t offset, uint8_t data) override; void update_int(); diff --git a/src/devices/bus/dmv/k806.cpp b/src/devices/bus/dmv/k806.cpp index 62cf3f97ea4..a747efa24f4 100644 --- a/src/devices/bus/dmv/k806.cpp +++ b/src/devices/bus/dmv/k806.cpp @@ -128,19 +128,19 @@ const tiny_rom_entry *dmv_k806_device::device_rom_region() const return ROM_NAME( dmv_k806 ); } -void dmv_k806_device::io_read(address_space &space, int ifsel, offs_t offset, uint8_t &data) +void dmv_k806_device::io_read(int ifsel, offs_t offset, uint8_t &data) { uint8_t jumpers = m_jumpers->read(); if (BIT(jumpers, ifsel) && ((!BIT(offset, 3) && BIT(jumpers, 5)) || (BIT(offset, 3) && BIT(jumpers, 6)))) - data = m_mcu->upi41_master_r(space, offset & 1); + data = m_mcu->upi41_master_r(machine().dummy_space(), offset & 1); } -void dmv_k806_device::io_write(address_space &space, int ifsel, offs_t offset, uint8_t data) +void dmv_k806_device::io_write(int ifsel, offs_t offset, uint8_t data) { uint8_t jumpers = m_jumpers->read(); if (BIT(jumpers, ifsel) && ((!BIT(offset, 3) && BIT(jumpers, 5)) || (BIT(offset, 3) && BIT(jumpers, 6)))) { - m_mcu->upi41_master_w(space, offset & 1, data); + m_mcu->upi41_master_w(machine().dummy_space(), offset & 1, data); m_bus->m_out_int_cb(CLEAR_LINE); } } diff --git a/src/devices/bus/dmv/k806.h b/src/devices/bus/dmv/k806.h index da178a2945d..082d56b11a6 100644 --- a/src/devices/bus/dmv/k806.h +++ b/src/devices/bus/dmv/k806.h @@ -35,8 +35,8 @@ protected: virtual ioport_constructor device_input_ports() const override; virtual void device_add_mconfig(machine_config &config) override; - virtual void io_read(address_space &space, int ifsel, offs_t offset, uint8_t &data) override; - virtual void io_write(address_space &space, int ifsel, offs_t offset, uint8_t data) override; + virtual void io_read(int ifsel, offs_t offset, uint8_t &data) override; + virtual void io_write(int ifsel, offs_t offset, uint8_t data) override; private: DECLARE_READ_LINE_MEMBER(portt1_r); diff --git a/src/devices/machine/mm58167.cpp b/src/devices/machine/mm58167.cpp index 22b49f4a7dd..f226590e9d2 100644 --- a/src/devices/machine/mm58167.cpp +++ b/src/devices/machine/mm58167.cpp @@ -180,7 +180,7 @@ void mm58167_device::update_rtc() m_milliseconds = (bcd_to_integer(m_regs[R_CNT_HUNDTENTHS]) * 10) + (bcd_to_integer(m_regs[R_CNT_MILLISECONDS] >> 4) % 10); } -READ8_MEMBER(mm58167_device::read) +uint8_t mm58167_device::read(offs_t offset) { // printf("read reg %x = %02x\n", offset, m_regs[offset]); @@ -196,7 +196,7 @@ READ8_MEMBER(mm58167_device::read) return m_regs[offset]; } -WRITE8_MEMBER(mm58167_device::write) +void mm58167_device::write(offs_t offset, uint8_t data) { // printf("%02x to reg %x\n", data, offset); diff --git a/src/devices/machine/mm58167.h b/src/devices/machine/mm58167.h index 523f31ea326..c12b151b676 100644 --- a/src/devices/machine/mm58167.h +++ b/src/devices/machine/mm58167.h @@ -27,8 +27,8 @@ public: // construction/destruction mm58167_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8_MEMBER(read); - DECLARE_WRITE8_MEMBER(write); + uint8_t read(offs_t offset); + void write(offs_t offset, uint8_t data); auto irq() { return m_irq_w.bind(); } diff --git a/src/mame/drivers/bw2.cpp b/src/mame/drivers/bw2.cpp index 65d3a307e3c..bd7769698d0 100644 --- a/src/mame/drivers/bw2.cpp +++ b/src/mame/drivers/bw2.cpp @@ -108,7 +108,7 @@ READ8_MEMBER( bw2_state::read ) data = m_ram->pointer()[offset]; } - return m_exp->cd_r(space, offset, data, ram2, ram3, ram4, ram5, ram6); + return m_exp->cd_r(offset, data, ram2, ram3, ram4, ram5, ram6); } @@ -159,7 +159,7 @@ WRITE8_MEMBER( bw2_state::write ) m_ram->pointer()[offset] = data; } - m_exp->cd_w(space, offset, data, ram2, ram3, ram4, ram5, ram6); + m_exp->cd_w(offset, data, ram2, ram3, ram4, ram5, ram6); } diff --git a/src/mame/drivers/dmv.cpp b/src/mame/drivers/dmv.cpp index 0e3098ec7b9..d7f4143407b 100644 --- a/src/mame/drivers/dmv.cpp +++ b/src/mame/drivers/dmv.cpp @@ -127,21 +127,21 @@ private: DECLARE_FLOPPY_FORMATS( floppy_formats ); DECLARE_QUICKLOAD_LOAD_MEMBER(dmv); - uint8_t program_read(address_space &space, int cas, offs_t offset); - void program_write(address_space &space, int cas, offs_t offset, uint8_t data); - - void ifsel_r(address_space &space, int ifsel, offs_t offset, uint8_t &data); - void ifsel_w(address_space &space, int ifsel, offs_t offset, uint8_t data); - DECLARE_READ8_MEMBER(ifsel0_r) { uint8_t data = 0xff; ifsel_r(space, 0, offset, data); return data; } - DECLARE_READ8_MEMBER(ifsel1_r) { uint8_t data = 0xff; ifsel_r(space, 1, offset, data); return data; } - DECLARE_READ8_MEMBER(ifsel2_r) { uint8_t data = 0xff; ifsel_r(space, 2, offset, data); return data; } - DECLARE_READ8_MEMBER(ifsel3_r) { uint8_t data = 0xff; ifsel_r(space, 3, offset, data); return data; } - DECLARE_READ8_MEMBER(ifsel4_r) { uint8_t data = 0xff; ifsel_r(space, 4, offset, data); return data; } - DECLARE_WRITE8_MEMBER(ifsel0_w) { ifsel_w(space, 0, offset, data); } - DECLARE_WRITE8_MEMBER(ifsel1_w) { ifsel_w(space, 1, offset, data); } - DECLARE_WRITE8_MEMBER(ifsel2_w) { ifsel_w(space, 2, offset, data); } - DECLARE_WRITE8_MEMBER(ifsel3_w) { ifsel_w(space, 3, offset, data); } - DECLARE_WRITE8_MEMBER(ifsel4_w) { ifsel_w(space, 4, offset, data); } + uint8_t program_read(int cas, offs_t offset); + void program_write(int cas, offs_t offset, uint8_t data); + + void ifsel_r(int ifsel, offs_t offset, uint8_t &data); + void ifsel_w(int ifsel, offs_t offset, uint8_t data); + DECLARE_READ8_MEMBER(ifsel0_r) { uint8_t data = 0xff; ifsel_r(0, offset, data); return data; } + DECLARE_READ8_MEMBER(ifsel1_r) { uint8_t data = 0xff; ifsel_r(1, offset, data); return data; } + DECLARE_READ8_MEMBER(ifsel2_r) { uint8_t data = 0xff; ifsel_r(2, offset, data); return data; } + DECLARE_READ8_MEMBER(ifsel3_r) { uint8_t data = 0xff; ifsel_r(3, offset, data); return data; } + DECLARE_READ8_MEMBER(ifsel4_r) { uint8_t data = 0xff; ifsel_r(4, offset, data); return data; } + DECLARE_WRITE8_MEMBER(ifsel0_w) { ifsel_w(0, offset, data); } + DECLARE_WRITE8_MEMBER(ifsel1_w) { ifsel_w(1, offset, data); } + DECLARE_WRITE8_MEMBER(ifsel2_w) { ifsel_w(2, offset, data); } + DECLARE_WRITE8_MEMBER(ifsel3_w) { ifsel_w(3, offset, data); } + DECLARE_WRITE8_MEMBER(ifsel4_w) { ifsel_w(4, offset, data); } UPD7220_DISPLAY_PIXELS_MEMBER( hgdc_display_pixels ); UPD7220_DRAW_TEXT_LINE_MEMBER( hgdc_draw_text ); @@ -426,38 +426,36 @@ static void dmv_floppies(device_slot_interface &device) } -void dmv_state::ifsel_r(address_space &space, int ifsel, offs_t offset, uint8_t &data) +void dmv_state::ifsel_r(int ifsel, offs_t offset, uint8_t &data) { - dmvcart_slot_device *slots[] = { m_slot2, m_slot2a, m_slot3, m_slot4, m_slot5, m_slot6, m_slot7, m_slot7a }; - for(auto & slot : slots) - slot->io_read(space, ifsel, offset, data); + for (auto &slot : { m_slot2, m_slot2a, m_slot3, m_slot4, m_slot5, m_slot6, m_slot7, m_slot7a }) + slot->io_read(ifsel, offset, data); } -void dmv_state::ifsel_w(address_space &space, int ifsel, offs_t offset, uint8_t data) +void dmv_state::ifsel_w(int ifsel, offs_t offset, uint8_t data) { - dmvcart_slot_device *slots[] = { m_slot2, m_slot2a, m_slot3, m_slot4, m_slot5, m_slot6, m_slot7, m_slot7a }; - for(auto & slot : slots) - slot->io_write(space, ifsel, offset, data); + for(auto &slot : { m_slot2, m_slot2a, m_slot3, m_slot4, m_slot5, m_slot6, m_slot7, m_slot7a }) + slot->io_write(ifsel, offset, data); } WRITE8_MEMBER(dmv_state::exp_program_w) { - program_write(space, (offset >> 16) & 0x07, offset, data); + program_write((offset >> 16) & 0x07, offset, data); } READ8_MEMBER(dmv_state::exp_program_r) { - return program_read(space, (offset >> 16) & 0x07, offset); + return program_read((offset >> 16) & 0x07, offset); } WRITE8_MEMBER(dmv_state::program_w) { - program_write(space, m_ram_bank, offset, data); + program_write(m_ram_bank, offset, data); } READ8_MEMBER(dmv_state::program_r) { - return program_read(space, m_ram_bank, offset); + return program_read(m_ram_bank, offset); } WRITE_LINE_MEMBER( dmv_state::thold7_w ) @@ -519,7 +517,7 @@ void dmv_state::update_irqs(int slot, int state) } } -void dmv_state::program_write(address_space &space, int cas, offs_t offset, uint8_t data) +void dmv_state::program_write(int cas, offs_t offset, uint8_t data) { bool tramd = false; dmvcart_slot_device *slots[] = { m_slot2, m_slot2a, m_slot3, m_slot4, m_slot5, m_slot6, m_slot7, m_slot7a }; @@ -535,7 +533,7 @@ void dmv_state::program_write(address_space &space, int cas, offs_t offset, uint } } -uint8_t dmv_state::program_read(address_space &space, int cas, offs_t offset) +uint8_t dmv_state::program_read(int cas, offs_t offset) { uint8_t data = 0xff; if (m_ramoutdis && offset < 0x2000) diff --git a/src/mame/includes/apple3.h b/src/mame/includes/apple3.h index ef32b981503..58b86f1ee3b 100644 --- a/src/mame/includes/apple3.h +++ b/src/mame/includes/apple3.h @@ -88,21 +88,21 @@ public: required_device floppy2; required_device floppy3; - DECLARE_READ8_MEMBER(apple3_memory_r); - DECLARE_WRITE8_MEMBER(apple3_memory_w); + uint8_t apple3_memory_r(offs_t offset); + void apple3_memory_w(offs_t offset, uint8_t data); DECLARE_WRITE_LINE_MEMBER(apple3_sync_w); - DECLARE_READ8_MEMBER(apple3_c0xx_r); - DECLARE_WRITE8_MEMBER(apple3_c0xx_w); + uint8_t apple3_c0xx_r(offs_t offset); + void apple3_c0xx_w(offs_t offset, uint8_t data); void init_apple3(); virtual void machine_reset() override; virtual void video_start() override; uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); TIMER_CALLBACK_MEMBER(scanstart_cb); TIMER_CALLBACK_MEMBER(scanend_cb); - DECLARE_WRITE8_MEMBER(apple3_via_0_out_a); - DECLARE_WRITE8_MEMBER(apple3_via_0_out_b); - DECLARE_WRITE8_MEMBER(apple3_via_1_out_a); - DECLARE_WRITE8_MEMBER(apple3_via_1_out_b); + void apple3_via_0_out_a(uint8_t data); + void apple3_via_0_out_b(uint8_t data); + void apple3_via_1_out_a(uint8_t data); + void apple3_via_1_out_b(uint8_t data); void apple3_write_charmem(); void text40(bitmap_ind16 &bitmap, const rectangle &cliprect); void text80(bitmap_ind16 &bitmap, const rectangle &cliprect); diff --git a/src/mame/machine/apple3.cpp b/src/mame/machine/apple3.cpp index f86d612f990..6be7745c565 100644 --- a/src/mame/machine/apple3.cpp +++ b/src/mame/machine/apple3.cpp @@ -63,7 +63,7 @@ // 2 MHz mode probably has every 33rd cycle stretched but this is currently unproven. static constexpr XTAL APPLE2_CLOCK(1'021'800); -READ8_MEMBER(apple3_state::apple3_c0xx_r) +uint8_t apple3_state::apple3_c0xx_r(offs_t offset) { uint8_t result = 0xFF; device_a2bus_card_interface *slotdevice; @@ -195,7 +195,7 @@ READ8_MEMBER(apple3_state::apple3_c0xx_r) case 0x74: case 0x75: case 0x76: case 0x77: case 0x78: case 0x79: case 0x7A: case 0x7B: case 0x7C: case 0x7D: case 0x7E: case 0x7F: - result = m_rtc->read(space, m_via_0_b); + result = m_rtc->read(m_via_0_b); break; case 0x90: case 0x91: case 0x92: case 0x93: @@ -312,7 +312,7 @@ READ8_MEMBER(apple3_state::apple3_c0xx_r) -WRITE8_MEMBER(apple3_state::apple3_c0xx_w) +void apple3_state::apple3_c0xx_w(offs_t offset, uint8_t data) { device_a2bus_card_interface *slotdevice; @@ -375,7 +375,7 @@ WRITE8_MEMBER(apple3_state::apple3_c0xx_w) case 0x74: case 0x75: case 0x76: case 0x77: case 0x78: case 0x79: case 0x7A: case 0x7B: case 0x7C: case 0x7D: case 0x7E: case 0x7F: - m_rtc->write(space, m_via_0_b, data); + m_rtc->write(m_via_0_b, data); break; @@ -606,23 +606,23 @@ void apple3_state::apple3_via_out(uint8_t *var, uint8_t data) } -WRITE8_MEMBER(apple3_state::apple3_via_0_out_a) +void apple3_state::apple3_via_0_out_a(uint8_t data) { apple3_via_out(&m_via_0_a, data); } -WRITE8_MEMBER(apple3_state::apple3_via_0_out_b) +void apple3_state::apple3_via_0_out_b(uint8_t data) { // printf("ZP to %02x\n", data); apple3_via_out(&m_via_0_b, data); } -WRITE8_MEMBER(apple3_state::apple3_via_1_out_a) +void apple3_state::apple3_via_1_out_a(uint8_t data) { apple3_via_out(&m_via_1_a, data); } -WRITE8_MEMBER(apple3_state::apple3_via_1_out_b) +void apple3_state::apple3_via_1_out_b(uint8_t data) { m_dac->write(data); apple3_via_out(&m_via_1_b, data); @@ -746,7 +746,7 @@ void apple3_state::device_post_load() apple3_update_memory(); } -READ8_MEMBER(apple3_state::apple3_memory_r) +uint8_t apple3_state::apple3_memory_r(offs_t offset) { uint8_t rv = 0xff; @@ -797,7 +797,7 @@ READ8_MEMBER(apple3_state::apple3_memory_r) { if (!machine().side_effects_disabled()) { - rv = apple3_c0xx_r(space, offset-0xc000); + rv = apple3_c0xx_r(offset-0xc000); } } else @@ -882,7 +882,7 @@ READ8_MEMBER(apple3_state::apple3_memory_r) return rv; } -WRITE8_MEMBER(apple3_state::apple3_memory_w) +void apple3_state::apple3_memory_w(offs_t offset, uint8_t data) { if ((m_indir_bank & 0x80) && (offset >= 0x100)) { @@ -922,7 +922,7 @@ WRITE8_MEMBER(apple3_state::apple3_memory_w) { if (!machine().side_effects_disabled()) { - apple3_c0xx_w(space, offset-0xc000, data); + apple3_c0xx_w(offset-0xc000, data); } } else -- cgit v1.2.3