From 30e3be0bef522aa37ad6fc6ca50534ccef0f3d3f Mon Sep 17 00:00:00 2001 From: AJR Date: Tue, 19 Feb 2019 10:46:27 -0500 Subject: bus/comx35, bus/vip: Eliminate address_space argument from handlers (nw) --- src/devices/bus/comx35/clm.cpp | 10 +++++----- src/devices/bus/comx35/clm.h | 4 ++-- src/devices/bus/comx35/eprom.cpp | 4 ++-- src/devices/bus/comx35/eprom.h | 4 ++-- src/devices/bus/comx35/exp.cpp | 16 ++++++++-------- src/devices/bus/comx35/exp.h | 16 ++++++++-------- src/devices/bus/comx35/expbox.cpp | 16 ++++++++-------- src/devices/bus/comx35/expbox.h | 8 ++++---- src/devices/bus/comx35/fdc.cpp | 6 +++--- src/devices/bus/comx35/fdc.h | 6 +++--- src/devices/bus/comx35/joycard.cpp | 2 +- src/devices/bus/comx35/joycard.h | 2 +- src/devices/bus/comx35/printer.cpp | 6 +++--- src/devices/bus/comx35/printer.h | 6 +++--- src/devices/bus/comx35/ram.cpp | 6 +++--- src/devices/bus/comx35/ram.h | 6 +++--- src/devices/bus/comx35/thermal.cpp | 6 +++--- src/devices/bus/comx35/thermal.h | 6 +++--- src/devices/bus/vip/exp.cpp | 26 +++++++++++++------------- src/devices/bus/vip/exp.h | 26 +++++++++++++------------- src/devices/bus/vip/vp550.cpp | 18 +++++++++--------- src/devices/bus/vip/vp550.h | 10 +++++----- src/devices/bus/vip/vp570.cpp | 4 ++-- src/devices/bus/vip/vp570.h | 4 ++-- src/devices/bus/vip/vp575.cpp | 27 +++++++++++++-------------- src/devices/bus/vip/vp575.h | 12 ++++++------ src/devices/bus/vip/vp585.cpp | 2 +- src/devices/bus/vip/vp585.h | 2 +- src/devices/bus/vip/vp590.cpp | 8 ++++---- src/devices/bus/vip/vp590.h | 6 +++--- src/devices/bus/vip/vp595.cpp | 2 +- src/devices/bus/vip/vp595.h | 2 +- src/devices/bus/vip/vp700.cpp | 2 +- src/devices/bus/vip/vp700.h | 2 +- src/devices/video/cdp1862.cpp | 2 +- src/devices/video/cdp1862.h | 2 +- src/mame/drivers/comx35.cpp | 8 ++++---- src/mame/drivers/vip.cpp | 8 ++++---- 38 files changed, 151 insertions(+), 152 deletions(-) diff --git a/src/devices/bus/comx35/clm.cpp b/src/devices/bus/comx35/clm.cpp index 48372080308..91bffedb413 100644 --- a/src/devices/bus/comx35/clm.cpp +++ b/src/devices/bus/comx35/clm.cpp @@ -215,7 +215,7 @@ int comx_clm_device::comx_ef4_r() // comx_mrd_r - memory read //------------------------------------------------- -uint8_t comx_clm_device::comx_mrd_r(address_space &space, offs_t offset, int *extrom) +uint8_t comx_clm_device::comx_mrd_r(offs_t offset, int *extrom) { uint8_t data = 0xff; @@ -229,7 +229,7 @@ uint8_t comx_clm_device::comx_mrd_r(address_space &space, offs_t offset, int *ex } else if (offset == 0xd801) { - data = m_crtc->register_r(space, 0); + data = m_crtc->register_r(machine().dummy_space(), 0); } return data; @@ -240,7 +240,7 @@ uint8_t comx_clm_device::comx_mrd_r(address_space &space, offs_t offset, int *ex // comx_mwr_w - memory write //------------------------------------------------- -void comx_clm_device::comx_mwr_w(address_space &space, offs_t offset, uint8_t data) +void comx_clm_device::comx_mwr_w(offs_t offset, uint8_t data) { if (offset >= 0xd000 && offset < 0xd800) { @@ -248,10 +248,10 @@ void comx_clm_device::comx_mwr_w(address_space &space, offs_t offset, uint8_t da } else if (offset == 0xd800) { - m_crtc->address_w(space, 0, data); + m_crtc->address_w(machine().dummy_space(), 0, data); } else if (offset == 0xd801) { - m_crtc->register_w(space, 0, data); + m_crtc->register_w(machine().dummy_space(), 0, data); } } diff --git a/src/devices/bus/comx35/clm.h b/src/devices/bus/comx35/clm.h index 0784ae7bab2..9c4845cbbe0 100644 --- a/src/devices/bus/comx35/clm.h +++ b/src/devices/bus/comx35/clm.h @@ -42,8 +42,8 @@ protected: // device_comx_expansion_card_interface overrides virtual int comx_ef4_r() override; - virtual uint8_t comx_mrd_r(address_space &space, offs_t offset, int *extrom) override; - virtual void comx_mwr_w(address_space &space, offs_t offset, uint8_t data) override; + virtual uint8_t comx_mrd_r(offs_t offset, int *extrom) override; + virtual void comx_mwr_w(offs_t offset, uint8_t data) override; private: MC6845_UPDATE_ROW( crtc_update_row ); diff --git a/src/devices/bus/comx35/eprom.cpp b/src/devices/bus/comx35/eprom.cpp index 5fda7492dd5..0267d7c5b62 100644 --- a/src/devices/bus/comx35/eprom.cpp +++ b/src/devices/bus/comx35/eprom.cpp @@ -91,7 +91,7 @@ void comx_epr_device::device_reset() // comx_mrd_r - memory read //------------------------------------------------- -uint8_t comx_epr_device::comx_mrd_r(address_space &space, offs_t offset, int *extrom) +uint8_t comx_epr_device::comx_mrd_r(offs_t offset, int *extrom) { uint8_t data = 0; @@ -113,7 +113,7 @@ uint8_t comx_epr_device::comx_mrd_r(address_space &space, offs_t offset, int *ex // comx_io_w - I/O write //------------------------------------------------- -void comx_epr_device::comx_io_w(address_space &space, offs_t offset, uint8_t data) +void comx_epr_device::comx_io_w(offs_t offset, uint8_t data) { if (offset == 1) { diff --git a/src/devices/bus/comx35/eprom.h b/src/devices/bus/comx35/eprom.h index c6489dfa774..90f57e52d3d 100644 --- a/src/devices/bus/comx35/eprom.h +++ b/src/devices/bus/comx35/eprom.h @@ -37,8 +37,8 @@ protected: virtual void device_reset() override; // device_comx_expansion_card_interface overrides - virtual uint8_t comx_mrd_r(address_space &space, offs_t offset, int *extrom) override; - virtual void comx_io_w(address_space &space, offs_t offset, uint8_t data) override; + virtual uint8_t comx_mrd_r(offs_t offset, int *extrom) override; + virtual void comx_io_w(offs_t offset, uint8_t data) override; private: required_memory_region m_rom; diff --git a/src/devices/bus/comx35/exp.cpp b/src/devices/bus/comx35/exp.cpp index eb5917dccbf..75036fb6ea8 100644 --- a/src/devices/bus/comx35/exp.cpp +++ b/src/devices/bus/comx35/exp.cpp @@ -68,12 +68,12 @@ void comx_expansion_slot_device::device_start() // mrd_r - memory read //------------------------------------------------- -uint8_t comx_expansion_slot_device::mrd_r(address_space &space, offs_t offset, int *extrom) +uint8_t comx_expansion_slot_device::mrd_r(offs_t offset, int *extrom) { uint8_t data = 0; if (m_card != nullptr) - data = m_card->comx_mrd_r(space, offset, extrom); + data = m_card->comx_mrd_r(offset, extrom); return data; } @@ -83,10 +83,10 @@ uint8_t comx_expansion_slot_device::mrd_r(address_space &space, offs_t offset, i // mwr_w - memory write //------------------------------------------------- -void comx_expansion_slot_device::mwr_w(address_space &space, offs_t offset, uint8_t data) +void comx_expansion_slot_device::mwr_w(offs_t offset, uint8_t data) { if (m_card != nullptr) - m_card->comx_mwr_w(space, offset, data); + m_card->comx_mwr_w(offset, data); } @@ -94,12 +94,12 @@ void comx_expansion_slot_device::mwr_w(address_space &space, offs_t offset, uint // io_r - I/O read //------------------------------------------------- -uint8_t comx_expansion_slot_device::io_r(address_space &space, offs_t offset) +uint8_t comx_expansion_slot_device::io_r(offs_t offset) { uint8_t data = 0; if (m_card != nullptr) - data = m_card->comx_io_r(space, offset); + data = m_card->comx_io_r(offset); return data; } @@ -109,10 +109,10 @@ uint8_t comx_expansion_slot_device::io_r(address_space &space, offs_t offset) // sout_w - I/O write //------------------------------------------------- -void comx_expansion_slot_device::io_w(address_space &space, offs_t offset, uint8_t data) +void comx_expansion_slot_device::io_w(offs_t offset, uint8_t data) { if (m_card != nullptr) - m_card->comx_io_w(space, offset, data); + m_card->comx_io_w(offset, data); } diff --git a/src/devices/bus/comx35/exp.h b/src/devices/bus/comx35/exp.h index 0629db0a1ac..dea67184e06 100644 --- a/src/devices/bus/comx35/exp.h +++ b/src/devices/bus/comx35/exp.h @@ -62,11 +62,11 @@ public: template devcb_base &set_irq_wr_callback(Object &&cb) { return m_write_irq.set_callback(std::forward(cb)); } auto irq_callback() { return m_write_irq.bind(); } - uint8_t mrd_r(address_space &space, offs_t offset, int *extrom); - void mwr_w(address_space &space, offs_t offset, uint8_t data); + uint8_t mrd_r(offs_t offset, int *extrom); + void mwr_w(offs_t offset, uint8_t data); - uint8_t io_r(address_space &space, offs_t offset); - void io_w(address_space &space, offs_t offset, uint8_t data); + uint8_t io_r(offs_t offset); + void io_w(offs_t offset, uint8_t data); DECLARE_READ_LINE_MEMBER(ef4_r); @@ -107,12 +107,12 @@ protected: virtual void comx_tpb_w(int state) { } // memory access - virtual uint8_t comx_mrd_r(address_space &space, offs_t offset, int *extrom) { return 0; } - virtual void comx_mwr_w(address_space &space, offs_t offset, uint8_t data) { } + virtual uint8_t comx_mrd_r(offs_t offset, int *extrom) { return 0; } + virtual void comx_mwr_w(offs_t offset, uint8_t data) { } // I/O access - virtual uint8_t comx_io_r(address_space &space, offs_t offset) { return 0; } - virtual void comx_io_w(address_space &space, offs_t offset, uint8_t data) { } + virtual uint8_t comx_io_r(offs_t offset) { return 0; } + virtual void comx_io_w(offs_t offset, uint8_t data) { } comx_expansion_slot_device *m_slot; diff --git a/src/devices/bus/comx35/expbox.cpp b/src/devices/bus/comx35/expbox.cpp index f7c693d4ecf..65c945274f1 100644 --- a/src/devices/bus/comx35/expbox.cpp +++ b/src/devices/bus/comx35/expbox.cpp @@ -200,7 +200,7 @@ void comx_eb_device::comx_q_w(int state) // comx_mrd_r - memory read //------------------------------------------------- -uint8_t comx_eb_device::comx_mrd_r(address_space &space, offs_t offset, int *extrom) +uint8_t comx_eb_device::comx_mrd_r(offs_t offset, int *extrom) { uint8_t data = 0; @@ -219,7 +219,7 @@ uint8_t comx_eb_device::comx_mrd_r(address_space &space, offs_t offset, int *ext { if (BIT(m_select, slot) && m_expansion_slot[slot] != nullptr) { - data |= m_expansion_slot[slot]->mrd_r(space, offset, extrom); + data |= m_expansion_slot[slot]->mrd_r(offset, extrom); } } } @@ -232,13 +232,13 @@ uint8_t comx_eb_device::comx_mrd_r(address_space &space, offs_t offset, int *ext // comx_mwr_w - memory write //------------------------------------------------- -void comx_eb_device::comx_mwr_w(address_space &space, offs_t offset, uint8_t data) +void comx_eb_device::comx_mwr_w(offs_t offset, uint8_t data) { for (int slot = 0; slot < MAX_EB_SLOTS; slot++) { if (BIT(m_select, slot) && m_expansion_slot[slot] != nullptr) { - m_expansion_slot[slot]->mwr_w(space, offset, data); + m_expansion_slot[slot]->mwr_w(offset, data); } } } @@ -248,7 +248,7 @@ void comx_eb_device::comx_mwr_w(address_space &space, offs_t offset, uint8_t dat // comx_io_r - I/O read //------------------------------------------------- -uint8_t comx_eb_device::comx_io_r(address_space &space, offs_t offset) +uint8_t comx_eb_device::comx_io_r(offs_t offset) { uint8_t data = 0; @@ -256,7 +256,7 @@ uint8_t comx_eb_device::comx_io_r(address_space &space, offs_t offset) { if (BIT(m_select, slot) && m_expansion_slot[slot] != nullptr) { - data |= m_expansion_slot[slot]->io_r(space, offset); + data |= m_expansion_slot[slot]->io_r(offset); } } @@ -268,7 +268,7 @@ uint8_t comx_eb_device::comx_io_r(address_space &space, offs_t offset) // comx_io_w - I/O write //------------------------------------------------- -void comx_eb_device::comx_io_w(address_space &space, offs_t offset, uint8_t data) +void comx_eb_device::comx_io_w(offs_t offset, uint8_t data) { if (offset == 1 && !(BIT(data, 0))) { @@ -287,7 +287,7 @@ void comx_eb_device::comx_io_w(address_space &space, offs_t offset, uint8_t data { if (BIT(m_select, slot) && m_expansion_slot[slot] != nullptr) { - m_expansion_slot[slot]->io_w(space, offset, data); + m_expansion_slot[slot]->io_w(offset, data); } } } diff --git a/src/devices/bus/comx35/expbox.h b/src/devices/bus/comx35/expbox.h index 4c806a79b92..c4c89b4f2bc 100644 --- a/src/devices/bus/comx35/expbox.h +++ b/src/devices/bus/comx35/expbox.h @@ -48,10 +48,10 @@ protected: // device_comx_expansion_card_interface overrides virtual int comx_ef4_r() override; virtual void comx_q_w(int state) override; - virtual uint8_t comx_mrd_r(address_space &space, offs_t offset, int *extrom) override; - virtual void comx_mwr_w(address_space &space, offs_t offset, uint8_t data) override; - virtual uint8_t comx_io_r(address_space &space, offs_t offset) override; - virtual void comx_io_w(address_space &space, offs_t offset, uint8_t data) override; + virtual uint8_t comx_mrd_r(offs_t offset, int *extrom) override; + virtual void comx_mwr_w(offs_t offset, uint8_t data) override; + virtual uint8_t comx_io_r(offs_t offset) override; + virtual void comx_io_w(offs_t offset, uint8_t data) override; void set_irq() { m_slot->irq_w(m_irq[0] || m_irq[1] || m_irq[2] || m_irq[3]); } diff --git a/src/devices/bus/comx35/fdc.cpp b/src/devices/bus/comx35/fdc.cpp index 27246c37333..da1b6dcc028 100644 --- a/src/devices/bus/comx35/fdc.cpp +++ b/src/devices/bus/comx35/fdc.cpp @@ -188,7 +188,7 @@ void comx_fd_device::comx_q_w(int state) // comx_mrd_r - memory read //------------------------------------------------- -uint8_t comx_fd_device::comx_mrd_r(address_space &space, offs_t offset, int *extrom) +uint8_t comx_fd_device::comx_mrd_r(offs_t offset, int *extrom) { uint8_t data = 0xff; @@ -210,7 +210,7 @@ uint8_t comx_fd_device::comx_mrd_r(address_space &space, offs_t offset, int *ext // comx_io_r - I/O read //------------------------------------------------- -uint8_t comx_fd_device::comx_io_r(address_space &space, offs_t offset) +uint8_t comx_fd_device::comx_io_r(offs_t offset) { uint8_t data = 0xff; @@ -235,7 +235,7 @@ uint8_t comx_fd_device::comx_io_r(address_space &space, offs_t offset) // comx_io_w - I/O write //------------------------------------------------- -void comx_fd_device::comx_io_w(address_space &space, offs_t offset, uint8_t data) +void comx_fd_device::comx_io_w(offs_t offset, uint8_t data) { if (offset == 2) { diff --git a/src/devices/bus/comx35/fdc.h b/src/devices/bus/comx35/fdc.h index ad682e97718..45617bb8580 100644 --- a/src/devices/bus/comx35/fdc.h +++ b/src/devices/bus/comx35/fdc.h @@ -43,9 +43,9 @@ protected: // device_comx_expansion_card_interface overrides virtual int comx_ef4_r() override; virtual void comx_q_w(int state) override; - virtual uint8_t comx_mrd_r(address_space &space, offs_t offset, int *extrom) override; - virtual uint8_t comx_io_r(address_space &space, offs_t offset) override; - virtual void comx_io_w(address_space &space, offs_t offset, uint8_t data) override; + virtual uint8_t comx_mrd_r(offs_t offset, int *extrom) override; + virtual uint8_t comx_io_r(offs_t offset) override; + virtual void comx_io_w(offs_t offset, uint8_t data) override; private: DECLARE_FLOPPY_FORMATS( floppy_formats ); diff --git a/src/devices/bus/comx35/joycard.cpp b/src/devices/bus/comx35/joycard.cpp index 4c6e46ff06e..e76f20a5be8 100644 --- a/src/devices/bus/comx35/joycard.cpp +++ b/src/devices/bus/comx35/joycard.cpp @@ -98,7 +98,7 @@ void comx_joy_device::device_reset() // comx_mrd_r - I/O read //------------------------------------------------- -uint8_t comx_joy_device::comx_io_r(address_space &space, offs_t offset) +uint8_t comx_joy_device::comx_io_r(offs_t offset) { uint8_t data = 0; diff --git a/src/devices/bus/comx35/joycard.h b/src/devices/bus/comx35/joycard.h index e2d6bb40151..92c41431961 100644 --- a/src/devices/bus/comx35/joycard.h +++ b/src/devices/bus/comx35/joycard.h @@ -37,7 +37,7 @@ protected: virtual void device_reset() override; // device_comx_expansion_card_interface overrides - virtual uint8_t comx_io_r(address_space &space, offs_t offset) override; + virtual uint8_t comx_io_r(offs_t offset) override; private: required_ioport m_joy1; diff --git a/src/devices/bus/comx35/printer.cpp b/src/devices/bus/comx35/printer.cpp index 957b2a8a020..6858d687c0b 100644 --- a/src/devices/bus/comx35/printer.cpp +++ b/src/devices/bus/comx35/printer.cpp @@ -112,7 +112,7 @@ void comx_prn_device::device_reset() // comx_mrd_r - memory read //------------------------------------------------- -uint8_t comx_prn_device::comx_mrd_r(address_space &space, offs_t offset, int *extrom) +uint8_t comx_prn_device::comx_mrd_r(offs_t offset, int *extrom) { uint8_t data = 0; @@ -129,7 +129,7 @@ uint8_t comx_prn_device::comx_mrd_r(address_space &space, offs_t offset, int *ex // comx_io_r - I/O read //------------------------------------------------- -uint8_t comx_prn_device::comx_io_r(address_space &space, offs_t offset) +uint8_t comx_prn_device::comx_io_r(offs_t offset) { /* Parallel: @@ -168,7 +168,7 @@ uint8_t comx_prn_device::comx_io_r(address_space &space, offs_t offset) // comx_io_w - I/O write //------------------------------------------------- -void comx_prn_device::comx_io_w(address_space &space, offs_t offset, uint8_t data) +void comx_prn_device::comx_io_w(offs_t offset, uint8_t data) { /* Parallel: diff --git a/src/devices/bus/comx35/printer.h b/src/devices/bus/comx35/printer.h index dcfd27a7cd1..1ffa3f66046 100644 --- a/src/devices/bus/comx35/printer.h +++ b/src/devices/bus/comx35/printer.h @@ -39,9 +39,9 @@ protected: virtual void device_add_mconfig(machine_config &config) override; // device_comx_expansion_card_interface overrides - virtual uint8_t comx_mrd_r(address_space &space, offs_t offset, int *extrom) override; - virtual uint8_t comx_io_r(address_space &space, offs_t offset) override; - virtual void comx_io_w(address_space &space, offs_t offset, uint8_t data) override; + virtual uint8_t comx_mrd_r(offs_t offset, int *extrom) override; + virtual uint8_t comx_io_r(offs_t offset) override; + virtual void comx_io_w(offs_t offset, uint8_t data) override; private: required_device m_centronics; diff --git a/src/devices/bus/comx35/ram.cpp b/src/devices/bus/comx35/ram.cpp index c09ef729225..b468b6366ff 100644 --- a/src/devices/bus/comx35/ram.cpp +++ b/src/devices/bus/comx35/ram.cpp @@ -66,7 +66,7 @@ void comx_ram_device::device_reset() // comx_mrd_r - memory read //------------------------------------------------- -uint8_t comx_ram_device::comx_mrd_r(address_space &space, offs_t offset, int *extrom) +uint8_t comx_ram_device::comx_mrd_r(offs_t offset, int *extrom) { uint8_t data = 0; @@ -83,7 +83,7 @@ uint8_t comx_ram_device::comx_mrd_r(address_space &space, offs_t offset, int *ex // comx_mwr_w - memory write //------------------------------------------------- -void comx_ram_device::comx_mwr_w(address_space &space, offs_t offset, uint8_t data) +void comx_ram_device::comx_mwr_w(offs_t offset, uint8_t data) { if (offset >= 0xc000 && offset < 0xd000) { @@ -96,7 +96,7 @@ void comx_ram_device::comx_mwr_w(address_space &space, offs_t offset, uint8_t da // comx_io_w - I/O write //------------------------------------------------- -void comx_ram_device::comx_io_w(address_space &space, offs_t offset, uint8_t data) +void comx_ram_device::comx_io_w(offs_t offset, uint8_t data) { if (offset == 1) { diff --git a/src/devices/bus/comx35/ram.h b/src/devices/bus/comx35/ram.h index 251e47e2097..3a75e208eb6 100644 --- a/src/devices/bus/comx35/ram.h +++ b/src/devices/bus/comx35/ram.h @@ -34,9 +34,9 @@ protected: virtual void device_reset() override; // device_comx_expansion_card_interface overrides - virtual uint8_t comx_mrd_r(address_space &space, offs_t offset, int *extrom) override; - virtual void comx_mwr_w(address_space &space, offs_t offset, uint8_t data) override; - virtual void comx_io_w(address_space &space, offs_t offset, uint8_t data) override; + virtual uint8_t comx_mrd_r(offs_t offset, int *extrom) override; + virtual void comx_mwr_w(offs_t offset, uint8_t data) override; + virtual void comx_io_w(offs_t offset, uint8_t data) override; private: optional_shared_ptr m_ram; diff --git a/src/devices/bus/comx35/thermal.cpp b/src/devices/bus/comx35/thermal.cpp index e1d4f0ed8d3..badd1beb8c1 100644 --- a/src/devices/bus/comx35/thermal.cpp +++ b/src/devices/bus/comx35/thermal.cpp @@ -82,7 +82,7 @@ void comx_thm_device::device_reset() // comx_mrd_r - memory read //------------------------------------------------- -uint8_t comx_thm_device::comx_mrd_r(address_space &space, offs_t offset, int *extrom) +uint8_t comx_thm_device::comx_mrd_r(offs_t offset, int *extrom) { uint8_t data = 0; @@ -99,7 +99,7 @@ uint8_t comx_thm_device::comx_mrd_r(address_space &space, offs_t offset, int *ex // comx_io_r - I/O read //------------------------------------------------- -uint8_t comx_thm_device::comx_io_r(address_space &space, offs_t offset) +uint8_t comx_thm_device::comx_io_r(offs_t offset) { /* INP 2 is used for the printer status, where: @@ -116,7 +116,7 @@ uint8_t comx_thm_device::comx_io_r(address_space &space, offs_t offset) // comx_io_w - I/O write //------------------------------------------------- -void comx_thm_device::comx_io_w(address_space &space, offs_t offset, uint8_t data) +void comx_thm_device::comx_io_w(offs_t offset, uint8_t data) { /* OUT 2 is used to control the thermal printer where: diff --git a/src/devices/bus/comx35/thermal.h b/src/devices/bus/comx35/thermal.h index feb92f7bc45..645f6bf0213 100644 --- a/src/devices/bus/comx35/thermal.h +++ b/src/devices/bus/comx35/thermal.h @@ -37,9 +37,9 @@ protected: virtual void device_reset() override; // device_comx_expansion_card_interface overrides - virtual uint8_t comx_mrd_r(address_space &space, offs_t offset, int *extrom) override; - virtual uint8_t comx_io_r(address_space &space, offs_t offset) override; - virtual void comx_io_w(address_space &space, offs_t offset, uint8_t data) override; + virtual uint8_t comx_mrd_r(offs_t offset, int *extrom) override; + virtual uint8_t comx_io_r(offs_t offset) override; + virtual void comx_io_w(offs_t offset, uint8_t data) override; private: required_memory_region m_rom; diff --git a/src/devices/bus/vip/exp.cpp b/src/devices/bus/vip/exp.cpp index 70467c57839..132a4d753ef 100644 --- a/src/devices/bus/vip/exp.cpp +++ b/src/devices/bus/vip/exp.cpp @@ -80,13 +80,13 @@ void vip_expansion_slot_device::device_start() // program_r - program read //------------------------------------------------- -uint8_t vip_expansion_slot_device::program_r(address_space &space, offs_t offset, int cs, int cdef, int *minh) +uint8_t vip_expansion_slot_device::program_r(offs_t offset, int cs, int cdef, int *minh) { uint8_t data = 0; if (m_card != nullptr) { - data = m_card->vip_program_r(space, offset, cs, cdef, minh); + data = m_card->vip_program_r(offset, cs, cdef, minh); } return data; @@ -97,11 +97,11 @@ uint8_t vip_expansion_slot_device::program_r(address_space &space, offs_t offset // program_w - program write //------------------------------------------------- -void vip_expansion_slot_device::program_w(address_space &space, offs_t offset, uint8_t data, int cdef, int *minh) +void vip_expansion_slot_device::program_w(offs_t offset, uint8_t data, int cdef, int *minh) { if (m_card != nullptr) { - m_card->vip_program_w(space, offset, data, cdef, minh); + m_card->vip_program_w(offset, data, cdef, minh); } } @@ -110,13 +110,13 @@ void vip_expansion_slot_device::program_w(address_space &space, offs_t offset, u // io_r - io read //------------------------------------------------- -uint8_t vip_expansion_slot_device::io_r(address_space &space, offs_t offset) +uint8_t vip_expansion_slot_device::io_r(offs_t offset) { uint8_t data = 0; if (m_card != nullptr) { - data = m_card->vip_io_r(space, offset); + data = m_card->vip_io_r(offset); } return data; @@ -127,11 +127,11 @@ uint8_t vip_expansion_slot_device::io_r(address_space &space, offs_t offset) // io_w - io write //------------------------------------------------- -void vip_expansion_slot_device::io_w(address_space &space, offs_t offset, uint8_t data) +void vip_expansion_slot_device::io_w(offs_t offset, uint8_t data) { if (m_card != nullptr) { - m_card->vip_io_w(space, offset, data); + m_card->vip_io_w(offset, data); } } @@ -140,13 +140,13 @@ void vip_expansion_slot_device::io_w(address_space &space, offs_t offset, uint8_ // dma_r - dma read //------------------------------------------------- -READ8_MEMBER(vip_expansion_slot_device::dma_r) +uint8_t vip_expansion_slot_device::dma_r(offs_t offset) { uint8_t data = 0; if (m_card != nullptr) { - data = m_card->vip_dma_r(space, offset); + data = m_card->vip_dma_r(offset); } return data; @@ -157,11 +157,11 @@ READ8_MEMBER(vip_expansion_slot_device::dma_r) // dma_w - dma write //------------------------------------------------- -WRITE8_MEMBER(vip_expansion_slot_device::dma_w) +void vip_expansion_slot_device::dma_w(offs_t offset, uint8_t data) { if (m_card != nullptr) { - m_card->vip_dma_w(space, offset, data); + m_card->vip_dma_w(offset, data); } } @@ -206,7 +206,7 @@ READ_LINE_MEMBER(vip_expansion_slot_device::ef4_r) return state; } -WRITE8_MEMBER(vip_expansion_slot_device::sc_w) +void vip_expansion_slot_device::sc_w(offs_t offset, uint8_t data) { if (m_card != nullptr) m_card->vip_sc_w(offset, data); diff --git a/src/devices/bus/vip/exp.h b/src/devices/bus/vip/exp.h index 82e131fbe09..9073dafee0d 100644 --- a/src/devices/bus/vip/exp.h +++ b/src/devices/bus/vip/exp.h @@ -75,17 +75,17 @@ public: auto dma_in_wr_callback() { return m_write_dma_in.bind(); } // computer interface - uint8_t program_r(address_space &space, offs_t offset, int cs, int cdef, int *minh); - void program_w(address_space &space, offs_t offset, uint8_t data, int cdef, int *minh); - uint8_t io_r(address_space &space, offs_t offset); - void io_w(address_space &space, offs_t offset, uint8_t data); - DECLARE_READ8_MEMBER(dma_r); - DECLARE_WRITE8_MEMBER(dma_w); + uint8_t program_r(offs_t offset, int cs, int cdef, int *minh); + void program_w(offs_t offset, uint8_t data, int cdef, int *minh); + uint8_t io_r(offs_t offset); + void io_w(offs_t offset, uint8_t data); + uint8_t dma_r(offs_t offset); + void dma_w(offs_t offset, uint8_t data); uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); DECLARE_READ_LINE_MEMBER(ef1_r); DECLARE_READ_LINE_MEMBER(ef3_r); DECLARE_READ_LINE_MEMBER(ef4_r); - DECLARE_WRITE8_MEMBER(sc_w); + void sc_w(offs_t offset, uint8_t data); DECLARE_WRITE_LINE_MEMBER(q_w); DECLARE_WRITE_LINE_MEMBER(tpb_w); DECLARE_WRITE_LINE_MEMBER(run_w); @@ -118,14 +118,14 @@ protected: device_vip_expansion_card_interface(const machine_config &mconfig, device_t &device); // runtime - virtual uint8_t vip_program_r(address_space &space, offs_t offset, int cs, int cdef, int *minh) { return 0xff; } - virtual void vip_program_w(address_space &space, offs_t offset, uint8_t data, int cdef, int *minh) { } + virtual uint8_t vip_program_r(offs_t offset, int cs, int cdef, int *minh) { return 0xff; } + virtual void vip_program_w(offs_t offset, uint8_t data, int cdef, int *minh) { } - virtual uint8_t vip_io_r(address_space &space, offs_t offset) { return 0xff; } - virtual void vip_io_w(address_space &space, offs_t offset, uint8_t data) { } + virtual uint8_t vip_io_r(offs_t offset) { return 0xff; } + virtual void vip_io_w(offs_t offset, uint8_t data) { } - virtual uint8_t vip_dma_r(address_space &space, offs_t offset) { return 0xff; } - virtual void vip_dma_w(address_space &space, offs_t offset, uint8_t data) { } + virtual uint8_t vip_dma_r(offs_t offset) { return 0xff; } + virtual void vip_dma_w(offs_t offset, uint8_t data) { } virtual uint32_t vip_screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) { return 0; } diff --git a/src/devices/bus/vip/vp550.cpp b/src/devices/bus/vip/vp550.cpp index a8285c53adc..48b666a3714 100644 --- a/src/devices/bus/vip/vp550.cpp +++ b/src/devices/bus/vip/vp550.cpp @@ -112,7 +112,7 @@ void vp550_device::device_timer(emu_timer &timer, device_timer_id id, int param, // vip_program_w - program write //------------------------------------------------- -void vp550_device::vip_program_w(address_space &space, offs_t offset, uint8_t data, int cdef, int *minh) +void vp550_device::vip_program_w(offs_t offset, uint8_t data, int cdef, int *minh) { if (BIT(offset, 15)) { @@ -122,14 +122,14 @@ void vp550_device::vip_program_w(address_space &space, offs_t offset, uint8_t da { case 1: m_pfg_a->write_str(data); break; case 2: m_pfg_b->write_str(data); break; - case 3: octave_w(space, offset, data); break; + case 3: octave_w(data); break; } switch ((offset >> 4) & 0x03) { - case 1: vlmna_w(space, offset, data); break; - case 2: vlmnb_w(space, offset, data); break; - case 3: sync_w(space, offset, data); break; + case 1: vlmna_w(data); break; + case 2: vlmnb_w(data); break; + case 3: sync_w(data); break; } } } @@ -179,7 +179,7 @@ void vp550_device::vip_run_w(int state) // octave_w - octave select write //------------------------------------------------- -WRITE8_MEMBER( vp550_device::octave_w ) +void vp550_device::octave_w(uint8_t data) { int channel = (data >> 2) & 0x03; int clock2 = 0; @@ -209,7 +209,7 @@ WRITE8_MEMBER( vp550_device::octave_w ) // vlmna_w - channel A amplitude write //------------------------------------------------- -WRITE8_MEMBER( vp550_device::vlmna_w ) +void vp550_device::vlmna_w(uint8_t data) { if (LOG) logerror("VP550 '%s' A Volume: %u\n", tag(), data & 0x0f); @@ -223,7 +223,7 @@ WRITE8_MEMBER( vp550_device::vlmna_w ) // vlmnb_w - channel B amplitude write //------------------------------------------------- -WRITE8_MEMBER( vp550_device::vlmnb_w ) +void vp550_device::vlmnb_w(uint8_t data) { if (LOG) logerror("VP550 '%s' B Volume: %u\n", tag(), data & 0x0f); @@ -237,7 +237,7 @@ WRITE8_MEMBER( vp550_device::vlmnb_w ) // sync_w - interrupt enable write //------------------------------------------------- -WRITE8_MEMBER( vp550_device::sync_w ) +void vp550_device::sync_w(uint8_t data) { if (LOG) logerror("VP550 '%s' Interrupt Enable: %u\n", tag(), BIT(data, 0)); diff --git a/src/devices/bus/vip/vp550.h b/src/devices/bus/vip/vp550.h index 20b2cf8e8de..d881063ba2c 100644 --- a/src/devices/bus/vip/vp550.h +++ b/src/devices/bus/vip/vp550.h @@ -36,16 +36,16 @@ protected: virtual void device_add_mconfig(machine_config &config) override; // device_vip_expansion_card_interface overrides - virtual void vip_program_w(address_space &space, offs_t offset, uint8_t data, int cdef, int *minh) override; + virtual void vip_program_w(offs_t offset, uint8_t data, int cdef, int *minh) override; virtual void vip_sc_w(int n, int sc) override; virtual void vip_q_w(int state) override; virtual void vip_run_w(int state) override; private: - DECLARE_WRITE8_MEMBER( octave_w ); - DECLARE_WRITE8_MEMBER( vlmna_w ); - DECLARE_WRITE8_MEMBER( vlmnb_w ); - DECLARE_WRITE8_MEMBER( sync_w ); + void octave_w(uint8_t data); + void vlmna_w(uint8_t data); + void vlmnb_w(uint8_t data); + void sync_w(uint8_t data); required_device m_pfg_a; required_device m_pfg_b; diff --git a/src/devices/bus/vip/vp570.cpp b/src/devices/bus/vip/vp570.cpp index e01d427649b..f9473bd2f87 100644 --- a/src/devices/bus/vip/vp570.cpp +++ b/src/devices/bus/vip/vp570.cpp @@ -84,7 +84,7 @@ void vp570_device::device_start() // vip_program_r - program read //------------------------------------------------- -uint8_t vp570_device::vip_program_r(address_space &space, offs_t offset, int cs, int cdef, int *minh) +uint8_t vp570_device::vip_program_r(offs_t offset, int cs, int cdef, int *minh) { uint8_t data = 0xff; @@ -105,7 +105,7 @@ uint8_t vp570_device::vip_program_r(address_space &space, offs_t offset, int cs, // vip_program_w - program write //------------------------------------------------- -void vp570_device::vip_program_w(address_space &space, offs_t offset, uint8_t data, int cdef, int *minh) +void vp570_device::vip_program_w(offs_t offset, uint8_t data, int cdef, int *minh) { offs_t base = m_base->read() << 12; diff --git a/src/devices/bus/vip/vp570.h b/src/devices/bus/vip/vp570.h index 004be88a8bf..04ad752d804 100644 --- a/src/devices/bus/vip/vp570.h +++ b/src/devices/bus/vip/vp570.h @@ -36,8 +36,8 @@ protected: virtual void device_start() override; // device_vip_expansion_card_interface overrides - virtual uint8_t vip_program_r(address_space &space, offs_t offset, int cs, int cdef, int *minh) override; - virtual void vip_program_w(address_space &space, offs_t offset, uint8_t data, int cdef, int *minh) override; + virtual uint8_t vip_program_r(offs_t offset, int cs, int cdef, int *minh) override; + virtual void vip_program_w(offs_t offset, uint8_t data, int cdef, int *minh) override; private: optional_shared_ptr m_ram; diff --git a/src/devices/bus/vip/vp575.cpp b/src/devices/bus/vip/vp575.cpp index 7dbfabf0981..40b3b992dc9 100644 --- a/src/devices/bus/vip/vp575.cpp +++ b/src/devices/bus/vip/vp575.cpp @@ -110,13 +110,13 @@ void vp575_device::device_start() // vip_program_r - program read //------------------------------------------------- -uint8_t vp575_device::vip_program_r(address_space &space, offs_t offset, int cs, int cdef, int *minh) +uint8_t vp575_device::vip_program_r(offs_t offset, int cs, int cdef, int *minh) { uint8_t data = 0xff; for (auto & elem : m_expansion_slot) { - data &= elem->program_r(space, offset, cs, cdef, minh); + data &= elem->program_r(offset, cs, cdef, minh); } return data; @@ -127,11 +127,11 @@ uint8_t vp575_device::vip_program_r(address_space &space, offs_t offset, int cs, // vip_program_w - program write //------------------------------------------------- -void vp575_device::vip_program_w(address_space &space, offs_t offset, uint8_t data, int cdef, int *minh) +void vp575_device::vip_program_w(offs_t offset, uint8_t data, int cdef, int *minh) { for (auto & elem : m_expansion_slot) { - elem->program_w(space, offset, data, cdef, minh); + elem->program_w(offset, data, cdef, minh); } } @@ -140,13 +140,13 @@ void vp575_device::vip_program_w(address_space &space, offs_t offset, uint8_t da // vip_io_r - I/O read //------------------------------------------------- -uint8_t vp575_device::vip_io_r(address_space &space, offs_t offset) +uint8_t vp575_device::vip_io_r(offs_t offset) { uint8_t data = 0xff; for (auto & elem : m_expansion_slot) { - data &= elem->io_r(space, offset); + data &= elem->io_r(offset); } return data; @@ -157,11 +157,11 @@ uint8_t vp575_device::vip_io_r(address_space &space, offs_t offset) // vip_io_w - I/O write //------------------------------------------------- -void vp575_device::vip_io_w(address_space &space, offs_t offset, uint8_t data) +void vp575_device::vip_io_w(offs_t offset, uint8_t data) { for (auto & elem : m_expansion_slot) { - elem->io_w(space, offset, data); + elem->io_w(offset, data); } } @@ -170,13 +170,13 @@ void vp575_device::vip_io_w(address_space &space, offs_t offset, uint8_t data) // vip_dma_r - DMA read //------------------------------------------------- -uint8_t vp575_device::vip_dma_r(address_space &space, offs_t offset) +uint8_t vp575_device::vip_dma_r(offs_t offset) { uint8_t data = 0xff; for (auto & elem : m_expansion_slot) { - data &= elem->dma_r(space, offset); + data &= elem->dma_r(offset); } return data; @@ -187,11 +187,11 @@ uint8_t vp575_device::vip_dma_r(address_space &space, offs_t offset) // vip_dma_w - DMA write //------------------------------------------------- -void vp575_device::vip_dma_w(address_space &space, offs_t offset, uint8_t data) +void vp575_device::vip_dma_w(offs_t offset, uint8_t data) { for (auto & elem : m_expansion_slot) { - elem->dma_w(space, offset, data); + elem->dma_w(offset, data); } } @@ -270,10 +270,9 @@ int vp575_device::vip_ef4_r() void vp575_device::vip_sc_w(int n, int sc) { - address_space &space = machine().dummy_space(); for (auto & elem : m_expansion_slot) { - elem->sc_w(space, n, sc); + elem->sc_w(n, sc); } } diff --git a/src/devices/bus/vip/vp575.h b/src/devices/bus/vip/vp575.h index 41a18053276..fb5c22f5628 100644 --- a/src/devices/bus/vip/vp575.h +++ b/src/devices/bus/vip/vp575.h @@ -34,12 +34,12 @@ protected: virtual void device_add_mconfig(machine_config &config) override; // device_vip_expansion_card_interface overrides - virtual uint8_t vip_program_r(address_space &space, offs_t offset, int cs, int cdef, int *minh) override; - virtual void vip_program_w(address_space &space, offs_t offset, uint8_t data, int cdef, int *minh) override; - virtual uint8_t vip_io_r(address_space &space, offs_t offset) override; - virtual void vip_io_w(address_space &space, offs_t offset, uint8_t data) override; - virtual uint8_t vip_dma_r(address_space &space, offs_t offset) override; - virtual void vip_dma_w(address_space &space, offs_t offset, uint8_t data) override; + virtual uint8_t vip_program_r(offs_t offset, int cs, int cdef, int *minh) override; + virtual void vip_program_w(offs_t offset, uint8_t data, int cdef, int *minh) override; + virtual uint8_t vip_io_r(offs_t offset) override; + virtual void vip_io_w(offs_t offset, uint8_t data) override; + virtual uint8_t vip_dma_r(offs_t offset) override; + virtual void vip_dma_w(offs_t offset, uint8_t data) override; virtual uint32_t vip_screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) override; virtual int vip_ef1_r() override; virtual int vip_ef3_r() override; diff --git a/src/devices/bus/vip/vp585.cpp b/src/devices/bus/vip/vp585.cpp index 47a1115097a..2112637ae6b 100644 --- a/src/devices/bus/vip/vp585.cpp +++ b/src/devices/bus/vip/vp585.cpp @@ -105,7 +105,7 @@ void vp585_device::device_start() // vip_io_w - I/O write //------------------------------------------------- -void vp585_device::vip_io_w(address_space &space, offs_t offset, uint8_t data) +void vp585_device::vip_io_w(offs_t offset, uint8_t data) { if (offset == 0x02) { diff --git a/src/devices/bus/vip/vp585.h b/src/devices/bus/vip/vp585.h index a3511def5d0..f32bf055e91 100644 --- a/src/devices/bus/vip/vp585.h +++ b/src/devices/bus/vip/vp585.h @@ -36,7 +36,7 @@ protected: virtual void device_start() override; // device_vip_expansion_card_interface overrides - virtual void vip_io_w(address_space &space, offs_t offset, uint8_t data) override; + virtual void vip_io_w(offs_t offset, uint8_t data) override; virtual int vip_ef3_r() override; virtual int vip_ef4_r() override; diff --git a/src/devices/bus/vip/vp590.cpp b/src/devices/bus/vip/vp590.cpp index a1f0c300bcf..85ea459dcdc 100644 --- a/src/devices/bus/vip/vp590.cpp +++ b/src/devices/bus/vip/vp590.cpp @@ -159,7 +159,7 @@ void vp590_device::device_start() // vip_program_w - program write //------------------------------------------------- -void vp590_device::vip_program_w(address_space &space, offs_t offset, uint8_t data, int cdef, int *minh) +void vp590_device::vip_program_w(offs_t offset, uint8_t data, int cdef, int *minh) { if (offset >= 0xc000 && offset < 0xe000) { @@ -185,7 +185,7 @@ void vp590_device::vip_program_w(address_space &space, offs_t offset, uint8_t da // vip_io_w - I/O write //------------------------------------------------- -void vp590_device::vip_io_w(address_space &space, offs_t offset, uint8_t data) +void vp590_device::vip_io_w(offs_t offset, uint8_t data) { switch (offset) { @@ -205,7 +205,7 @@ void vp590_device::vip_io_w(address_space &space, offs_t offset, uint8_t data) // vip_dma_w - DMA write //------------------------------------------------- -void vp590_device::vip_dma_w(address_space &space, offs_t offset, uint8_t data) +void vp590_device::vip_dma_w(offs_t offset, uint8_t data) { uint8_t mask = 0xff; @@ -217,7 +217,7 @@ void vp590_device::vip_dma_w(address_space &space, offs_t offset, uint8_t data) m_color = m_color_ram[offset & mask]; - m_cgc->dma_w(space, offset, data); + m_cgc->dma_w(data); } diff --git a/src/devices/bus/vip/vp590.h b/src/devices/bus/vip/vp590.h index 2dfdece5ab7..230b7d8d02d 100644 --- a/src/devices/bus/vip/vp590.h +++ b/src/devices/bus/vip/vp590.h @@ -37,9 +37,9 @@ protected: virtual ioport_constructor device_input_ports() const override; // device_vip_expansion_card_interface overrides - virtual void vip_program_w(address_space &space, offs_t offset, uint8_t data, int cdef, int *minh) override; - virtual void vip_io_w(address_space &space, offs_t offset, uint8_t data) override; - virtual void vip_dma_w(address_space &space, offs_t offset, uint8_t data) override; + virtual void vip_program_w(offs_t offset, uint8_t data, int cdef, int *minh) override; + virtual void vip_io_w(offs_t offset, uint8_t data) override; + virtual void vip_dma_w(offs_t offset, uint8_t data) override; virtual uint32_t vip_screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) override; virtual int vip_ef3_r() override; virtual int vip_ef4_r() override; diff --git a/src/devices/bus/vip/vp595.cpp b/src/devices/bus/vip/vp595.cpp index 0d8e2306182..e7fe7c64c44 100644 --- a/src/devices/bus/vip/vp595.cpp +++ b/src/devices/bus/vip/vp595.cpp @@ -73,7 +73,7 @@ void vp595_device::device_start() // vip_io_w - I/O write //------------------------------------------------- -void vp595_device::vip_io_w(address_space &space, offs_t offset, uint8_t data) +void vp595_device::vip_io_w(offs_t offset, uint8_t data) { if (offset == 0x03) { diff --git a/src/devices/bus/vip/vp595.h b/src/devices/bus/vip/vp595.h index 9de9c8a6071..5c98b33fe7c 100644 --- a/src/devices/bus/vip/vp595.h +++ b/src/devices/bus/vip/vp595.h @@ -35,7 +35,7 @@ protected: virtual void device_add_mconfig(machine_config &config) override; // device_vip_expansion_card_interface overrides - virtual void vip_io_w(address_space &space, offs_t offset, uint8_t data) override; + virtual void vip_io_w(offs_t offset, uint8_t data) override; virtual void vip_q_w(int state) override; private: diff --git a/src/devices/bus/vip/vp700.cpp b/src/devices/bus/vip/vp700.cpp index 4b7dbab2839..f64574a23fc 100644 --- a/src/devices/bus/vip/vp700.cpp +++ b/src/devices/bus/vip/vp700.cpp @@ -67,7 +67,7 @@ void vp700_device::device_start() // vip_program_r - program read //------------------------------------------------- -uint8_t vp700_device::vip_program_r(address_space &space, offs_t offset, int cs, int cdef, int *minh) +uint8_t vp700_device::vip_program_r(offs_t offset, int cs, int cdef, int *minh) { uint8_t data = 0xff; diff --git a/src/devices/bus/vip/vp700.h b/src/devices/bus/vip/vp700.h index 16e7cd2f78e..4927005742e 100644 --- a/src/devices/bus/vip/vp700.h +++ b/src/devices/bus/vip/vp700.h @@ -37,7 +37,7 @@ protected: virtual void device_start() override; // device_vip_expansion_card_interface overrides - virtual uint8_t vip_program_r(address_space &space, offs_t offset, int cs, int cdef, int *minh) override; + virtual uint8_t vip_program_r(offs_t offset, int cs, int cdef, int *minh) override; private: required_memory_region m_rom; diff --git a/src/devices/video/cdp1862.cpp b/src/devices/video/cdp1862.cpp index 78985db211c..ba4375c54de 100644 --- a/src/devices/video/cdp1862.cpp +++ b/src/devices/video/cdp1862.cpp @@ -126,7 +126,7 @@ void cdp1862_device::device_reset() // dma_w - //------------------------------------------------- -WRITE8_MEMBER( cdp1862_device::dma_w ) +void cdp1862_device::dma_w(uint8_t data) { int rd = 1, bd = 1, gd = 1; int sx = screen().hpos() + 4; diff --git a/src/devices/video/cdp1862.h b/src/devices/video/cdp1862.h index 0ee90fa3bd6..8ab9716642b 100644 --- a/src/devices/video/cdp1862.h +++ b/src/devices/video/cdp1862.h @@ -49,7 +49,7 @@ public: void set_luminance(double r, double b, double g, double bkg) { m_lum_r = r; m_lum_b = b; m_lum_g = g; m_lum_bkg = bkg; } void set_chrominance(double r, double b, double g, double bkg) { m_chr_r = r; m_chr_b = b; m_chr_g = g; m_chr_bkg = bkg; } - DECLARE_WRITE8_MEMBER( dma_w ); + void dma_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER( bkg_w ); DECLARE_WRITE_LINE_MEMBER( con_w ); diff --git a/src/mame/drivers/comx35.cpp b/src/mame/drivers/comx35.cpp index bb6f569991c..bf3ed801e55 100644 --- a/src/mame/drivers/comx35.cpp +++ b/src/mame/drivers/comx35.cpp @@ -209,7 +209,7 @@ READ8_MEMBER( comx35_state::mem_r ) { int extrom = 1; - uint8_t data = m_exp->mrd_r(space, offset, &extrom); + uint8_t data = m_exp->mrd_r(offset, &extrom); if (offset < 0x4000) { @@ -234,7 +234,7 @@ READ8_MEMBER( comx35_state::mem_r ) WRITE8_MEMBER( comx35_state::mem_w ) { - m_exp->mwr_w(space, offset, data); + m_exp->mwr_w(offset, data); if (offset >= 0x4000 && offset < 0xc000) { @@ -257,7 +257,7 @@ WRITE8_MEMBER( comx35_state::mem_w ) READ8_MEMBER( comx35_state::io_r ) { - uint8_t data = m_exp->io_r(space, offset); + uint8_t data = m_exp->io_r(offset); if (offset == 3) { @@ -274,7 +274,7 @@ READ8_MEMBER( comx35_state::io_r ) WRITE8_MEMBER( comx35_state::io_w ) { - m_exp->io_w(space, offset, data); + m_exp->io_w(offset, data); if (offset >= 3) { diff --git a/src/mame/drivers/vip.cpp b/src/mame/drivers/vip.cpp index d1c2faf50c9..bd77b9031fb 100644 --- a/src/mame/drivers/vip.cpp +++ b/src/mame/drivers/vip.cpp @@ -270,7 +270,7 @@ READ8_MEMBER(vip_state::read) int cdef = !((offset >= 0xc00) && (offset < 0x1000)); int minh = 0; - uint8_t data = m_exp->program_r(space, offset, cs, cdef, &minh); + uint8_t data = m_exp->program_r(offset, cs, cdef, &minh); if (cs) { @@ -295,7 +295,7 @@ WRITE8_MEMBER(vip_state::write) int cdef = !((offset >= 0xc00) && (offset < 0x1000)); int minh = 0; - m_exp->program_w(space, offset, data, cdef, &minh); + m_exp->program_w(offset, data, cdef, &minh); if (!cs && !minh) { @@ -310,7 +310,7 @@ WRITE8_MEMBER(vip_state::write) READ8_MEMBER(vip_state::io_r) { - uint8_t data = m_exp->io_r(space, offset); + uint8_t data = m_exp->io_r(offset); switch (offset) { @@ -339,7 +339,7 @@ READ8_MEMBER(vip_state::io_r) WRITE8_MEMBER(vip_state::io_w) { - m_exp->io_w(space, offset, data); + m_exp->io_w(offset, data); switch (offset) { -- cgit v1.2.3