From ea78bea4ee84ab0bc5aab964920c5be4d4163f8a Mon Sep 17 00:00:00 2001 From: AJR Date: Mon, 25 Feb 2019 01:04:05 -0500 Subject: bus/wangpc, upd7220: Eliminate address_space arguments from handlers (nw) --- src/devices/bus/compis/hrg.cpp | 4 ++-- src/devices/bus/isa/num9rev.cpp | 2 +- src/devices/bus/wangpc/emb.cpp | 8 ++++---- src/devices/bus/wangpc/emb.h | 8 ++++---- src/devices/bus/wangpc/lic.cpp | 8 ++++---- src/devices/bus/wangpc/lic.h | 8 ++++---- src/devices/bus/wangpc/lvc.cpp | 8 ++++---- src/devices/bus/wangpc/lvc.h | 8 ++++---- src/devices/bus/wangpc/mcc.cpp | 12 ++++++------ src/devices/bus/wangpc/mcc.h | 4 ++-- src/devices/bus/wangpc/mvc.cpp | 8 ++++---- src/devices/bus/wangpc/mvc.h | 8 ++++---- src/devices/bus/wangpc/rtc.cpp | 8 ++++---- src/devices/bus/wangpc/rtc.h | 8 ++++---- src/devices/bus/wangpc/tig.cpp | 24 +++++++++++------------ src/devices/bus/wangpc/tig.h | 8 ++++---- src/devices/bus/wangpc/wangpc.cpp | 24 +++++++++++------------ src/devices/bus/wangpc/wangpc.h | 40 +++++++++++++++++++-------------------- src/devices/bus/wangpc/wdc.cpp | 28 +++++++++++++-------------- src/devices/bus/wangpc/wdc.h | 12 ++++++------ src/devices/video/upd7220.cpp | 8 ++++---- src/devices/video/upd7220.h | 8 ++++---- src/mame/drivers/apc.cpp | 8 ++++---- src/mame/drivers/mikromik.cpp | 4 ++-- src/mame/drivers/rainbow.cpp | 7 ++----- src/mame/drivers/wangpc.cpp | 4 ++-- src/mame/video/pc9801.cpp | 4 ++-- 27 files changed, 139 insertions(+), 142 deletions(-) diff --git a/src/devices/bus/compis/hrg.cpp b/src/devices/bus/compis/hrg.cpp index 3c1a5fe53be..7aa8aa72f7e 100644 --- a/src/devices/bus/compis/hrg.cpp +++ b/src/devices/bus/compis/hrg.cpp @@ -170,7 +170,7 @@ uint8_t compis_hrg_device::pcs6_6_r(offs_t offset) uint8_t data = 0xff; if (offset < 2) - data = m_crtc->read(machine().dummy_space(), offset & 0x01); + data = m_crtc->read(offset & 0x01); else // monochrome only, hblank? vblank? if(offset == 2) @@ -207,5 +207,5 @@ void compis_hrg_device::pcs6_6_w(offs_t offset, uint8_t data) //logerror("%s PCS 6:6 write %04x : %02x\n", machine().describe_context(), offset, data); // 0x336 is likely the color plane register - if (offset < 2) m_crtc->write(machine().dummy_space(), offset & 0x01, data); + if (offset < 2) m_crtc->write(offset & 0x01, data); } diff --git a/src/devices/bus/isa/num9rev.cpp b/src/devices/bus/isa/num9rev.cpp index 16aab8762fe..ebe44a379f4 100644 --- a/src/devices/bus/isa/num9rev.cpp +++ b/src/devices/bus/isa/num9rev.cpp @@ -94,7 +94,7 @@ void isa8_number_9_rev_device::device_start() { set_isa_device(); - m_isa->install_memory(0xc0000, 0xc0001, read8_delegate(FUNC(upd7220_device::read), (upd7220_device *)m_upd7220), write8_delegate(FUNC(upd7220_device::write), (upd7220_device *)m_upd7220)); + m_isa->install_memory(0xc0000, 0xc0001, read8sm_delegate(FUNC(upd7220_device::read), (upd7220_device *)m_upd7220), write8sm_delegate(FUNC(upd7220_device::write), (upd7220_device *)m_upd7220)); m_isa->install_memory(0xc0100, 0xc03ff, read8_delegate(FUNC(isa8_number_9_rev_device::pal8_r), this), write8_delegate(FUNC(isa8_number_9_rev_device::pal8_w), this)); m_isa->install_memory(0xc0400, 0xc0401, read8_delegate(FUNC(isa8_number_9_rev_device::bank_r), this), write8_delegate(FUNC(isa8_number_9_rev_device::bank_w), this)); m_isa->install_memory(0xc0500, 0xc06ff, read8_delegate(FUNC(isa8_number_9_rev_device::overlay_r), this), write8_delegate(FUNC(isa8_number_9_rev_device::overlay_w), this)); diff --git a/src/devices/bus/wangpc/emb.cpp b/src/devices/bus/wangpc/emb.cpp index 8f555391bea..8a1817d1666 100644 --- a/src/devices/bus/wangpc/emb.cpp +++ b/src/devices/bus/wangpc/emb.cpp @@ -85,7 +85,7 @@ void wangpc_emb_device::device_reset() // wangpcbus_mrdc_r - memory read //------------------------------------------------- -uint16_t wangpc_emb_device::wangpcbus_mrdc_r(address_space &space, offs_t offset, uint16_t mem_mask) +uint16_t wangpc_emb_device::wangpcbus_mrdc_r(offs_t offset, uint16_t mem_mask) { uint16_t data = 0xffff; @@ -105,7 +105,7 @@ uint16_t wangpc_emb_device::wangpcbus_mrdc_r(address_space &space, offs_t offset // wangpcbus_amwc_w - memory write //------------------------------------------------- -void wangpc_emb_device::wangpcbus_amwc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data) +void wangpc_emb_device::wangpcbus_amwc_w(offs_t offset, uint16_t mem_mask, uint16_t data) { for (int bank = 0; bank < 4; bank++) { @@ -121,7 +121,7 @@ void wangpc_emb_device::wangpcbus_amwc_w(address_space &space, offs_t offset, ui // wangpcbus_iorc_r - I/O read //------------------------------------------------- -uint16_t wangpc_emb_device::wangpcbus_iorc_r(address_space &space, offs_t offset, uint16_t mem_mask) +uint16_t wangpc_emb_device::wangpcbus_iorc_r(offs_t offset, uint16_t mem_mask) { uint16_t data = 0xffff; @@ -149,7 +149,7 @@ uint16_t wangpc_emb_device::wangpcbus_iorc_r(address_space &space, offs_t offset // wangpcbus_aiowc_w - I/O write //------------------------------------------------- -void wangpc_emb_device::wangpcbus_aiowc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data) +void wangpc_emb_device::wangpcbus_aiowc_w(offs_t offset, uint16_t mem_mask, uint16_t data) { if (sad(offset)) { diff --git a/src/devices/bus/wangpc/emb.h b/src/devices/bus/wangpc/emb.h index bdaa7698b51..1e175ae6867 100644 --- a/src/devices/bus/wangpc/emb.h +++ b/src/devices/bus/wangpc/emb.h @@ -34,10 +34,10 @@ protected: virtual void device_reset() override; // device_wangpcbus_card_interface overrides - virtual uint16_t wangpcbus_mrdc_r(address_space &space, offs_t offset, uint16_t mem_mask) override; - virtual void wangpcbus_amwc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data) override; - virtual uint16_t wangpcbus_iorc_r(address_space &space, offs_t offset, uint16_t mem_mask) override; - virtual void wangpcbus_aiowc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data) override; + virtual uint16_t wangpcbus_mrdc_r(offs_t offset, uint16_t mem_mask) override; + virtual void wangpcbus_amwc_w(offs_t offset, uint16_t mem_mask, uint16_t data) override; + virtual uint16_t wangpcbus_iorc_r(offs_t offset, uint16_t mem_mask) override; + virtual void wangpcbus_aiowc_w(offs_t offset, uint16_t mem_mask, uint16_t data) override; private: optional_shared_ptr m_ram; diff --git a/src/devices/bus/wangpc/lic.cpp b/src/devices/bus/wangpc/lic.cpp index aa158b4bf72..f56c673fd26 100644 --- a/src/devices/bus/wangpc/lic.cpp +++ b/src/devices/bus/wangpc/lic.cpp @@ -92,7 +92,7 @@ void wangpc_lic_device::device_reset() // wangpcbus_mrdc_r - memory read //------------------------------------------------- -uint16_t wangpc_lic_device::wangpcbus_mrdc_r(address_space &space, offs_t offset, uint16_t mem_mask) +uint16_t wangpc_lic_device::wangpcbus_mrdc_r(offs_t offset, uint16_t mem_mask) { uint16_t data = 0xffff; @@ -104,7 +104,7 @@ uint16_t wangpc_lic_device::wangpcbus_mrdc_r(address_space &space, offs_t offset // wangpcbus_amwc_w - memory write //------------------------------------------------- -void wangpc_lic_device::wangpcbus_amwc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data) +void wangpc_lic_device::wangpcbus_amwc_w(offs_t offset, uint16_t mem_mask, uint16_t data) { } @@ -113,7 +113,7 @@ void wangpc_lic_device::wangpcbus_amwc_w(address_space &space, offs_t offset, ui // wangpcbus_iorc_r - I/O read //------------------------------------------------- -uint16_t wangpc_lic_device::wangpcbus_iorc_r(address_space &space, offs_t offset, uint16_t mem_mask) +uint16_t wangpc_lic_device::wangpcbus_iorc_r(offs_t offset, uint16_t mem_mask) { uint16_t data = 0xffff; @@ -135,7 +135,7 @@ uint16_t wangpc_lic_device::wangpcbus_iorc_r(address_space &space, offs_t offset // wangpcbus_aiowc_w - I/O write //------------------------------------------------- -void wangpc_lic_device::wangpcbus_aiowc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data) +void wangpc_lic_device::wangpcbus_aiowc_w(offs_t offset, uint16_t mem_mask, uint16_t data) { if (sad(offset)) { diff --git a/src/devices/bus/wangpc/lic.h b/src/devices/bus/wangpc/lic.h index f3a27f0bc77..8ead2c65f0a 100644 --- a/src/devices/bus/wangpc/lic.h +++ b/src/devices/bus/wangpc/lic.h @@ -36,10 +36,10 @@ protected: virtual void device_add_mconfig(machine_config &config) override; // device_wangpcbus_card_interface overrides - virtual uint16_t wangpcbus_mrdc_r(address_space &space, offs_t offset, uint16_t mem_mask) override; - virtual void wangpcbus_amwc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data) override; - virtual uint16_t wangpcbus_iorc_r(address_space &space, offs_t offset, uint16_t mem_mask) override; - virtual void wangpcbus_aiowc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data) override; + virtual uint16_t wangpcbus_mrdc_r(offs_t offset, uint16_t mem_mask) override; + virtual void wangpcbus_amwc_w(offs_t offset, uint16_t mem_mask, uint16_t data) override; + virtual uint16_t wangpcbus_iorc_r(offs_t offset, uint16_t mem_mask) override; + virtual void wangpcbus_aiowc_w(offs_t offset, uint16_t mem_mask, uint16_t data) override; }; diff --git a/src/devices/bus/wangpc/lvc.cpp b/src/devices/bus/wangpc/lvc.cpp index 7e7cbe47ad5..60ec03e5674 100644 --- a/src/devices/bus/wangpc/lvc.cpp +++ b/src/devices/bus/wangpc/lvc.cpp @@ -203,7 +203,7 @@ void wangpc_lvc_device::device_reset() // wangpcbus_mrdc_r - memory read //------------------------------------------------- -uint16_t wangpc_lvc_device::wangpcbus_mrdc_r(address_space &space, offs_t offset, uint16_t mem_mask) +uint16_t wangpc_lvc_device::wangpcbus_mrdc_r(offs_t offset, uint16_t mem_mask) { uint16_t data = 0xffff; @@ -222,7 +222,7 @@ uint16_t wangpc_lvc_device::wangpcbus_mrdc_r(address_space &space, offs_t offset // wangpcbus_amwc_w - memory write //------------------------------------------------- -void wangpc_lvc_device::wangpcbus_amwc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data) +void wangpc_lvc_device::wangpcbus_amwc_w(offs_t offset, uint16_t mem_mask, uint16_t data) { if (OPTION_VRAM && (offset >= 0xe0000/2) && (offset < 0xf0000/2)) { @@ -237,7 +237,7 @@ void wangpc_lvc_device::wangpcbus_amwc_w(address_space &space, offs_t offset, ui // wangpcbus_iorc_r - I/O read //------------------------------------------------- -uint16_t wangpc_lvc_device::wangpcbus_iorc_r(address_space &space, offs_t offset, uint16_t mem_mask) +uint16_t wangpc_lvc_device::wangpcbus_iorc_r(offs_t offset, uint16_t mem_mask) { uint16_t data = 0xffff; @@ -270,7 +270,7 @@ uint16_t wangpc_lvc_device::wangpcbus_iorc_r(address_space &space, offs_t offset // wangpcbus_aiowc_w - I/O write //------------------------------------------------- -void wangpc_lvc_device::wangpcbus_aiowc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data) +void wangpc_lvc_device::wangpcbus_aiowc_w(offs_t offset, uint16_t mem_mask, uint16_t data) { if (sad(offset)) { diff --git a/src/devices/bus/wangpc/lvc.h b/src/devices/bus/wangpc/lvc.h index 7b4f9203007..3fa858adf1c 100644 --- a/src/devices/bus/wangpc/lvc.h +++ b/src/devices/bus/wangpc/lvc.h @@ -36,10 +36,10 @@ protected: virtual void device_add_mconfig(machine_config &config) override; // device_wangpcbus_card_interface overrides - virtual uint16_t wangpcbus_mrdc_r(address_space &space, offs_t offset, uint16_t mem_mask) override; - virtual void wangpcbus_amwc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data) override; - virtual uint16_t wangpcbus_iorc_r(address_space &space, offs_t offset, uint16_t mem_mask) override; - virtual void wangpcbus_aiowc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data) override; + virtual uint16_t wangpcbus_mrdc_r(offs_t offset, uint16_t mem_mask) override; + virtual void wangpcbus_amwc_w(offs_t offset, uint16_t mem_mask, uint16_t data) override; + virtual uint16_t wangpcbus_iorc_r(offs_t offset, uint16_t mem_mask) override; + virtual void wangpcbus_aiowc_w(offs_t offset, uint16_t mem_mask, uint16_t data) override; private: MC6845_UPDATE_ROW( crtc_update_row ); diff --git a/src/devices/bus/wangpc/mcc.cpp b/src/devices/bus/wangpc/mcc.cpp index d5c8bf4b941..5f483cee5fd 100644 --- a/src/devices/bus/wangpc/mcc.cpp +++ b/src/devices/bus/wangpc/mcc.cpp @@ -129,7 +129,7 @@ void wangpc_mcc_device::device_reset() // wangpcbus_iorc_r - I/O read //------------------------------------------------- -uint16_t wangpc_mcc_device::wangpcbus_iorc_r(address_space &space, offs_t offset, uint16_t mem_mask) +uint16_t wangpc_mcc_device::wangpcbus_iorc_r(offs_t offset, uint16_t mem_mask) { uint16_t data = 0xffff; @@ -143,7 +143,7 @@ uint16_t wangpc_mcc_device::wangpcbus_iorc_r(address_space &space, offs_t offset case 0x06/2: if (ACCESSING_BITS_0_7) { - data = 0xff00 | m_sio->cd_ba_r(space, offset >> 1); + data = 0xff00 | m_sio->cd_ba_r(machine().dummy_space(), offset >> 1); } break; @@ -153,7 +153,7 @@ uint16_t wangpc_mcc_device::wangpcbus_iorc_r(address_space &space, offs_t offset case 0x0e/2: if (ACCESSING_BITS_0_7) { - data = 0xff00 | m_dart->cd_ba_r(space, offset >> 1); + data = 0xff00 | m_dart->cd_ba_r(machine().dummy_space(), offset >> 1); } break; @@ -198,7 +198,7 @@ uint16_t wangpc_mcc_device::wangpcbus_iorc_r(address_space &space, offs_t offset // wangpcbus_aiowc_w - I/O write //------------------------------------------------- -void wangpc_mcc_device::wangpcbus_aiowc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data) +void wangpc_mcc_device::wangpcbus_aiowc_w(offs_t offset, uint16_t mem_mask, uint16_t data) { if (sad(offset) && ACCESSING_BITS_0_7) { @@ -208,14 +208,14 @@ void wangpc_mcc_device::wangpcbus_aiowc_w(address_space &space, offs_t offset, u case 0x02/2: case 0x04/2: case 0x06/2: - m_sio->cd_ba_w(space, offset >> 1, data & 0xff); + m_sio->cd_ba_w(machine().dummy_space(), offset >> 1, data & 0xff); break; case 0x08/2: case 0x0a/2: case 0x0c/2: case 0x0e/2: - m_dart->cd_ba_w(space, offset >> 1, data & 0xff); + m_dart->cd_ba_w(machine().dummy_space(), offset >> 1, data & 0xff); break; case 0x12/2: diff --git a/src/devices/bus/wangpc/mcc.h b/src/devices/bus/wangpc/mcc.h index d09f2e23cba..58b8931f5fa 100644 --- a/src/devices/bus/wangpc/mcc.h +++ b/src/devices/bus/wangpc/mcc.h @@ -36,8 +36,8 @@ protected: virtual void device_add_mconfig(machine_config &config) override; // device_wangpcbus_card_interface overrides - virtual uint16_t wangpcbus_iorc_r(address_space &space, offs_t offset, uint16_t mem_mask) override; - virtual void wangpcbus_aiowc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data) override; + virtual uint16_t wangpcbus_iorc_r(offs_t offset, uint16_t mem_mask) override; + virtual void wangpcbus_aiowc_w(offs_t offset, uint16_t mem_mask, uint16_t data) override; private: inline void set_irq(int state); diff --git a/src/devices/bus/wangpc/mvc.cpp b/src/devices/bus/wangpc/mvc.cpp index f88970491a7..fbe4db1fe4a 100644 --- a/src/devices/bus/wangpc/mvc.cpp +++ b/src/devices/bus/wangpc/mvc.cpp @@ -226,7 +226,7 @@ void wangpc_mvc_device::device_reset() // wangpcbus_mrdc_r - memory read //------------------------------------------------- -uint16_t wangpc_mvc_device::wangpcbus_mrdc_r(address_space &space, offs_t offset, uint16_t mem_mask) +uint16_t wangpc_mvc_device::wangpcbus_mrdc_r(offs_t offset, uint16_t mem_mask) { uint16_t data = 0xffff; @@ -254,7 +254,7 @@ uint16_t wangpc_mvc_device::wangpcbus_mrdc_r(address_space &space, offs_t offset // wangpcbus_amwc_w - memory write //------------------------------------------------- -void wangpc_mvc_device::wangpcbus_amwc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data) +void wangpc_mvc_device::wangpcbus_amwc_w(offs_t offset, uint16_t mem_mask, uint16_t data) { if (OPTION_VRAM) { @@ -278,7 +278,7 @@ void wangpc_mvc_device::wangpcbus_amwc_w(address_space &space, offs_t offset, ui // wangpcbus_iorc_r - I/O read //------------------------------------------------- -uint16_t wangpc_mvc_device::wangpcbus_iorc_r(address_space &space, offs_t offset, uint16_t mem_mask) +uint16_t wangpc_mvc_device::wangpcbus_iorc_r(offs_t offset, uint16_t mem_mask) { uint16_t data = 0xffff; @@ -302,7 +302,7 @@ uint16_t wangpc_mvc_device::wangpcbus_iorc_r(address_space &space, offs_t offset // wangpcbus_aiowc_w - I/O write //------------------------------------------------- -void wangpc_mvc_device::wangpcbus_aiowc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data) +void wangpc_mvc_device::wangpcbus_aiowc_w(offs_t offset, uint16_t mem_mask, uint16_t data) { if (sad(offset) && ACCESSING_BITS_0_7) { diff --git a/src/devices/bus/wangpc/mvc.h b/src/devices/bus/wangpc/mvc.h index 4620126c04e..aee0cdf51b2 100644 --- a/src/devices/bus/wangpc/mvc.h +++ b/src/devices/bus/wangpc/mvc.h @@ -36,10 +36,10 @@ protected: virtual void device_add_mconfig(machine_config &config) override; // device_wangpcbus_card_interface overrides - virtual uint16_t wangpcbus_mrdc_r(address_space &space, offs_t offset, uint16_t mem_mask) override; - virtual void wangpcbus_amwc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data) override; - virtual uint16_t wangpcbus_iorc_r(address_space &space, offs_t offset, uint16_t mem_mask) override; - virtual void wangpcbus_aiowc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data) override; + virtual uint16_t wangpcbus_mrdc_r(offs_t offset, uint16_t mem_mask) override; + virtual void wangpcbus_amwc_w(offs_t offset, uint16_t mem_mask, uint16_t data) override; + virtual uint16_t wangpcbus_iorc_r(offs_t offset, uint16_t mem_mask) override; + virtual void wangpcbus_aiowc_w(offs_t offset, uint16_t mem_mask, uint16_t data) override; private: MC6845_UPDATE_ROW( crtc_update_row ); diff --git a/src/devices/bus/wangpc/rtc.cpp b/src/devices/bus/wangpc/rtc.cpp index bdf392f9bed..4512939003f 100644 --- a/src/devices/bus/wangpc/rtc.cpp +++ b/src/devices/bus/wangpc/rtc.cpp @@ -214,7 +214,7 @@ void wangpc_rtc_device::device_reset() // wangpcbus_mrdc_r - memory read //------------------------------------------------- -uint16_t wangpc_rtc_device::wangpcbus_mrdc_r(address_space &space, offs_t offset, uint16_t mem_mask) +uint16_t wangpc_rtc_device::wangpcbus_mrdc_r(offs_t offset, uint16_t mem_mask) { uint16_t data = 0xffff; @@ -226,7 +226,7 @@ uint16_t wangpc_rtc_device::wangpcbus_mrdc_r(address_space &space, offs_t offset // wangpcbus_amwc_w - memory write //------------------------------------------------- -void wangpc_rtc_device::wangpcbus_amwc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data) +void wangpc_rtc_device::wangpcbus_amwc_w(offs_t offset, uint16_t mem_mask, uint16_t data) { } @@ -235,7 +235,7 @@ void wangpc_rtc_device::wangpcbus_amwc_w(address_space &space, offs_t offset, ui // wangpcbus_iorc_r - I/O read //------------------------------------------------- -uint16_t wangpc_rtc_device::wangpcbus_iorc_r(address_space &space, offs_t offset, uint16_t mem_mask) +uint16_t wangpc_rtc_device::wangpcbus_iorc_r(offs_t offset, uint16_t mem_mask) { uint16_t data = 0xffff; @@ -257,7 +257,7 @@ uint16_t wangpc_rtc_device::wangpcbus_iorc_r(address_space &space, offs_t offset // wangpcbus_aiowc_w - I/O write //------------------------------------------------- -void wangpc_rtc_device::wangpcbus_aiowc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data) +void wangpc_rtc_device::wangpcbus_aiowc_w(offs_t offset, uint16_t mem_mask, uint16_t data) { if (sad(offset)) { diff --git a/src/devices/bus/wangpc/rtc.h b/src/devices/bus/wangpc/rtc.h index 4f0b22372f2..9233222a4f9 100644 --- a/src/devices/bus/wangpc/rtc.h +++ b/src/devices/bus/wangpc/rtc.h @@ -41,10 +41,10 @@ protected: virtual ioport_constructor device_input_ports() const override; // device_wangpcbus_card_interface overrides - virtual uint16_t wangpcbus_mrdc_r(address_space &space, offs_t offset, uint16_t mem_mask) override; - virtual void wangpcbus_amwc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data) override; - virtual uint16_t wangpcbus_iorc_r(address_space &space, offs_t offset, uint16_t mem_mask) override; - virtual void wangpcbus_aiowc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data) override; + virtual uint16_t wangpcbus_mrdc_r(offs_t offset, uint16_t mem_mask) override; + virtual void wangpcbus_amwc_w(offs_t offset, uint16_t mem_mask, uint16_t data) override; + virtual uint16_t wangpcbus_iorc_r(offs_t offset, uint16_t mem_mask) override; + virtual void wangpcbus_aiowc_w(offs_t offset, uint16_t mem_mask, uint16_t data) override; private: required_device m_maincpu; diff --git a/src/devices/bus/wangpc/tig.cpp b/src/devices/bus/wangpc/tig.cpp index 4d3827ad21a..fa18e4189ce 100644 --- a/src/devices/bus/wangpc/tig.cpp +++ b/src/devices/bus/wangpc/tig.cpp @@ -196,7 +196,7 @@ uint32_t wangpc_tig_device::screen_update(screen_device &screen, bitmap_rgb32 &b // wangpcbus_iorc_r - I/O read //------------------------------------------------- -uint16_t wangpc_tig_device::wangpcbus_iorc_r(address_space &space, offs_t offset, uint16_t mem_mask) +uint16_t wangpc_tig_device::wangpcbus_iorc_r(offs_t offset, uint16_t mem_mask) { uint16_t data = 0xffff; @@ -206,12 +206,12 @@ uint16_t wangpc_tig_device::wangpcbus_iorc_r(address_space &space, offs_t offset { case 0x20/2: case 0x22/2: - data = m_hgdc0->read(space, offset); + data = m_hgdc0->read(offset); break; case 0x24/2: case 0x26/2: - data = m_hgdc1->read(space, offset); + data = m_hgdc1->read(offset); break; case 0xfe/2: @@ -228,7 +228,7 @@ uint16_t wangpc_tig_device::wangpcbus_iorc_r(address_space &space, offs_t offset // wangpcbus_aiowc_w - I/O write //------------------------------------------------- -void wangpc_tig_device::wangpcbus_aiowc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data) +void wangpc_tig_device::wangpcbus_aiowc_w(offs_t offset, uint16_t mem_mask, uint16_t data) { if (sad(offset) && ACCESSING_BITS_0_7) { @@ -243,12 +243,12 @@ void wangpc_tig_device::wangpcbus_aiowc_w(address_space &space, offs_t offset, u case 0x20/2: case 0x22/2: - m_hgdc0->write(space, offset, data); + m_hgdc0->write(offset, data); break; case 0x24/2: case 0x26/2: - m_hgdc1->write(space, offset, data); + m_hgdc1->write(offset, data); break; case 0x28/2: @@ -275,17 +275,17 @@ void wangpc_tig_device::wangpcbus_aiowc_w(address_space &space, offs_t offset, u // wangpcbus_dack_r - DMA read //------------------------------------------------- -uint8_t wangpc_tig_device::wangpcbus_dack_r(address_space &space, int line) +uint8_t wangpc_tig_device::wangpcbus_dack_r(int line) { uint8_t data; if (DMA_GRAPHICS) { - data = m_hgdc1->dack_r(space, 0); + data = m_hgdc1->dack_r(); } else { - data = m_hgdc0->dack_r(space, 0); + data = m_hgdc0->dack_r(); } return data; @@ -296,15 +296,15 @@ uint8_t wangpc_tig_device::wangpcbus_dack_r(address_space &space, int line) // wangpcbus_dack_w - DMA write //------------------------------------------------- -void wangpc_tig_device::wangpcbus_dack_w(address_space &space, int line, uint8_t data) +void wangpc_tig_device::wangpcbus_dack_w(int line, uint8_t data) { if (DMA_GRAPHICS) { - m_hgdc1->dack_w(space, 0, data); + m_hgdc1->dack_w(data); } else { - m_hgdc0->dack_w(space, 0, data); + m_hgdc0->dack_w(data); } } diff --git a/src/devices/bus/wangpc/tig.h b/src/devices/bus/wangpc/tig.h index 4a86f6ecb40..0e95eb42676 100644 --- a/src/devices/bus/wangpc/tig.h +++ b/src/devices/bus/wangpc/tig.h @@ -38,10 +38,10 @@ protected: virtual void device_add_mconfig(machine_config &config) override; // device_wangpcbus_card_interface overrides - virtual uint16_t wangpcbus_iorc_r(address_space &space, offs_t offset, uint16_t mem_mask) override; - virtual void wangpcbus_aiowc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data) override; - virtual uint8_t wangpcbus_dack_r(address_space &space, int line) override; - virtual void wangpcbus_dack_w(address_space &space, int line, uint8_t data) override; + virtual uint16_t wangpcbus_iorc_r(offs_t offset, uint16_t mem_mask) override; + virtual void wangpcbus_aiowc_w(offs_t offset, uint16_t mem_mask, uint16_t data) override; + virtual uint8_t wangpcbus_dack_r(int line) override; + virtual void wangpcbus_dack_w(int line, uint8_t data) override; virtual bool wangpcbus_have_dack(int line) override; private: diff --git a/src/devices/bus/wangpc/wangpc.cpp b/src/devices/bus/wangpc/wangpc.cpp index 36ed25bfdff..540ed94c1b3 100644 --- a/src/devices/bus/wangpc/wangpc.cpp +++ b/src/devices/bus/wangpc/wangpc.cpp @@ -104,7 +104,7 @@ void wangpcbus_device::add_card(device_wangpcbus_card_interface *card, int sid) // mrdc_r - memory read //------------------------------------------------- -READ16_MEMBER( wangpcbus_device::mrdc_r ) +uint16_t wangpcbus_device::mrdc_r(offs_t offset, uint16_t mem_mask) { uint16_t data = 0xffff; @@ -112,7 +112,7 @@ READ16_MEMBER( wangpcbus_device::mrdc_r ) while (entry) { - data &= entry->wangpcbus_mrdc_r(space, offset + 0x40000/2, mem_mask); + data &= entry->wangpcbus_mrdc_r(offset + 0x40000/2, mem_mask); entry = entry->next(); } @@ -124,13 +124,13 @@ READ16_MEMBER( wangpcbus_device::mrdc_r ) // amwc_w - memory write //------------------------------------------------- -WRITE16_MEMBER( wangpcbus_device::amwc_w ) +void wangpcbus_device::amwc_w(offs_t offset, uint16_t data, uint16_t mem_mask) { device_wangpcbus_card_interface *entry = m_device_list.first(); while (entry) { - entry->wangpcbus_amwc_w(space, offset + 0x40000/2, mem_mask, data); + entry->wangpcbus_amwc_w(offset + 0x40000/2, mem_mask, data); entry = entry->next(); } } @@ -140,7 +140,7 @@ WRITE16_MEMBER( wangpcbus_device::amwc_w ) // sad_r - I/O read //------------------------------------------------- -READ16_MEMBER( wangpcbus_device::sad_r ) +uint16_t wangpcbus_device::sad_r(offs_t offset, uint16_t mem_mask) { uint16_t data = 0xffff; @@ -148,7 +148,7 @@ READ16_MEMBER( wangpcbus_device::sad_r ) while (entry) { - data &= entry->wangpcbus_iorc_r(space, offset + 0x1100/2, mem_mask); + data &= entry->wangpcbus_iorc_r(offset + 0x1100/2, mem_mask); entry = entry->next(); } @@ -160,13 +160,13 @@ READ16_MEMBER( wangpcbus_device::sad_r ) // sad_w - I/O write //------------------------------------------------- -WRITE16_MEMBER( wangpcbus_device::sad_w ) +void wangpcbus_device::sad_w(offs_t offset, uint16_t data, uint16_t mem_mask) { device_wangpcbus_card_interface *entry = m_device_list.first(); while (entry) { - entry->wangpcbus_aiowc_w(space, offset + 0x1100/2, mem_mask, data); + entry->wangpcbus_aiowc_w(offset + 0x1100/2, mem_mask, data); entry = entry->next(); } } @@ -176,7 +176,7 @@ WRITE16_MEMBER( wangpcbus_device::sad_w ) // dack_r - DMA read //------------------------------------------------- -uint8_t wangpcbus_device::dack_r(address_space &space, int line) +uint8_t wangpcbus_device::dack_r(int line) { uint8_t retVal = 0xff; device_wangpcbus_card_interface *entry = m_device_list.first(); @@ -185,7 +185,7 @@ uint8_t wangpcbus_device::dack_r(address_space &space, int line) { if (entry->wangpcbus_have_dack(line)) { - retVal = entry->wangpcbus_dack_r(space, line); + retVal = entry->wangpcbus_dack_r(line); break; } @@ -200,7 +200,7 @@ uint8_t wangpcbus_device::dack_r(address_space &space, int line) // dack_w - DMA write //------------------------------------------------- -void wangpcbus_device::dack_w(address_space &space, int line, uint8_t data) +void wangpcbus_device::dack_w(int line, uint8_t data) { device_wangpcbus_card_interface *entry = m_device_list.first(); @@ -208,7 +208,7 @@ void wangpcbus_device::dack_w(address_space &space, int line, uint8_t data) { if (entry->wangpcbus_have_dack(line)) { - entry->wangpcbus_dack_w(space, line, data); + entry->wangpcbus_dack_w(line, data); } entry = entry->next(); diff --git a/src/devices/bus/wangpc/wangpc.h b/src/devices/bus/wangpc/wangpc.h index 2b3a7860fc1..bb8c7a3c4ac 100644 --- a/src/devices/bus/wangpc/wangpc.h +++ b/src/devices/bus/wangpc/wangpc.h @@ -92,23 +92,23 @@ public: void add_card(device_wangpcbus_card_interface *card, int sid); // computer interface - DECLARE_READ16_MEMBER( mrdc_r ); - DECLARE_WRITE16_MEMBER( amwc_w ); + uint16_t mrdc_r(offs_t offset, uint16_t mem_mask = 0xffff); + void amwc_w(offs_t offset, uint16_t data, uint16_t mem_mask = 0xffff); - DECLARE_READ16_MEMBER( sad_r ); - DECLARE_WRITE16_MEMBER( sad_w ); + uint16_t sad_r(offs_t offset, uint16_t mem_mask = 0xffff); + void sad_w(offs_t offset, uint16_t data, uint16_t mem_mask = 0xffff); - uint8_t dack_r(address_space &space, int line); - void dack_w(address_space &space, int line, uint8_t data); + uint8_t dack_r(int line); + void dack_w(int line, uint8_t data); - DECLARE_READ8_MEMBER( dack0_r ) { return dack_r(space, 0); } - DECLARE_WRITE8_MEMBER( dack0_w ) { dack_w(space, 0, data); } - DECLARE_READ8_MEMBER( dack1_r ) { return dack_r(space, 1); } - DECLARE_WRITE8_MEMBER( dack1_w ) { dack_w(space, 1, data); } - DECLARE_READ8_MEMBER( dack2_r ) { return dack_r(space, 2); } - DECLARE_WRITE8_MEMBER( dack2_w ) { dack_w(space, 2, data); } - DECLARE_READ8_MEMBER( dack3_r ) { return dack_r(space, 3); } - DECLARE_WRITE8_MEMBER( dack3_w ) { dack_w(space, 3, data); } + uint8_t dack0_r() { return dack_r(0); } + void dack0_w(uint8_t data) { dack_w(0, data); } + uint8_t dack1_r() { return dack_r(1); } + void dack1_w(uint8_t data) { dack_w(1, data); } + uint8_t dack2_r() { return dack_r(2); } + void dack2_w(uint8_t data) { dack_w(2, data); } + uint8_t dack3_r() { return dack_r(3); } + void dack3_w(uint8_t data) { dack_w(3, data); } DECLARE_WRITE_LINE_MEMBER( tc_w ); @@ -160,17 +160,17 @@ public: device_wangpcbus_card_interface *next() const { return m_next; } // memory access - virtual uint16_t wangpcbus_mrdc_r(address_space &space, offs_t offset, uint16_t mem_mask) { return 0; } - virtual void wangpcbus_amwc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data) { } + virtual uint16_t wangpcbus_mrdc_r(offs_t offset, uint16_t mem_mask) { return 0; } + virtual void wangpcbus_amwc_w(offs_t offset, uint16_t mem_mask, uint16_t data) { } // I/O access - virtual uint16_t wangpcbus_iorc_r(address_space &space, offs_t offset, uint16_t mem_mask) { return 0; } - virtual void wangpcbus_aiowc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data) { } + virtual uint16_t wangpcbus_iorc_r(offs_t offset, uint16_t mem_mask) { return 0; } + virtual void wangpcbus_aiowc_w(offs_t offset, uint16_t mem_mask, uint16_t data) { } bool sad(offs_t offset) const { return (offset & 0xf80) == (0x800 | (m_sid << 7)); } // DMA - virtual uint8_t wangpcbus_dack_r(address_space &space, int line) { return 0; } - virtual void wangpcbus_dack_w(address_space &space, int line, uint8_t data) { } + virtual uint8_t wangpcbus_dack_r(int line) { return 0; } + virtual void wangpcbus_dack_w(int line, uint8_t data) { } virtual void wangpcbus_tc_w(int state) { } virtual bool wangpcbus_have_dack(int line) { return false; } diff --git a/src/devices/bus/wangpc/wdc.cpp b/src/devices/bus/wangpc/wdc.cpp index 6dd36b7d545..0f2598541ce 100644 --- a/src/devices/bus/wangpc/wdc.cpp +++ b/src/devices/bus/wangpc/wdc.cpp @@ -173,7 +173,7 @@ void wangpc_wdc_device::device_reset() // wangpcbus_mrdc_r - memory read //------------------------------------------------- -uint16_t wangpc_wdc_device::wangpcbus_mrdc_r(address_space &space, offs_t offset, uint16_t mem_mask) +uint16_t wangpc_wdc_device::wangpcbus_mrdc_r(offs_t offset, uint16_t mem_mask) { uint16_t data = 0xffff; @@ -185,7 +185,7 @@ uint16_t wangpc_wdc_device::wangpcbus_mrdc_r(address_space &space, offs_t offset // wangpcbus_amwc_w - memory write //------------------------------------------------- -void wangpc_wdc_device::wangpcbus_amwc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data) +void wangpc_wdc_device::wangpcbus_amwc_w(offs_t offset, uint16_t mem_mask, uint16_t data) { } @@ -194,7 +194,7 @@ void wangpc_wdc_device::wangpcbus_amwc_w(address_space &space, offs_t offset, ui // wangpcbus_iorc_r - I/O read //------------------------------------------------- -uint16_t wangpc_wdc_device::wangpcbus_iorc_r(address_space &space, offs_t offset, uint16_t mem_mask) +uint16_t wangpc_wdc_device::wangpcbus_iorc_r(offs_t offset, uint16_t mem_mask) { uint16_t data = 0xffff; @@ -228,7 +228,7 @@ uint16_t wangpc_wdc_device::wangpcbus_iorc_r(address_space &space, offs_t offset // wangpcbus_aiowc_w - I/O write //------------------------------------------------- -void wangpc_wdc_device::wangpcbus_aiowc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data) +void wangpc_wdc_device::wangpcbus_aiowc_w(offs_t offset, uint16_t mem_mask, uint16_t data) { if (sad(offset) && ACCESSING_BITS_0_7) { @@ -263,7 +263,7 @@ void wangpc_wdc_device::wangpcbus_aiowc_w(address_space &space, offs_t offset, u // wangpcbus_dack_r - DMA acknowledge read //------------------------------------------------- -uint8_t wangpc_wdc_device::wangpcbus_dack_r(address_space &space, int line) +uint8_t wangpc_wdc_device::wangpcbus_dack_r(int line) { return 0; } @@ -273,7 +273,7 @@ uint8_t wangpc_wdc_device::wangpcbus_dack_r(address_space &space, int line) // wangpcbus_dack_r - DMA acknowledge write //------------------------------------------------- -void wangpc_wdc_device::wangpcbus_dack_w(address_space &space, int line, uint8_t data) +void wangpc_wdc_device::wangpcbus_dack_w(int line, uint8_t data) { } @@ -325,11 +325,11 @@ WRITE8_MEMBER( wangpc_wdc_device::status_w ) } -READ8_MEMBER( wangpc_wdc_device::ctc_ch0_r ) { return m_ctc->read(space, 0); } -WRITE8_MEMBER( wangpc_wdc_device::ctc_ch0_w ) { m_ctc->write(space, 0, data); } -READ8_MEMBER( wangpc_wdc_device::ctc_ch1_r ) { return m_ctc->read(space, 1); } -WRITE8_MEMBER( wangpc_wdc_device::ctc_ch1_w ) { m_ctc->write(space, 1, data); } -READ8_MEMBER( wangpc_wdc_device::ctc_ch2_r ) { return m_ctc->read(space, 2); } -WRITE8_MEMBER( wangpc_wdc_device::ctc_ch2_w ) { m_ctc->write(space, 2, data); } -READ8_MEMBER( wangpc_wdc_device::ctc_ch3_r ) { return m_ctc->read(space, 3); } -WRITE8_MEMBER( wangpc_wdc_device::ctc_ch3_w ) { m_ctc->write(space, 3, data); } +READ8_MEMBER( wangpc_wdc_device::ctc_ch0_r ) { return m_ctc->read(machine().dummy_space(), 0); } +WRITE8_MEMBER( wangpc_wdc_device::ctc_ch0_w ) { m_ctc->write(machine().dummy_space(), 0, data); } +READ8_MEMBER( wangpc_wdc_device::ctc_ch1_r ) { return m_ctc->read(machine().dummy_space(), 1); } +WRITE8_MEMBER( wangpc_wdc_device::ctc_ch1_w ) { m_ctc->write(machine().dummy_space(), 1, data); } +READ8_MEMBER( wangpc_wdc_device::ctc_ch2_r ) { return m_ctc->read(machine().dummy_space(), 2); } +WRITE8_MEMBER( wangpc_wdc_device::ctc_ch2_w ) { m_ctc->write(machine().dummy_space(), 2, data); } +READ8_MEMBER( wangpc_wdc_device::ctc_ch3_r ) { return m_ctc->read(machine().dummy_space(), 3); } +WRITE8_MEMBER( wangpc_wdc_device::ctc_ch3_w ) { m_ctc->write(machine().dummy_space(), 3, data); } diff --git a/src/devices/bus/wangpc/wdc.h b/src/devices/bus/wangpc/wdc.h index e270a961750..c945ba6707d 100644 --- a/src/devices/bus/wangpc/wdc.h +++ b/src/devices/bus/wangpc/wdc.h @@ -39,12 +39,12 @@ protected: virtual void device_add_mconfig(machine_config &config) override; // device_wangpcbus_card_interface overrides - virtual uint16_t wangpcbus_mrdc_r(address_space &space, offs_t offset, uint16_t mem_mask) override; - virtual void wangpcbus_amwc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data) override; - virtual uint16_t wangpcbus_iorc_r(address_space &space, offs_t offset, uint16_t mem_mask) override; - virtual void wangpcbus_aiowc_w(address_space &space, offs_t offset, uint16_t mem_mask, uint16_t data) override; - virtual uint8_t wangpcbus_dack_r(address_space &space, int line) override; - virtual void wangpcbus_dack_w(address_space &space, int line, uint8_t data) override; + virtual uint16_t wangpcbus_mrdc_r(offs_t offset, uint16_t mem_mask) override; + virtual void wangpcbus_amwc_w(offs_t offset, uint16_t mem_mask, uint16_t data) override; + virtual uint16_t wangpcbus_iorc_r(offs_t offset, uint16_t mem_mask) override; + virtual void wangpcbus_aiowc_w(offs_t offset, uint16_t mem_mask, uint16_t data) override; + virtual uint8_t wangpcbus_dack_r(int line) override; + virtual void wangpcbus_dack_w(int line, uint8_t data) override; virtual bool wangpcbus_have_dack(int line) override; private: diff --git a/src/devices/video/upd7220.cpp b/src/devices/video/upd7220.cpp index 75cc9daa01b..d8697222485 100644 --- a/src/devices/video/upd7220.cpp +++ b/src/devices/video/upd7220.cpp @@ -1448,7 +1448,7 @@ void upd7220_device::continue_command() // read - //------------------------------------------------- -READ8_MEMBER( upd7220_device::read ) +uint8_t upd7220_device::read(offs_t offset) { uint8_t data; @@ -1479,7 +1479,7 @@ READ8_MEMBER( upd7220_device::read ) // write - //------------------------------------------------- -WRITE8_MEMBER( upd7220_device::write ) +void upd7220_device::write(offs_t offset, uint8_t data) { if (offset & 1) { @@ -1502,7 +1502,7 @@ WRITE8_MEMBER( upd7220_device::write ) // dack_r - //------------------------------------------------- -READ8_MEMBER( upd7220_device::dack_r ) +uint8_t upd7220_device::dack_r() { return 0; } @@ -1512,7 +1512,7 @@ READ8_MEMBER( upd7220_device::dack_r ) // dack_w - //------------------------------------------------- -WRITE8_MEMBER( upd7220_device::dack_w ) +void upd7220_device::dack_w(uint8_t data) { } diff --git a/src/devices/video/upd7220.h b/src/devices/video/upd7220.h index 43748f7fa63..7c7370c0cd9 100644 --- a/src/devices/video/upd7220.h +++ b/src/devices/video/upd7220.h @@ -109,11 +109,11 @@ public: auto vsync_wr_callback() { return m_write_vsync.bind(); } auto blank_wr_callback() { return m_write_blank.bind(); } - DECLARE_READ8_MEMBER( read ); - DECLARE_WRITE8_MEMBER( write ); + uint8_t read(offs_t offset); + void write(offs_t offset, uint8_t data); - DECLARE_READ8_MEMBER( dack_r ); - DECLARE_WRITE8_MEMBER( dack_w ); + uint8_t dack_r(); + void dack_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER( ext_sync_w ); DECLARE_WRITE_LINE_MEMBER( lpen_w ); diff --git a/src/mame/drivers/apc.cpp b/src/mame/drivers/apc.cpp index a1311fbc024..1e9a44801cf 100644 --- a/src/mame/drivers/apc.cpp +++ b/src/mame/drivers/apc.cpp @@ -344,9 +344,9 @@ READ8_MEMBER(apc_state::apc_gdc_r) uint8_t res; if(offset & 1) - res = m_hgdc2->read(space, (offset & 2) >> 1); // upd7220 bitmap port + res = m_hgdc2->read((offset & 2) >> 1); // upd7220 bitmap port else - res = m_hgdc1->read(space, (offset & 2) >> 1); // upd7220 character port + res = m_hgdc1->read((offset & 2) >> 1); // upd7220 character port return res; } @@ -354,9 +354,9 @@ READ8_MEMBER(apc_state::apc_gdc_r) WRITE8_MEMBER(apc_state::apc_gdc_w) { if(offset & 1) - m_hgdc2->write(space, (offset & 2) >> 1,data); // upd7220 bitmap port + m_hgdc2->write((offset & 2) >> 1,data); // upd7220 bitmap port else - m_hgdc1->write(space, (offset & 2) >> 1,data); // upd7220 character port + m_hgdc1->write((offset & 2) >> 1,data); // upd7220 character port } READ8_MEMBER(apc_state::apc_kbd_r) diff --git a/src/mame/drivers/mikromik.cpp b/src/mame/drivers/mikromik.cpp index 5be831c4c2c..4c333c4379d 100644 --- a/src/mame/drivers/mikromik.cpp +++ b/src/mame/drivers/mikromik.cpp @@ -123,7 +123,7 @@ READ8_MEMBER( mm1_state::read ) break; case 7: - data = m_hgdc->read(space, offset & 0x01); + data = m_hgdc->read(offset & 0x01); break; } } @@ -192,7 +192,7 @@ WRITE8_MEMBER( mm1_state::write ) break; case 7: - m_hgdc->write(space, offset & 0x01, data); + m_hgdc->write(offset & 0x01, data); break; } } diff --git a/src/mame/drivers/rainbow.cpp b/src/mame/drivers/rainbow.cpp index e48152c5f13..9a42b6f3c1f 100644 --- a/src/mame/drivers/rainbow.cpp +++ b/src/mame/drivers/rainbow.cpp @@ -2947,11 +2947,8 @@ READ8_MEMBER(rainbow_state::GDC_EXTRA_REGISTER_r) break; case 6: - data = m_hgdc->read(space, offset & 0x00); - break; - case 7: - data = m_hgdc->read(space, offset & 0x01); + data = m_hgdc->read(offset & 0x01); break; default: @@ -3169,7 +3166,7 @@ WRITE8_MEMBER(rainbow_state::GDC_EXTRA_REGISTER_w) case 6: case 7: - m_hgdc->write(space, offset & 0x01, data); + m_hgdc->write(offset & 0x01, data); break; } // switch diff --git a/src/mame/drivers/wangpc.cpp b/src/mame/drivers/wangpc.cpp index 1085c74930b..9c448093a7d 100644 --- a/src/mame/drivers/wangpc.cpp +++ b/src/mame/drivers/wangpc.cpp @@ -876,7 +876,7 @@ WRITE8_MEMBER( wangpc_state::memw_w ) READ8_MEMBER( wangpc_state::ior2_r ) { if (m_disable_dreq2) - return m_bus->dack_r(space, 2); + return m_bus->dack_r(2); else return m_fdc->dma_r(); } @@ -884,7 +884,7 @@ READ8_MEMBER( wangpc_state::ior2_r ) WRITE8_MEMBER( wangpc_state::iow2_w ) { if (m_disable_dreq2) - m_bus->dack_w(space, 2, data); + m_bus->dack_w(2, data); else m_fdc->dma_w(data); } diff --git a/src/mame/video/pc9801.cpp b/src/mame/video/pc9801.cpp index 34d8d3e04c7..c6fee1e569d 100644 --- a/src/mame/video/pc9801.cpp +++ b/src/mame/video/pc9801.cpp @@ -321,7 +321,7 @@ READ8_MEMBER(pc9801_state::pc9801_a0_r) { case 0x00: case 0x02: - return m_hgdc2->read(space, (offset & 2) >> 1); + return m_hgdc2->read((offset & 2) >> 1); /* TODO: double check these two */ case 0x04: return m_vram_disp & 1; @@ -366,7 +366,7 @@ WRITE8_MEMBER(pc9801_state::pc9801_a0_w) { case 0x00: case 0x02: - m_hgdc2->write(space, (offset & 2) >> 1,data); + m_hgdc2->write((offset & 2) >> 1,data); return; case 0x04: m_vram_disp = data & 1; -- cgit v1.2.3