diff options
| author | 2019-02-19 09:02:10 -0500 | |
|---|---|---|
| committer | 2019-02-19 09:02:10 -0500 | |
| commit | 3bd5da37c0d493f56f75cda8967461e1d2c843fc (patch) | |
| tree | e466668d3cf22b171249e62c1df63ec4e4a4f356 /src/devices | |
| parent | 36012553a7ec25ce6f93de556b30cd8d3ecfb998 (diff) | |
bus/adam, bus/cbm2, bus/coleco, bus/vic20: Eliminate unnecessary address_space and/or offset arguments from handlers (nw)
Diffstat (limited to 'src/devices')
45 files changed, 114 insertions, 114 deletions
diff --git a/src/devices/bus/adam/adamlink.cpp b/src/devices/bus/adam/adamlink.cpp index f4227273421..4dc2d44b3d7 100644 --- a/src/devices/bus/adam/adamlink.cpp +++ b/src/devices/bus/adam/adamlink.cpp @@ -47,7 +47,7 @@ void adamlink_device::device_start() // adam_bd_r - buffered data read //------------------------------------------------- -uint8_t adamlink_device::adam_bd_r(address_space &space, offs_t offset, uint8_t data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2) +uint8_t adamlink_device::adam_bd_r(offs_t offset, uint8_t data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2) { if (!biorq) { @@ -69,7 +69,7 @@ uint8_t adamlink_device::adam_bd_r(address_space &space, offs_t offset, uint8_t // adam_bd_w - buffered data write //------------------------------------------------- -void adamlink_device::adam_bd_w(address_space &space, offs_t offset, uint8_t data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2) +void adamlink_device::adam_bd_w(offs_t offset, uint8_t data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2) { if (!biorq) { diff --git a/src/devices/bus/adam/adamlink.h b/src/devices/bus/adam/adamlink.h index 42fd06490f9..6fb07f81c6f 100644 --- a/src/devices/bus/adam/adamlink.h +++ b/src/devices/bus/adam/adamlink.h @@ -33,8 +33,8 @@ protected: virtual void device_start() override; // device_adam_expansion_slot_card_interface overrides - virtual uint8_t adam_bd_r(address_space &space, offs_t offset, uint8_t data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2) override; - virtual void adam_bd_w(address_space &space, offs_t offset, uint8_t data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2) override; + virtual uint8_t adam_bd_r(offs_t offset, uint8_t data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2) override; + virtual void adam_bd_w(offs_t offset, uint8_t data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2) override; }; diff --git a/src/devices/bus/adam/exp.cpp b/src/devices/bus/adam/exp.cpp index c9d529a68ab..4555ed961eb 100644 --- a/src/devices/bus/adam/exp.cpp +++ b/src/devices/bus/adam/exp.cpp @@ -123,11 +123,11 @@ std::string adam_expansion_slot_device::get_default_card_software(get_default_ca // bd_r - buffered data read //------------------------------------------------- -uint8_t adam_expansion_slot_device::bd_r(address_space &space, offs_t offset, uint8_t data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2) +uint8_t adam_expansion_slot_device::bd_r(offs_t offset, uint8_t data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2) { if (m_card != nullptr) { - data = m_card->adam_bd_r(space, offset, data, bmreq, biorq, aux_rom_cs, cas1, cas2); + data = m_card->adam_bd_r(offset, data, bmreq, biorq, aux_rom_cs, cas1, cas2); } return data; @@ -138,11 +138,11 @@ uint8_t adam_expansion_slot_device::bd_r(address_space &space, offs_t offset, ui // cd_w - cartridge data write //------------------------------------------------- -void adam_expansion_slot_device::bd_w(address_space &space, offs_t offset, uint8_t data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2) +void adam_expansion_slot_device::bd_w(offs_t offset, uint8_t data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2) { if (m_card != nullptr) { - m_card->adam_bd_w(space, offset, data, bmreq, biorq, aux_rom_cs, cas1, cas2); + m_card->adam_bd_w(offset, data, bmreq, biorq, aux_rom_cs, cas1, cas2); } } diff --git a/src/devices/bus/adam/exp.h b/src/devices/bus/adam/exp.h index 063d28b4271..618bc3d365a 100644 --- a/src/devices/bus/adam/exp.h +++ b/src/devices/bus/adam/exp.h @@ -51,8 +51,8 @@ public: auto irq() { return m_write_irq.bind(); } // computer interface - uint8_t bd_r(address_space &space, offs_t offset, uint8_t data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2); - void bd_w(address_space &space, offs_t offset, uint8_t data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2); + uint8_t bd_r(offs_t offset, uint8_t data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2); + void bd_w(offs_t offset, uint8_t data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2); // cartridge interface DECLARE_WRITE_LINE_MEMBER( irq_w ) { m_write_irq(state); } @@ -96,8 +96,8 @@ protected: device_adam_expansion_slot_card_interface(const machine_config &mconfig, device_t &device); // runtime - virtual uint8_t adam_bd_r(address_space &space, offs_t offset, uint8_t data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2) { return data; } - virtual void adam_bd_w(address_space &space, offs_t offset, uint8_t data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2) { } + virtual uint8_t adam_bd_r(offs_t offset, uint8_t data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2) { return data; } + virtual void adam_bd_w(offs_t offset, uint8_t data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2) { } adam_expansion_slot_device *m_slot; diff --git a/src/devices/bus/adam/ide.cpp b/src/devices/bus/adam/ide.cpp index fe97b7be512..98078003f4b 100644 --- a/src/devices/bus/adam/ide.cpp +++ b/src/devices/bus/adam/ide.cpp @@ -103,7 +103,7 @@ void powermate_ide_device::device_start() // adam_bd_r - buffered data read //------------------------------------------------- -uint8_t powermate_ide_device::adam_bd_r(address_space &space, offs_t offset, uint8_t data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2) +uint8_t powermate_ide_device::adam_bd_r(offs_t offset, uint8_t data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2) { if (!biorq) { @@ -164,7 +164,7 @@ uint8_t powermate_ide_device::adam_bd_r(address_space &space, offs_t offset, uin // adam_bd_w - buffered data write //------------------------------------------------- -void powermate_ide_device::adam_bd_w(address_space &space, offs_t offset, uint8_t data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2) +void powermate_ide_device::adam_bd_w(offs_t offset, uint8_t data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2) { if (!biorq) { diff --git a/src/devices/bus/adam/ide.h b/src/devices/bus/adam/ide.h index 992b66aee3d..bfce0f9851f 100644 --- a/src/devices/bus/adam/ide.h +++ b/src/devices/bus/adam/ide.h @@ -39,8 +39,8 @@ protected: virtual void device_add_mconfig(machine_config &config) override; // device_adam_expansion_slot_card_interface overrides - virtual uint8_t adam_bd_r(address_space &space, offs_t offset, uint8_t data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2) override; - virtual void adam_bd_w(address_space &space, offs_t offset, uint8_t data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2) override; + virtual uint8_t adam_bd_r(offs_t offset, uint8_t data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2) override; + virtual void adam_bd_w(offs_t offset, uint8_t data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2) override; private: required_device<ata_interface_device> m_ata; diff --git a/src/devices/bus/adam/ram.cpp b/src/devices/bus/adam/ram.cpp index 2a756000dc2..a7e79719867 100644 --- a/src/devices/bus/adam/ram.cpp +++ b/src/devices/bus/adam/ram.cpp @@ -49,7 +49,7 @@ void adam_ram_expansion_device::device_start() // adam_bd_r - buffered data read //------------------------------------------------- -uint8_t adam_ram_expansion_device::adam_bd_r(address_space &space, offs_t offset, uint8_t data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2) +uint8_t adam_ram_expansion_device::adam_bd_r(offs_t offset, uint8_t data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2) { if (!cas2) { @@ -64,7 +64,7 @@ uint8_t adam_ram_expansion_device::adam_bd_r(address_space &space, offs_t offset // adam_bd_w - buffered data write //------------------------------------------------- -void adam_ram_expansion_device::adam_bd_w(address_space &space, offs_t offset, uint8_t data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2) +void adam_ram_expansion_device::adam_bd_w(offs_t offset, uint8_t data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2) { if (!cas2) { diff --git a/src/devices/bus/adam/ram.h b/src/devices/bus/adam/ram.h index 80ec417f3cc..780d51be726 100644 --- a/src/devices/bus/adam/ram.h +++ b/src/devices/bus/adam/ram.h @@ -33,8 +33,8 @@ protected: virtual void device_start() override; // device_adam_expansion_slot_card_interface overrides - virtual uint8_t adam_bd_r(address_space &space, offs_t offset, uint8_t data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2) override; - virtual void adam_bd_w(address_space &space, offs_t offset, uint8_t data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2) override; + virtual uint8_t adam_bd_r(offs_t offset, uint8_t data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2) override; + virtual void adam_bd_w(offs_t offset, uint8_t data, int bmreq, int biorq, int aux_rom_cs, int cas1, int cas2) override; private: optional_shared_ptr<uint8_t> m_ram; diff --git a/src/devices/bus/cbm2/24k.cpp b/src/devices/bus/cbm2/24k.cpp index 9517337f8c1..c212b2fef83 100644 --- a/src/devices/bus/cbm2/24k.cpp +++ b/src/devices/bus/cbm2/24k.cpp @@ -49,7 +49,7 @@ void cbm2_24k_cartridge_device::device_start() // cbm2_bd_r - cartridge data read //------------------------------------------------- -uint8_t cbm2_24k_cartridge_device::cbm2_bd_r(address_space &space, offs_t offset, uint8_t data, int csbank1, int csbank2, int csbank3) +uint8_t cbm2_24k_cartridge_device::cbm2_bd_r(offs_t offset, uint8_t data, int csbank1, int csbank2, int csbank3) { if (!csbank1) { @@ -72,7 +72,7 @@ uint8_t cbm2_24k_cartridge_device::cbm2_bd_r(address_space &space, offs_t offset // cbm2_bd_w - cartridge data write //------------------------------------------------- -void cbm2_24k_cartridge_device::cbm2_bd_w(address_space &space, offs_t offset, uint8_t data, int csbank1, int csbank2, int csbank3) +void cbm2_24k_cartridge_device::cbm2_bd_w(offs_t offset, uint8_t data, int csbank1, int csbank2, int csbank3) { if (!csbank1) { diff --git a/src/devices/bus/cbm2/24k.h b/src/devices/bus/cbm2/24k.h index 0e40e67d478..b1c029c5254 100644 --- a/src/devices/bus/cbm2/24k.h +++ b/src/devices/bus/cbm2/24k.h @@ -33,8 +33,8 @@ protected: virtual void device_start() override; // device_cbm2_expansion_card_interface overrides - virtual uint8_t cbm2_bd_r(address_space &space, offs_t offset, uint8_t data, int csbank1, int csbank2, int csbank3) override; - virtual void cbm2_bd_w(address_space &space, offs_t offset, uint8_t data, int csbank1, int csbank2, int csbank3) override; + virtual uint8_t cbm2_bd_r(offs_t offset, uint8_t data, int csbank1, int csbank2, int csbank3) override; + virtual void cbm2_bd_w(offs_t offset, uint8_t data, int csbank1, int csbank2, int csbank3) override; optional_shared_ptr<uint8_t> m_ram; }; diff --git a/src/devices/bus/cbm2/exp.cpp b/src/devices/bus/cbm2/exp.cpp index e4246026a54..bcc2a654060 100644 --- a/src/devices/bus/cbm2/exp.cpp +++ b/src/devices/bus/cbm2/exp.cpp @@ -155,11 +155,11 @@ std::string cbm2_expansion_slot_device::get_default_card_software(get_default_ca // read - cartridge data read //------------------------------------------------- -uint8_t cbm2_expansion_slot_device::read(address_space &space, offs_t offset, uint8_t data, int csbank1, int csbank2, int csbank3) +uint8_t cbm2_expansion_slot_device::read(offs_t offset, uint8_t data, int csbank1, int csbank2, int csbank3) { if (m_card != nullptr) { - data = m_card->cbm2_bd_r(space, offset, data, csbank1, csbank2, csbank3); + data = m_card->cbm2_bd_r(offset, data, csbank1, csbank2, csbank3); } return data; @@ -170,11 +170,11 @@ uint8_t cbm2_expansion_slot_device::read(address_space &space, offs_t offset, ui // write - cartridge data write //------------------------------------------------- -void cbm2_expansion_slot_device::write(address_space &space, offs_t offset, uint8_t data, int csbank1, int csbank2, int csbank3) +void cbm2_expansion_slot_device::write(offs_t offset, uint8_t data, int csbank1, int csbank2, int csbank3) { if (m_card != nullptr) { - m_card->cbm2_bd_w(space, offset, data, csbank1, csbank2, csbank3); + m_card->cbm2_bd_w(offset, data, csbank1, csbank2, csbank3); } } diff --git a/src/devices/bus/cbm2/exp.h b/src/devices/bus/cbm2/exp.h index 58e854c9aa0..4d905225299 100644 --- a/src/devices/bus/cbm2/exp.h +++ b/src/devices/bus/cbm2/exp.h @@ -66,8 +66,8 @@ public: cbm2_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); // computer interface - uint8_t read(address_space &space, offs_t offset, uint8_t data, int csbank1, int csbank2, int csbank3); - void write(address_space &space, offs_t offset, uint8_t data, int csbank1, int csbank2, int csbank3); + uint8_t read(offs_t offset, uint8_t data, int csbank1, int csbank2, int csbank3); + void write(offs_t offset, uint8_t data, int csbank1, int csbank2, int csbank3); // cartridge interface int phi2() { return clock(); } @@ -108,8 +108,8 @@ public: // construction/destruction virtual ~device_cbm2_expansion_card_interface(); - virtual uint8_t cbm2_bd_r(address_space &space, offs_t offset, uint8_t data, int csbank1, int csbank2, int csbank3) { return data; }; - virtual void cbm2_bd_w(address_space &space, offs_t offset, uint8_t data, int csbank1, int csbank2, int csbank3) { }; + virtual uint8_t cbm2_bd_r(offs_t offset, uint8_t data, int csbank1, int csbank2, int csbank3) { return data; }; + virtual void cbm2_bd_w(offs_t offset, uint8_t data, int csbank1, int csbank2, int csbank3) { }; protected: device_cbm2_expansion_card_interface(const machine_config &mconfig, device_t &device); diff --git a/src/devices/bus/cbm2/hrg.cpp b/src/devices/bus/cbm2/hrg.cpp index 83fab890fcb..16bd7e5398f 100644 --- a/src/devices/bus/cbm2/hrg.cpp +++ b/src/devices/bus/cbm2/hrg.cpp @@ -174,7 +174,7 @@ void cbm2_hrg_device::device_reset() // cbm2_bd_r - cartridge data read //------------------------------------------------- -uint8_t cbm2_hrg_device::cbm2_bd_r(address_space &space, offs_t offset, uint8_t data, int csbank1, int csbank2, int csbank3) +uint8_t cbm2_hrg_device::cbm2_bd_r(offs_t offset, uint8_t data, int csbank1, int csbank2, int csbank3) { if (!csbank3) { @@ -205,7 +205,7 @@ uint8_t cbm2_hrg_device::cbm2_bd_r(address_space &space, offs_t offset, uint8_t } else if (offset >= 0x7ff0) { - data = m_gdc->data_r(space, offset & 0x0f); + data = m_gdc->data_r(machine().dummy_space(), offset & 0x0f); } } @@ -217,7 +217,7 @@ uint8_t cbm2_hrg_device::cbm2_bd_r(address_space &space, offs_t offset, uint8_t // cbm2_bd_w - cartridge data write //------------------------------------------------- -void cbm2_hrg_device::cbm2_bd_w(address_space &space, offs_t offset, uint8_t data, int csbank1, int csbank2, int csbank3) +void cbm2_hrg_device::cbm2_bd_w(offs_t offset, uint8_t data, int csbank1, int csbank2, int csbank3) { if (!csbank3) { @@ -240,7 +240,7 @@ void cbm2_hrg_device::cbm2_bd_w(address_space &space, offs_t offset, uint8_t dat } else if (offset >= 0x7ff0) { - m_gdc->data_w(space, offset & 0x0f, data); + m_gdc->data_w(machine().dummy_space(), offset & 0x0f, data); } } } diff --git a/src/devices/bus/cbm2/hrg.h b/src/devices/bus/cbm2/hrg.h index b7ae9273dcf..3b6a20c94e8 100644 --- a/src/devices/bus/cbm2/hrg.h +++ b/src/devices/bus/cbm2/hrg.h @@ -38,8 +38,8 @@ protected: virtual void device_reset() override; // device_cbm2_expansion_card_interface overrides - virtual uint8_t cbm2_bd_r(address_space &space, offs_t offset, uint8_t data, int csbank1, int csbank2, int csbank3) override; - virtual void cbm2_bd_w(address_space &space, offs_t offset, uint8_t data, int csbank1, int csbank2, int csbank3) override; + virtual uint8_t cbm2_bd_r(offs_t offset, uint8_t data, int csbank1, int csbank2, int csbank3) override; + virtual void cbm2_bd_w(offs_t offset, uint8_t data, int csbank1, int csbank2, int csbank3) override; required_device<ef9365_device> m_gdc; diff --git a/src/devices/bus/cbm2/std.cpp b/src/devices/bus/cbm2/std.cpp index 5087e39cd93..f56226028ee 100644 --- a/src/devices/bus/cbm2/std.cpp +++ b/src/devices/bus/cbm2/std.cpp @@ -47,7 +47,7 @@ void cbm2_standard_cartridge_device::device_start() // cbm2_bd_r - cartridge data read //------------------------------------------------- -uint8_t cbm2_standard_cartridge_device::cbm2_bd_r(address_space &space, offs_t offset, uint8_t data, int csbank1, int csbank2, int csbank3) +uint8_t cbm2_standard_cartridge_device::cbm2_bd_r(offs_t offset, uint8_t data, int csbank1, int csbank2, int csbank3) { if (!csbank1 && m_bank1.bytes()) { diff --git a/src/devices/bus/cbm2/std.h b/src/devices/bus/cbm2/std.h index beb54e1fb2e..ee941ca580a 100644 --- a/src/devices/bus/cbm2/std.h +++ b/src/devices/bus/cbm2/std.h @@ -33,7 +33,7 @@ protected: virtual void device_start() override; // device_cbm2_expansion_card_interface overrides - virtual uint8_t cbm2_bd_r(address_space &space, offs_t offset, uint8_t data, int csbank1, int csbank2, int csbank3) override; + virtual uint8_t cbm2_bd_r(offs_t offset, uint8_t data, int csbank1, int csbank2, int csbank3) override; }; diff --git a/src/devices/bus/cbm2/user.h b/src/devices/bus/cbm2/user.h index aa963d0dccc..6bb6bba33c6 100644 --- a/src/devices/bus/cbm2/user.h +++ b/src/devices/bus/cbm2/user.h @@ -42,20 +42,20 @@ class cbm2_user_port_device; class device_cbm2_user_port_interface : public device_slot_card_interface { public: - virtual uint8_t cbm2_d1_r(address_space &space, offs_t offset) { return 0xff; }; - virtual void cbm2_d1_w(address_space &space, offs_t offset, uint8_t data) { }; + virtual uint8_t cbm2_d1_r() { return 0xff; } + virtual void cbm2_d1_w(uint8_t data) { } - virtual uint8_t cbm2_d2_r(address_space &space, offs_t offset) { return 0xff; }; - virtual void cbm2_d2_w(address_space &space, offs_t offset, uint8_t data) { }; + virtual uint8_t cbm2_d2_r() { return 0xff; } + virtual void cbm2_d2_w(uint8_t data) { } virtual int cbm2_pb2_r() { return 1; } - virtual void cbm2_pb2_w(int state) { }; + virtual void cbm2_pb2_w(int state) { } virtual int cbm2_pb3_r() { return 1; } - virtual void cbm2_pb3_w(int state) { }; + virtual void cbm2_pb3_w(int state) { } - virtual void cbm2_pc_w(int state) { }; - virtual void cbm2_cnt_w(int state) { }; - virtual void cbm2_sp_w(int state) { }; + virtual void cbm2_pc_w(int state) { } + virtual void cbm2_cnt_w(int state) { } + virtual void cbm2_sp_w(int state) { } protected: // construction/destruction @@ -89,10 +89,10 @@ public: auto flag_callback() { return m_write_flag.bind(); } // computer interface - DECLARE_READ8_MEMBER( d1_r ) { uint8_t data = 0xff; if (m_card != nullptr) data = m_card->cbm2_d1_r(space, offset); return data; } - DECLARE_WRITE8_MEMBER( d1_w ) { if (m_card != nullptr) m_card->cbm2_d1_w(space, offset, data); } - DECLARE_READ8_MEMBER( d2_r ) { uint8_t data = 0xff; if (m_card != nullptr) data = m_card->cbm2_d2_r(space, offset); return data; } - DECLARE_WRITE8_MEMBER( d2_w ) { if (m_card != nullptr) m_card->cbm2_d2_w(space, offset, data); } + uint8_t d1_r() { uint8_t data = 0xff; if (m_card != nullptr) data = m_card->cbm2_d1_r(); return data; } + void d1_w(uint8_t data) { if (m_card != nullptr) m_card->cbm2_d1_w(data); } + uint8_t d2_r() { uint8_t data = 0xff; if (m_card != nullptr) data = m_card->cbm2_d2_r(); return data; } + void d2_w(uint8_t data) { if (m_card != nullptr) m_card->cbm2_d2_w(data); } DECLARE_READ_LINE_MEMBER( pb2_r ) { return m_card ? m_card->cbm2_pb2_r() : 1; } DECLARE_WRITE_LINE_MEMBER( pb2_w ) { if (m_card != nullptr) m_card->cbm2_pb2_w(state); } DECLARE_READ_LINE_MEMBER( pb3_r ) { return m_card ? m_card->cbm2_pb3_r() : 1; } diff --git a/src/devices/bus/coleco/exp.cpp b/src/devices/bus/coleco/exp.cpp index c2878c4523a..eaf3f144322 100644 --- a/src/devices/bus/coleco/exp.cpp +++ b/src/devices/bus/coleco/exp.cpp @@ -118,11 +118,11 @@ std::string colecovision_cartridge_slot_device::get_default_card_software(get_de // bd_r - cartridge data read //------------------------------------------------- -uint8_t colecovision_cartridge_slot_device::bd_r(address_space &space, offs_t offset, uint8_t data, int _8000, int _a000, int _c000, int _e000) +uint8_t colecovision_cartridge_slot_device::bd_r(offs_t offset, uint8_t data, int _8000, int _a000, int _c000, int _e000) { if (m_card != nullptr) { - data = m_card->bd_r(space, offset, data, _8000, _a000, _c000, _e000); + data = m_card->bd_r(offset, data, _8000, _a000, _c000, _e000); } return data; diff --git a/src/devices/bus/coleco/exp.h b/src/devices/bus/coleco/exp.h index a4bf724c6e7..4da9d2d1d00 100644 --- a/src/devices/bus/coleco/exp.h +++ b/src/devices/bus/coleco/exp.h @@ -65,7 +65,7 @@ public: colecovision_cartridge_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // computer interface - uint8_t bd_r(address_space &space, offs_t offset, uint8_t data, int _8000, int _a000, int _c000, int _e000); + uint8_t bd_r(offs_t offset, uint8_t data, int _8000, int _a000, int _c000, int _e000); protected: // device-level overrides @@ -99,7 +99,7 @@ class device_colecovision_cartridge_interface : public device_slot_card_interfac friend class colecovision_cartridge_slot_device; public: - virtual uint8_t bd_r(address_space &space, offs_t offset, uint8_t data, int _8000, int _a000, int _c000, int _e000) { return 0xff; } + virtual uint8_t bd_r(offs_t offset, uint8_t data, int _8000, int _a000, int _c000, int _e000) { return 0xff; } void rom_alloc(size_t size); diff --git a/src/devices/bus/coleco/std.cpp b/src/devices/bus/coleco/std.cpp index ae490dea2e9..24bb815834e 100644 --- a/src/devices/bus/coleco/std.cpp +++ b/src/devices/bus/coleco/std.cpp @@ -47,7 +47,7 @@ void colecovision_standard_cartridge_device::device_start() // read - cartridge data read //------------------------------------------------- -uint8_t colecovision_standard_cartridge_device::bd_r(address_space &space, offs_t offset, uint8_t data, int _8000, int _a000, int _c000, int _e000) +uint8_t colecovision_standard_cartridge_device::bd_r(offs_t offset, uint8_t data, int _8000, int _a000, int _c000, int _e000) { if (!_8000 || !_a000 || !_c000 || !_e000) { diff --git a/src/devices/bus/coleco/std.h b/src/devices/bus/coleco/std.h index 7ee221502a7..6e0c5206ada 100644 --- a/src/devices/bus/coleco/std.h +++ b/src/devices/bus/coleco/std.h @@ -33,7 +33,7 @@ protected: virtual void device_start() override; // device_colecovision_expansion_card_interface overrides - virtual uint8_t bd_r(address_space &space, offs_t offset, uint8_t data, int _8000, int _a000, int _c000, int _e000) override; + virtual uint8_t bd_r(offs_t offset, uint8_t data, int _8000, int _a000, int _c000, int _e000) override; }; diff --git a/src/devices/bus/coleco/xin1.cpp b/src/devices/bus/coleco/xin1.cpp index 3538f93bb90..140d2132ee4 100644 --- a/src/devices/bus/coleco/xin1.cpp +++ b/src/devices/bus/coleco/xin1.cpp @@ -58,7 +58,7 @@ void colecovision_xin1_cartridge_device::device_reset() // read - cartridge data read //------------------------------------------------- -uint8_t colecovision_xin1_cartridge_device::bd_r(address_space &space, offs_t offset, uint8_t data, int _8000, int _a000, int _c000, int _e000) +uint8_t colecovision_xin1_cartridge_device::bd_r(offs_t offset, uint8_t data, int _8000, int _a000, int _c000, int _e000) { if (!_8000 || !_a000 || !_c000 || !_e000) { diff --git a/src/devices/bus/coleco/xin1.h b/src/devices/bus/coleco/xin1.h index c5b0ae49b76..0e8a7813c9f 100644 --- a/src/devices/bus/coleco/xin1.h +++ b/src/devices/bus/coleco/xin1.h @@ -34,7 +34,7 @@ protected: virtual void device_reset() override; // device_colecovision_expansion_card_interface overrides - virtual uint8_t bd_r(address_space &space, offs_t offset, uint8_t data, int _8000, int _a000, int _c000, int _e000) override; + virtual uint8_t bd_r(offs_t offset, uint8_t data, int _8000, int _a000, int _c000, int _e000) override; private: uint32_t m_current_offset; diff --git a/src/devices/bus/vic20/exp.cpp b/src/devices/bus/vic20/exp.cpp index 4bc6136553b..c472f7408fd 100644 --- a/src/devices/bus/vic20/exp.cpp +++ b/src/devices/bus/vic20/exp.cpp @@ -178,11 +178,11 @@ std::string vic20_expansion_slot_device::get_default_card_software(get_default_c // cd_r - cartridge data read //------------------------------------------------- -uint8_t vic20_expansion_slot_device::cd_r(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) +uint8_t vic20_expansion_slot_device::cd_r(offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) { if (m_card != nullptr) { - data = m_card->vic20_cd_r(space, offset, data, ram1, ram2, ram3, blk1, blk2, blk3, blk5, io2, io3); + data = m_card->vic20_cd_r(offset, data, ram1, ram2, ram3, blk1, blk2, blk3, blk5, io2, io3); } return data; @@ -193,11 +193,11 @@ uint8_t vic20_expansion_slot_device::cd_r(address_space &space, offs_t offset, u // cd_w - cartridge data write //------------------------------------------------- -void vic20_expansion_slot_device::cd_w(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) +void vic20_expansion_slot_device::cd_w(offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) { if (m_card != nullptr) { - m_card->vic20_cd_w(space, offset, data, ram1, ram2, ram3, blk1, blk2, blk3, blk5, io2, io3); + m_card->vic20_cd_w(offset, data, ram1, ram2, ram3, blk1, blk2, blk3, blk5, io2, io3); } } diff --git a/src/devices/bus/vic20/exp.h b/src/devices/bus/vic20/exp.h index b6b0dbd1346..f7e51b0ee57 100644 --- a/src/devices/bus/vic20/exp.h +++ b/src/devices/bus/vic20/exp.h @@ -79,8 +79,8 @@ public: auto res_wr_callback() { return m_write_res.bind(); } // computer interface - uint8_t cd_r(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3); - void cd_w(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3); + uint8_t cd_r(offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3); + void cd_w(offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3); // cartridge interface DECLARE_WRITE_LINE_MEMBER( irq_w ) { m_write_irq(state); } @@ -129,8 +129,8 @@ public: // construction/destruction virtual ~device_vic20_expansion_card_interface(); - virtual uint8_t vic20_cd_r(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) { return data; }; - virtual void vic20_cd_w(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) { }; + virtual uint8_t vic20_cd_r(offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) { return data; }; + virtual void vic20_cd_w(offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) { }; protected: device_vic20_expansion_card_interface(const machine_config &mconfig, device_t &device); diff --git a/src/devices/bus/vic20/fe3.cpp b/src/devices/bus/vic20/fe3.cpp index 0779f35d565..f008bec3cb8 100644 --- a/src/devices/bus/vic20/fe3.cpp +++ b/src/devices/bus/vic20/fe3.cpp @@ -140,7 +140,7 @@ void vic20_final_expansion_3_device::device_reset() // vic20_cd_r - cartridge data read //------------------------------------------------- -uint8_t vic20_final_expansion_3_device::vic20_cd_r(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) +uint8_t vic20_final_expansion_3_device::vic20_cd_r(offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) { switch (m_reg1 & REG1_MODE_MASK) { @@ -361,7 +361,7 @@ uint8_t vic20_final_expansion_3_device::vic20_cd_r(address_space &space, offs_t // vic20_cd_w - cartridge data write //------------------------------------------------- -void vic20_final_expansion_3_device::vic20_cd_w(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) +void vic20_final_expansion_3_device::vic20_cd_w(offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) { switch (m_reg1 & REG1_MODE_MASK) { diff --git a/src/devices/bus/vic20/fe3.h b/src/devices/bus/vic20/fe3.h index e65a97bfd1f..018ef2617b6 100644 --- a/src/devices/bus/vic20/fe3.h +++ b/src/devices/bus/vic20/fe3.h @@ -39,8 +39,8 @@ protected: virtual void device_add_mconfig(machine_config &config) override; // device_vic20_expansion_card_interface overrides - virtual uint8_t vic20_cd_r(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override; - virtual void vic20_cd_w(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override; + virtual uint8_t vic20_cd_r(offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override; + virtual void vic20_cd_w(offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override; private: enum diff --git a/src/devices/bus/vic20/megacart.cpp b/src/devices/bus/vic20/megacart.cpp index e86b80c6864..8094adfba2b 100644 --- a/src/devices/bus/vic20/megacart.cpp +++ b/src/devices/bus/vic20/megacart.cpp @@ -70,7 +70,7 @@ void vic20_megacart_device::device_reset() // vic20_cd_r - cartridge data read //------------------------------------------------- -uint8_t vic20_megacart_device::vic20_cd_r(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) +uint8_t vic20_megacart_device::vic20_cd_r(offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) { if (!ram1 || !ram2 || !ram3 || !io2 || !io3) { @@ -94,7 +94,7 @@ uint8_t vic20_megacart_device::vic20_cd_r(address_space &space, offs_t offset, u // vic20_cd_w - cartridge data write //------------------------------------------------- -void vic20_megacart_device::vic20_cd_w(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) +void vic20_megacart_device::vic20_cd_w(offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) { if (!ram1 || !ram2 || !ram3 || !io2) { diff --git a/src/devices/bus/vic20/megacart.h b/src/devices/bus/vic20/megacart.h index 6e66382b2c7..52f5182fc3c 100644 --- a/src/devices/bus/vic20/megacart.h +++ b/src/devices/bus/vic20/megacart.h @@ -43,8 +43,8 @@ protected: virtual void nvram_write(emu_file &file) override { file.write(m_nvram, m_nvram.bytes()); } // device_vic20_expansion_card_interface overrides - virtual uint8_t vic20_cd_r(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override; - virtual void vic20_cd_w(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override; + virtual uint8_t vic20_cd_r(offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override; + virtual void vic20_cd_w(offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override; private: int m_nvram_en; diff --git a/src/devices/bus/vic20/speakeasy.cpp b/src/devices/bus/vic20/speakeasy.cpp index 83a0fde77db..3d56d833ac6 100644 --- a/src/devices/bus/vic20/speakeasy.cpp +++ b/src/devices/bus/vic20/speakeasy.cpp @@ -71,7 +71,7 @@ void vic20_speakeasy_device::device_start() // vic20_cd_r - cartridge data read //------------------------------------------------- -uint8_t vic20_speakeasy_device::vic20_cd_r(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) +uint8_t vic20_speakeasy_device::vic20_cd_r(offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) { if (!io2) { @@ -86,11 +86,11 @@ uint8_t vic20_speakeasy_device::vic20_cd_r(address_space &space, offs_t offset, // vic20_cd_w - cartridge data write //------------------------------------------------- -void vic20_speakeasy_device::vic20_cd_w(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) +void vic20_speakeasy_device::vic20_cd_w(offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) { if (!io2) { - m_votrax->write(space, 0, data & 0x3f); - m_votrax->inflection_w(space, 0, data >> 6); + m_votrax->write(machine().dummy_space(), 0, data & 0x3f); + m_votrax->inflection_w(machine().dummy_space(), 0, data >> 6); } } diff --git a/src/devices/bus/vic20/speakeasy.h b/src/devices/bus/vic20/speakeasy.h index 823963804be..6df3880d2df 100644 --- a/src/devices/bus/vic20/speakeasy.h +++ b/src/devices/bus/vic20/speakeasy.h @@ -38,8 +38,8 @@ protected: virtual void device_add_mconfig(machine_config &config) override; // device_vic20_expansion_card_interface overrides - virtual uint8_t vic20_cd_r(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override; - virtual void vic20_cd_w(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override; + virtual uint8_t vic20_cd_r(offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override; + virtual void vic20_cd_w(offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override; private: required_device<votrax_sc01_device> m_votrax; diff --git a/src/devices/bus/vic20/std.cpp b/src/devices/bus/vic20/std.cpp index 7b4823dfcdf..988540719d8 100644 --- a/src/devices/bus/vic20/std.cpp +++ b/src/devices/bus/vic20/std.cpp @@ -46,7 +46,7 @@ void vic20_standard_cartridge_device::device_start() // vic20_cd_r - cartridge data read //------------------------------------------------- -uint8_t vic20_standard_cartridge_device::vic20_cd_r(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) +uint8_t vic20_standard_cartridge_device::vic20_cd_r(offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) { if (!blk1 && (m_blk1 != nullptr)) { diff --git a/src/devices/bus/vic20/std.h b/src/devices/bus/vic20/std.h index 2362a9c1c4c..0318f80aa54 100644 --- a/src/devices/bus/vic20/std.h +++ b/src/devices/bus/vic20/std.h @@ -33,7 +33,7 @@ protected: virtual void device_start() override; // device_vic20_expansion_card_interface overrides - virtual uint8_t vic20_cd_r(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override; + virtual uint8_t vic20_cd_r(offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override; }; diff --git a/src/devices/bus/vic20/vic1010.cpp b/src/devices/bus/vic20/vic1010.cpp index 3c00365a4bc..651ac37156e 100644 --- a/src/devices/bus/vic20/vic1010.cpp +++ b/src/devices/bus/vic20/vic1010.cpp @@ -75,11 +75,11 @@ void vic1010_device::device_reset() // vic20_cd_r - cartridge data read //------------------------------------------------- -uint8_t vic1010_device::vic20_cd_r(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) +uint8_t vic1010_device::vic20_cd_r(offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) { for (auto elem : m_expansion_slot) { - uint8_t slot_data = elem->cd_r(space, offset, data, ram1, ram2, ram3, blk1, blk2, blk3, blk5, io2, io3); + uint8_t slot_data = elem->cd_r(offset, data, ram1, ram2, ram3, blk1, blk2, blk3, blk5, io2, io3); if (data != slot_data) { @@ -95,10 +95,10 @@ uint8_t vic1010_device::vic20_cd_r(address_space &space, offs_t offset, uint8_t // vic20_cd_w - cartridge data write //------------------------------------------------- -void vic1010_device::vic20_cd_w(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) +void vic1010_device::vic20_cd_w(offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) { for (auto & elem : m_expansion_slot) { - elem->cd_w(space, offset, data, ram1, ram2, ram3, blk1, blk2, blk3, blk5, io2, io3); + elem->cd_w(offset, data, ram1, ram2, ram3, blk1, blk2, blk3, blk5, io2, io3); } } diff --git a/src/devices/bus/vic20/vic1010.h b/src/devices/bus/vic20/vic1010.h index f2014041f94..af85f4bfc3c 100644 --- a/src/devices/bus/vic20/vic1010.h +++ b/src/devices/bus/vic20/vic1010.h @@ -37,8 +37,8 @@ protected: virtual void device_add_mconfig(machine_config &config) override; // device_vic20_expansion_card_interface overrides - virtual uint8_t vic20_cd_r(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override; - virtual void vic20_cd_w(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override; + virtual uint8_t vic20_cd_r(offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override; + virtual void vic20_cd_w(offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override; private: static constexpr unsigned MAX_SLOTS = 6; diff --git a/src/devices/bus/vic20/vic1110.cpp b/src/devices/bus/vic20/vic1110.cpp index 8edd2179bf9..9b2d0c192d9 100644 --- a/src/devices/bus/vic20/vic1110.cpp +++ b/src/devices/bus/vic20/vic1110.cpp @@ -90,7 +90,7 @@ void vic1110_device::device_start() // vic20_cd_r - cartridge data read //------------------------------------------------- -uint8_t vic1110_device::vic20_cd_r(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) +uint8_t vic1110_device::vic20_cd_r(offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) { uint8_t sw = m_sw->read(); @@ -107,7 +107,7 @@ uint8_t vic1110_device::vic20_cd_r(address_space &space, offs_t offset, uint8_t // vic20_cd_w - cartridge data write //------------------------------------------------- -void vic1110_device::vic20_cd_w(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) +void vic1110_device::vic20_cd_w(offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) { uint8_t sw = m_sw->read(); diff --git a/src/devices/bus/vic20/vic1110.h b/src/devices/bus/vic20/vic1110.h index d1467c995bc..9ec1ea2791a 100644 --- a/src/devices/bus/vic20/vic1110.h +++ b/src/devices/bus/vic20/vic1110.h @@ -36,8 +36,8 @@ protected: virtual void device_start() override; // device_vic20_expansion_card_interface overrides - virtual uint8_t vic20_cd_r(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override; - virtual void vic20_cd_w(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override; + virtual uint8_t vic20_cd_r(offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override; + virtual void vic20_cd_w(offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override; private: optional_shared_ptr<uint8_t> m_ram; diff --git a/src/devices/bus/vic20/vic1111.cpp b/src/devices/bus/vic20/vic1111.cpp index ccfbabccd48..1f8fa215078 100644 --- a/src/devices/bus/vic20/vic1111.cpp +++ b/src/devices/bus/vic20/vic1111.cpp @@ -50,7 +50,7 @@ void vic1111_device::device_start() // vic20_cd_r - cartridge data read //------------------------------------------------- -uint8_t vic1111_device::vic20_cd_r(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) +uint8_t vic1111_device::vic20_cd_r(offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) { if (!blk1) { @@ -69,7 +69,7 @@ uint8_t vic1111_device::vic20_cd_r(address_space &space, offs_t offset, uint8_t // vic20_cd_w - cartridge data write //------------------------------------------------- -void vic1111_device::vic20_cd_w(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) +void vic1111_device::vic20_cd_w(offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) { if (!blk1) { diff --git a/src/devices/bus/vic20/vic1111.h b/src/devices/bus/vic20/vic1111.h index 21f439534e9..eb42db2f149 100644 --- a/src/devices/bus/vic20/vic1111.h +++ b/src/devices/bus/vic20/vic1111.h @@ -33,8 +33,8 @@ protected: virtual void device_start() override; // device_vic20_expansion_card_interface overrides - virtual uint8_t vic20_cd_r(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override; - virtual void vic20_cd_w(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override; + virtual uint8_t vic20_cd_r(offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override; + virtual void vic20_cd_w(offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override; private: optional_shared_ptr<uint8_t> m_ram; diff --git a/src/devices/bus/vic20/vic1112.cpp b/src/devices/bus/vic20/vic1112.cpp index e8d55e1e89b..77b421f51d8 100644 --- a/src/devices/bus/vic20/vic1112.cpp +++ b/src/devices/bus/vic20/vic1112.cpp @@ -164,7 +164,7 @@ void vic1112_device::device_reset() // vic20_cd_r - cartridge data read //------------------------------------------------- -uint8_t vic1112_device::vic20_cd_r(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) +uint8_t vic1112_device::vic20_cd_r(offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) { if (!io2) { @@ -184,7 +184,7 @@ uint8_t vic1112_device::vic20_cd_r(address_space &space, offs_t offset, uint8_t // vic20_cd_w - cartridge data write //------------------------------------------------- -void vic1112_device::vic20_cd_w(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) +void vic1112_device::vic20_cd_w(offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) { if (!io2) { diff --git a/src/devices/bus/vic20/vic1112.h b/src/devices/bus/vic20/vic1112.h index 6108a328ca8..5c4e05446a0 100644 --- a/src/devices/bus/vic20/vic1112.h +++ b/src/devices/bus/vic20/vic1112.h @@ -42,8 +42,8 @@ protected: virtual void device_add_mconfig(machine_config &config) override; // device_vic20_expansion_card_interface overrides - virtual uint8_t vic20_cd_r(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override; - virtual void vic20_cd_w(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override; + virtual uint8_t vic20_cd_r(offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override; + virtual void vic20_cd_w(offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override; private: DECLARE_WRITE_LINE_MEMBER( via0_irq_w ); diff --git a/src/devices/bus/vic20/vic1210.cpp b/src/devices/bus/vic20/vic1210.cpp index 81e5d75cc1d..6fa2a917254 100644 --- a/src/devices/bus/vic20/vic1210.cpp +++ b/src/devices/bus/vic20/vic1210.cpp @@ -51,7 +51,7 @@ void vic1210_device::device_start() // vic20_cd_r - cartridge data read //------------------------------------------------- -uint8_t vic1210_device::vic20_cd_r(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) +uint8_t vic1210_device::vic20_cd_r(offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) { if (!ram1 || !ram2 || !ram3) { @@ -70,7 +70,7 @@ uint8_t vic1210_device::vic20_cd_r(address_space &space, offs_t offset, uint8_t // vic20_cd_w - cartridge data write //------------------------------------------------- -void vic1210_device::vic20_cd_w(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) +void vic1210_device::vic20_cd_w(offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) { if (!ram1 || !ram2 || !ram3) { diff --git a/src/devices/bus/vic20/vic1210.h b/src/devices/bus/vic20/vic1210.h index 9fa0ea48a99..f890d5ad61e 100644 --- a/src/devices/bus/vic20/vic1210.h +++ b/src/devices/bus/vic20/vic1210.h @@ -34,8 +34,8 @@ protected: virtual void device_start() override; // device_vic20_expansion_card_interface overrides - virtual uint8_t vic20_cd_r(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override; - virtual void vic20_cd_w(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override; + virtual uint8_t vic20_cd_r(offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override; + virtual void vic20_cd_w(offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override; private: optional_shared_ptr<uint8_t> m_ram; diff --git a/src/devices/bus/vic20/videopak.cpp b/src/devices/bus/vic20/videopak.cpp index a63cac93a96..8a89a15f420 100644 --- a/src/devices/bus/vic20/videopak.cpp +++ b/src/devices/bus/vic20/videopak.cpp @@ -162,7 +162,7 @@ void vic20_video_pak_device::device_reset() // vic20_cd_r - cartridge data read //------------------------------------------------- -uint8_t vic20_video_pak_device::vic20_cd_r(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) +uint8_t vic20_video_pak_device::vic20_cd_r(offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) { if (!m_ram_enable) { @@ -221,7 +221,7 @@ uint8_t vic20_video_pak_device::vic20_cd_r(address_space &space, offs_t offset, { if (offset == 0x1bf9) { - data = m_crtc->register_r(space, 0); + data = m_crtc->register_r(machine().dummy_space(), 0); } } @@ -233,7 +233,7 @@ uint8_t vic20_video_pak_device::vic20_cd_r(address_space &space, offs_t offset, // vic20_cd_w - cartridge data write //------------------------------------------------- -void vic20_video_pak_device::vic20_cd_w(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) +void vic20_video_pak_device::vic20_cd_w(offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) { if (!m_ram_enable) { @@ -293,11 +293,11 @@ void vic20_video_pak_device::vic20_cd_w(address_space &space, offs_t offset, uin switch (offset) { case 0x1bf8: - m_crtc->address_w(space, 0, data); + m_crtc->address_w(machine().dummy_space(), 0, data); break; case 0x1bf9: - m_crtc->register_w(space, 0, data); + m_crtc->register_w(machine().dummy_space(), 0, data); break; case 0x1bfc: diff --git a/src/devices/bus/vic20/videopak.h b/src/devices/bus/vic20/videopak.h index def121f2c55..084e57689dc 100644 --- a/src/devices/bus/vic20/videopak.h +++ b/src/devices/bus/vic20/videopak.h @@ -42,8 +42,8 @@ protected: virtual void device_add_mconfig(machine_config &config) override; // device_vic20_expansion_card_interface overrides - virtual uint8_t vic20_cd_r(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override; - virtual void vic20_cd_w(address_space &space, offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override; + virtual uint8_t vic20_cd_r(offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override; + virtual void vic20_cd_w(offs_t offset, uint8_t data, int ram1, int ram2, int ram3, int blk1, int blk2, int blk3, int blk5, int io2, int io3) override; private: MC6845_UPDATE_ROW( crtc_update_row ); |
