From f95267bf5e215e0f140407fecaf7c16c7da90f81 Mon Sep 17 00:00:00 2001 From: AJR Date: Thu, 21 May 2020 22:38:18 -0400 Subject: Various buses and associated drivers: Simplify handler signatures (nw) --- src/devices/bus/a7800/a78_slot.cpp | 32 +++--- src/devices/bus/a7800/a78_slot.h | 32 +++--- src/devices/bus/a7800/cpuwiz.cpp | 6 +- src/devices/bus/a7800/cpuwiz.h | 10 +- src/devices/bus/a7800/hiscore.cpp | 22 ++-- src/devices/bus/a7800/hiscore.h | 14 +-- src/devices/bus/a7800/rom.cpp | 34 +++--- src/devices/bus/a7800/rom.h | 50 ++++----- src/devices/bus/a7800/xboard.cpp | 30 +++--- src/devices/bus/a7800/xboard.h | 18 ++-- src/devices/bus/a800/a800_slot.cpp | 16 +-- src/devices/bus/a800/a800_slot.h | 16 +-- src/devices/bus/a800/a8sio.cpp | 2 +- src/devices/bus/a800/a8sio.h | 2 +- src/devices/bus/a800/oss.cpp | 16 +-- src/devices/bus/a800/oss.h | 16 +-- src/devices/bus/a800/rom.cpp | 40 +++---- src/devices/bus/a800/rom.h | 42 ++++---- src/devices/bus/a800/sparta.cpp | 4 +- src/devices/bus/a800/sparta.h | 4 +- src/devices/bus/abcbus/abcbus.h | 20 ++-- src/devices/bus/abcbus/lux10828.cpp | 11 +- src/devices/bus/abcbus/lux10828.h | 8 +- src/devices/bus/abcbus/lux21046.cpp | 21 ++-- src/devices/bus/abcbus/lux21046.h | 12 +-- src/devices/bus/abcbus/lux21056.cpp | 33 +++--- src/devices/bus/abcbus/lux21056.h | 24 ++--- src/devices/bus/apf/rom.cpp | 8 +- src/devices/bus/apf/rom.h | 8 +- src/devices/bus/apf/slot.cpp | 16 +-- src/devices/bus/apf/slot.h | 16 +-- src/devices/bus/arcadia/rom.cpp | 4 +- src/devices/bus/arcadia/rom.h | 4 +- src/devices/bus/arcadia/slot.cpp | 8 +- src/devices/bus/arcadia/slot.h | 8 +- src/devices/bus/astrocde/exp.cpp | 16 +-- src/devices/bus/astrocde/exp.h | 16 +-- src/devices/bus/astrocde/ram.cpp | 20 ++-- src/devices/bus/astrocde/ram.h | 20 ++-- src/devices/bus/astrocde/rom.cpp | 8 +- src/devices/bus/astrocde/rom.h | 8 +- src/devices/bus/astrocde/slot.cpp | 4 +- src/devices/bus/astrocde/slot.h | 4 +- src/devices/bus/bml3/bml3kanji.cpp | 6 +- src/devices/bus/bml3/bml3kanji.h | 4 +- src/devices/bus/bml3/bml3mp1802.cpp | 6 +- src/devices/bus/bml3/bml3mp1802.h | 4 +- src/devices/bus/bml3/bml3mp1805.cpp | 6 +- src/devices/bus/bml3/bml3mp1805.h | 4 +- src/devices/bus/bml3/bml3rtc.cpp | 6 +- src/devices/bus/bml3/bml3rtc.h | 4 +- src/devices/bus/cgenie/expansion/floppy.cpp | 14 +-- src/devices/bus/cgenie/expansion/floppy.h | 6 +- src/devices/bus/chanf/rom.cpp | 10 +- src/devices/bus/chanf/rom.h | 30 +++--- src/devices/bus/chanf/slot.cpp | 16 +-- src/devices/bus/chanf/slot.h | 16 +-- src/devices/bus/crvision/rom.cpp | 20 ++-- src/devices/bus/crvision/rom.h | 20 ++-- src/devices/bus/crvision/slot.cpp | 8 +- src/devices/bus/crvision/slot.h | 8 +- src/devices/bus/ecbbus/ecbbus.cpp | 8 +- src/devices/bus/ecbbus/ecbbus.h | 8 +- src/devices/bus/ecbbus/grip.cpp | 36 ++++--- src/devices/bus/ecbbus/grip.h | 22 ++-- src/devices/bus/econet/e01.cpp | 44 ++++---- src/devices/bus/econet/e01.h | 32 +++--- src/devices/bus/einstein/pipe/silicon_disc.cpp | 12 +-- src/devices/bus/einstein/pipe/silicon_disc.h | 8 +- src/devices/bus/einstein/pipe/speculator.cpp | 22 ++-- src/devices/bus/einstein/pipe/speculator.h | 8 +- src/devices/bus/einstein/pipe/tk02.cpp | 8 +- src/devices/bus/einstein/pipe/tk02.h | 6 +- src/devices/bus/ekara/rom.cpp | 26 ++--- src/devices/bus/ekara/rom.h | 26 ++--- src/devices/bus/ekara/slot.cpp | 20 ++-- src/devices/bus/ekara/slot.h | 32 +++--- src/devices/bus/gamate/rom.cpp | 20 ++-- src/devices/bus/gamate/rom.h | 16 +-- src/devices/bus/gamate/slot.cpp | 8 +- src/devices/bus/gamate/slot.h | 8 +- src/devices/bus/jakks_gamekey/rom.cpp | 20 ++-- src/devices/bus/jakks_gamekey/rom.h | 12 +-- src/devices/bus/jakks_gamekey/slot.cpp | 8 +- src/devices/bus/jakks_gamekey/slot.h | 8 +- src/devices/bus/m5/rom.cpp | 6 +- src/devices/bus/m5/rom.h | 6 +- src/devices/bus/m5/slot.cpp | 12 +-- src/devices/bus/m5/slot.h | 12 +-- src/devices/bus/mtx/sdx.cpp | 14 +-- src/devices/bus/mtx/sdx.h | 8 +- src/devices/bus/nasbus/avc.cpp | 10 +- src/devices/bus/nasbus/avc.h | 6 +- src/devices/bus/nasbus/floppy.cpp | 10 +- src/devices/bus/nasbus/floppy.h | 6 +- src/devices/bus/newbrain/eim.cpp | 8 +- src/devices/bus/newbrain/eim.h | 8 +- src/devices/bus/odyssey2/rom.cpp | 12 +-- src/devices/bus/odyssey2/rom.h | 12 +-- src/devices/bus/odyssey2/slot.cpp | 12 +-- src/devices/bus/odyssey2/slot.h | 12 +-- src/devices/bus/odyssey2/voice.cpp | 2 +- src/devices/bus/odyssey2/voice.h | 6 +- src/devices/bus/oricext/microdisc.cpp | 6 +- src/devices/bus/oricext/microdisc.h | 6 +- src/devices/bus/pc_kbd/iskr1030.cpp | 4 +- src/devices/bus/pc_kbd/iskr1030.h | 4 +- src/devices/bus/pc_kbd/keytro.cpp | 4 +- src/devices/bus/pc_kbd/keytro.h | 4 +- src/devices/bus/pce/pce_rom.cpp | 18 ++-- src/devices/bus/pce/pce_rom.h | 18 ++-- src/devices/bus/pce/pce_slot.cpp | 8 +- src/devices/bus/pce/pce_slot.h | 8 +- src/devices/bus/scv/rom.cpp | 18 ++-- src/devices/bus/scv/rom.h | 18 ++-- src/devices/bus/scv/slot.cpp | 8 +- src/devices/bus/scv/slot.h | 10 +- src/devices/bus/spc1000/exp.cpp | 8 +- src/devices/bus/spc1000/exp.h | 8 +- src/devices/bus/spc1000/fdd.cpp | 19 ++-- src/devices/bus/spc1000/fdd.h | 8 +- src/devices/bus/spc1000/vdp.cpp | 4 +- src/devices/bus/spc1000/vdp.h | 4 +- src/devices/bus/tvc/hbf.cpp | 8 +- src/devices/bus/tvc/hbf.h | 8 +- src/devices/bus/tvc/tvc.cpp | 16 +-- src/devices/bus/tvc/tvc.h | 22 ++-- src/devices/bus/vectrex/rom.cpp | 6 +- src/devices/bus/vectrex/rom.h | 6 +- src/devices/bus/vectrex/slot.cpp | 8 +- src/devices/bus/vectrex/slot.h | 10 +- src/devices/bus/vsmile/rom.cpp | 6 +- src/devices/bus/vsmile/rom.h | 12 +-- src/devices/bus/vsmile/vsmile_slot.cpp | 32 +++--- src/devices/bus/vsmile/vsmile_slot.h | 32 +++--- src/devices/bus/vtech/ioexp/joystick.cpp | 4 +- src/devices/bus/vtech/ioexp/joystick.h | 2 +- src/devices/bus/vtech/ioexp/printer.cpp | 8 +- src/devices/bus/vtech/ioexp/printer.h | 4 +- src/devices/bus/vtech/memexp/floppy.cpp | 17 +-- src/devices/bus/vtech/memexp/floppy.h | 8 +- src/devices/bus/vtech/memexp/memory.cpp | 4 +- src/devices/bus/vtech/memexp/memory.h | 2 +- src/devices/bus/vtech/memexp/rs232.cpp | 8 +- src/devices/bus/vtech/memexp/rs232.h | 4 +- src/devices/bus/vtech/memexp/rtty.cpp | 12 +-- src/devices/bus/vtech/memexp/rtty.h | 6 +- src/devices/bus/z88/flash.cpp | 4 +- src/devices/bus/z88/flash.h | 4 +- src/devices/bus/z88/ram.cpp | 4 +- src/devices/bus/z88/ram.h | 4 +- src/devices/bus/z88/rom.cpp | 2 +- src/devices/bus/z88/rom.h | 2 +- src/devices/bus/z88/z88.cpp | 8 +- src/devices/bus/z88/z88.h | 10 +- src/mame/drivers/a7800.cpp | 18 ++-- src/mame/drivers/abc80.cpp | 30 +++--- src/mame/drivers/abc80x.cpp | 35 ++++--- src/mame/drivers/apf.cpp | 4 +- src/mame/drivers/arcadia.cpp | 4 +- src/mame/drivers/astrohome.cpp | 6 +- src/mame/drivers/atari400.cpp | 139 +++++++++++++------------ src/mame/drivers/channelf.cpp | 10 +- src/mame/drivers/crvision.cpp | 4 +- src/mame/drivers/gamate.cpp | 39 +++---- src/mame/drivers/m5.cpp | 14 +-- src/mame/drivers/odyssey2.cpp | 20 ++-- src/mame/drivers/tvc.cpp | 69 ++++++------ src/mame/drivers/z88.cpp | 24 ++--- src/mame/includes/abc80.h | 18 ++-- src/mame/includes/abc80x.h | 44 ++++---- src/mame/includes/xavix.h | 18 ++-- src/mame/includes/z88.h | 16 +-- src/mame/machine/vectrex.cpp | 4 +- src/mame/video/abc800.cpp | 4 +- src/mame/video/abc806.cpp | 24 +++-- 176 files changed, 1253 insertions(+), 1230 deletions(-) diff --git a/src/devices/bus/a7800/a78_slot.cpp b/src/devices/bus/a7800/a78_slot.cpp index 0d2182a5e84..1103c177822 100644 --- a/src/devices/bus/a7800/a78_slot.cpp +++ b/src/devices/bus/a7800/a78_slot.cpp @@ -573,34 +573,34 @@ std::string a78_cart_slot_device::get_default_card_software(get_default_card_sof read -------------------------------------------------*/ -READ8_MEMBER(a78_cart_slot_device::read_04xx) +uint8_t a78_cart_slot_device::read_04xx(offs_t offset) { if (m_cart) - return m_cart->read_04xx(space, offset, mem_mask); + return m_cart->read_04xx(offset); else return 0xff; } -READ8_MEMBER(a78_cart_slot_device::read_10xx) +uint8_t a78_cart_slot_device::read_10xx(offs_t offset) { if (m_cart) - return m_cart->read_10xx(space, offset, mem_mask); + return m_cart->read_10xx(offset); else return 0xff; } -READ8_MEMBER(a78_cart_slot_device::read_30xx) +uint8_t a78_cart_slot_device::read_30xx(offs_t offset) { if (m_cart) - return m_cart->read_30xx(space, offset, mem_mask); + return m_cart->read_30xx(offset); else return 0xff; } -READ8_MEMBER(a78_cart_slot_device::read_40xx) +uint8_t a78_cart_slot_device::read_40xx(offs_t offset) { if (m_cart) - return m_cart->read_40xx(space, offset, mem_mask); + return m_cart->read_40xx(offset); else return 0xff; } @@ -610,28 +610,28 @@ READ8_MEMBER(a78_cart_slot_device::read_40xx) write -------------------------------------------------*/ -WRITE8_MEMBER(a78_cart_slot_device::write_04xx) +void a78_cart_slot_device::write_04xx(offs_t offset, uint8_t data) { if (m_cart) - m_cart->write_04xx(space, offset, data, mem_mask); + m_cart->write_04xx(offset, data); } -WRITE8_MEMBER(a78_cart_slot_device::write_10xx) +void a78_cart_slot_device::write_10xx(offs_t offset, uint8_t data) { if (m_cart) - m_cart->write_10xx(space, offset, data, mem_mask); + m_cart->write_10xx(offset, data); } -WRITE8_MEMBER(a78_cart_slot_device::write_30xx) +void a78_cart_slot_device::write_30xx(offs_t offset, uint8_t data) { if (m_cart) - m_cart->write_30xx(space, offset, data, mem_mask); + m_cart->write_30xx(offset, data); } -WRITE8_MEMBER(a78_cart_slot_device::write_40xx) +void a78_cart_slot_device::write_40xx(offs_t offset, uint8_t data) { if (m_cart) - m_cart->write_40xx(space, offset, data, mem_mask); + m_cart->write_40xx(offset, data); } diff --git a/src/devices/bus/a7800/a78_slot.h b/src/devices/bus/a7800/a78_slot.h index 52c201c5a6e..6b379e72609 100644 --- a/src/devices/bus/a7800/a78_slot.h +++ b/src/devices/bus/a7800/a78_slot.h @@ -49,14 +49,14 @@ public: virtual ~device_a78_cart_interface(); // memory accessor - virtual DECLARE_READ8_MEMBER(read_04xx) { return 0xff; } - virtual DECLARE_READ8_MEMBER(read_10xx) { return 0xff; } - virtual DECLARE_READ8_MEMBER(read_30xx) { return 0xff; } - virtual DECLARE_READ8_MEMBER(read_40xx) { return 0xff; } - virtual DECLARE_WRITE8_MEMBER(write_04xx) {} - virtual DECLARE_WRITE8_MEMBER(write_10xx) {} - virtual DECLARE_WRITE8_MEMBER(write_30xx) {} - virtual DECLARE_WRITE8_MEMBER(write_40xx) {} + virtual uint8_t read_04xx(offs_t offset) { return 0xff; } + virtual uint8_t read_10xx(offs_t offset) { return 0xff; } + virtual uint8_t read_30xx(offs_t offset) { return 0xff; } + virtual uint8_t read_40xx(offs_t offset) { return 0xff; } + virtual void write_04xx(offs_t offset, uint8_t data) {} + virtual void write_10xx(offs_t offset, uint8_t data) {} + virtual void write_30xx(offs_t offset, uint8_t data) {} + virtual void write_40xx(offs_t offset, uint8_t data) {} void rom_alloc(uint32_t size, const char *tag); void ram_alloc(uint32_t size); @@ -123,14 +123,14 @@ public: bool has_cart() { return m_cart != nullptr; } // reading and writing - virtual DECLARE_READ8_MEMBER(read_04xx); - virtual DECLARE_READ8_MEMBER(read_10xx); - virtual DECLARE_READ8_MEMBER(read_30xx); - virtual DECLARE_READ8_MEMBER(read_40xx); - virtual DECLARE_WRITE8_MEMBER(write_04xx); - virtual DECLARE_WRITE8_MEMBER(write_10xx); - virtual DECLARE_WRITE8_MEMBER(write_30xx); - virtual DECLARE_WRITE8_MEMBER(write_40xx); + uint8_t read_04xx(offs_t offset); + uint8_t read_10xx(offs_t offset); + uint8_t read_30xx(offs_t offset); + uint8_t read_40xx(offs_t offset); + void write_04xx(offs_t offset, uint8_t data); + void write_10xx(offs_t offset, uint8_t data); + void write_30xx(offs_t offset, uint8_t data); + void write_40xx(offs_t offset, uint8_t data); private: // device-level overrides diff --git a/src/devices/bus/a7800/cpuwiz.cpp b/src/devices/bus/a7800/cpuwiz.cpp index 0b76f7b2233..3a8c3cc1546 100644 --- a/src/devices/bus/a7800/cpuwiz.cpp +++ b/src/devices/bus/a7800/cpuwiz.cpp @@ -80,7 +80,7 @@ void a78_versaboard_device::device_reset() // VersaBoard -READ8_MEMBER(a78_versaboard_device::read_40xx) +uint8_t a78_versaboard_device::read_40xx(offs_t offset) { if (offset < 0x4000) return m_ram[offset + (m_ram_bank * 0x4000)]; @@ -90,7 +90,7 @@ READ8_MEMBER(a78_versaboard_device::read_40xx) return m_rom[(offset & 0x3fff) + (m_bank_mask * 0x4000)]; // last bank } -WRITE8_MEMBER(a78_versaboard_device::write_40xx) +void a78_versaboard_device::write_40xx(offs_t offset, uint8_t data) { if (offset < 0x4000) m_ram[offset + (m_ram_bank * 0x4000)] = data; @@ -105,7 +105,7 @@ WRITE8_MEMBER(a78_versaboard_device::write_40xx) // MegaCart+ -WRITE8_MEMBER(a78_megacart_device::write_40xx) +void a78_megacart_device::write_40xx(offs_t offset, uint8_t data) { if (offset < 0x4000) m_ram[offset + (m_ram_bank * 0x4000)] = data; diff --git a/src/devices/bus/a7800/cpuwiz.h b/src/devices/bus/a7800/cpuwiz.h index e9f52a24d4f..e55c637592f 100644 --- a/src/devices/bus/a7800/cpuwiz.h +++ b/src/devices/bus/a7800/cpuwiz.h @@ -22,8 +22,8 @@ public: virtual void device_reset() override; // reading and writing - virtual DECLARE_READ8_MEMBER(read_40xx) override; - virtual DECLARE_WRITE8_MEMBER(write_40xx) override; + virtual uint8_t read_40xx(offs_t offset) override; + virtual void write_40xx(offs_t offset, uint8_t data) override; protected: a78_versaboard_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -41,7 +41,7 @@ public: a78_megacart_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_WRITE8_MEMBER(write_40xx) override; + virtual void write_40xx(offs_t offset, uint8_t data) override; }; @@ -56,8 +56,8 @@ public: a78_rom_p450_vb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_04xx) override { if (offset >= 0x50 && offset < 0x60) return m_pokey450->read(offset & 0x0f); else return 0xff; } - virtual DECLARE_WRITE8_MEMBER(write_04xx) override { if (offset >= 0x50 && offset < 0x60) m_pokey450->write(offset & 0x0f, data); } + virtual uint8_t read_04xx(offs_t offset) override { if (offset >= 0x50 && offset < 0x60) return m_pokey450->read(offset & 0x0f); else return 0xff; } + virtual void write_04xx(offs_t offset, uint8_t data) override { if (offset >= 0x50 && offset < 0x60) m_pokey450->write(offset & 0x0f, data); } protected: virtual void device_add_mconfig(machine_config &config) override; diff --git a/src/devices/bus/a7800/hiscore.cpp b/src/devices/bus/a7800/hiscore.cpp index 62630842e5c..a0c821552d8 100644 --- a/src/devices/bus/a7800/hiscore.cpp +++ b/src/devices/bus/a7800/hiscore.cpp @@ -37,37 +37,37 @@ void a78_hiscore_device::device_add_mconfig(machine_config &config) mapper specific handlers -------------------------------------------------*/ -READ8_MEMBER(a78_hiscore_device::read_10xx) +uint8_t a78_hiscore_device::read_10xx(offs_t offset) { return m_nvram[offset]; } -WRITE8_MEMBER(a78_hiscore_device::write_10xx) +void a78_hiscore_device::write_10xx(offs_t offset, uint8_t data) { m_nvram[offset] = data; } -READ8_MEMBER(a78_hiscore_device::read_30xx) +uint8_t a78_hiscore_device::read_30xx(offs_t offset) { return m_rom[offset]; } -READ8_MEMBER(a78_hiscore_device::read_04xx) +uint8_t a78_hiscore_device::read_04xx(offs_t offset) { - return m_hscslot->read_04xx(space, offset); + return m_hscslot->read_04xx(offset); } -WRITE8_MEMBER(a78_hiscore_device::write_04xx) +void a78_hiscore_device::write_04xx(offs_t offset, uint8_t data) { - m_hscslot->write_04xx(space, offset, data); + m_hscslot->write_04xx(offset, data); } -READ8_MEMBER(a78_hiscore_device::read_40xx) +uint8_t a78_hiscore_device::read_40xx(offs_t offset) { - return m_hscslot->read_40xx(space, offset); + return m_hscslot->read_40xx(offset); } -WRITE8_MEMBER(a78_hiscore_device::write_40xx) +void a78_hiscore_device::write_40xx(offs_t offset, uint8_t data) { - m_hscslot->write_40xx(space, offset, data); + m_hscslot->write_40xx(offset, data); } diff --git a/src/devices/bus/a7800/hiscore.h b/src/devices/bus/a7800/hiscore.h index b26bea473db..b9dc9674212 100644 --- a/src/devices/bus/a7800/hiscore.h +++ b/src/devices/bus/a7800/hiscore.h @@ -18,13 +18,13 @@ public: a78_hiscore_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_04xx) override; - virtual DECLARE_WRITE8_MEMBER(write_04xx) override; - virtual DECLARE_READ8_MEMBER(read_10xx) override; - virtual DECLARE_WRITE8_MEMBER(write_10xx) override; - virtual DECLARE_READ8_MEMBER(read_30xx) override; - virtual DECLARE_READ8_MEMBER(read_40xx) override; - virtual DECLARE_WRITE8_MEMBER(write_40xx) override; + virtual uint8_t read_04xx(offs_t offset) override; + virtual void write_04xx(offs_t offset, uint8_t data) override; + virtual uint8_t read_10xx(offs_t offset) override; + virtual void write_10xx(offs_t offset, uint8_t data) override; + virtual uint8_t read_30xx(offs_t offset) override; + virtual uint8_t read_40xx(offs_t offset) override; + virtual void write_40xx(offs_t offset, uint8_t data) override; protected: virtual void device_add_mconfig(machine_config &config) override; diff --git a/src/devices/bus/a7800/rom.cpp b/src/devices/bus/a7800/rom.cpp index 362902dbe51..9e715ddcf2c 100644 --- a/src/devices/bus/a7800/rom.cpp +++ b/src/devices/bus/a7800/rom.cpp @@ -208,7 +208,7 @@ void a78_rom_act_device::device_reset() -------------------------------------------------*/ -READ8_MEMBER(a78_rom_device::read_40xx) +uint8_t a78_rom_device::read_40xx(offs_t offset) { if (offset + 0x4000 < m_base_rom) return 0xff; @@ -226,7 +226,7 @@ READ8_MEMBER(a78_rom_device::read_40xx) -------------------------------------------------*/ -READ8_MEMBER(a78_rom_pokey_device::read_40xx) +uint8_t a78_rom_pokey_device::read_40xx(offs_t offset) { if (offset < 0x4000) return m_pokey->read(offset & 0x0f); @@ -237,7 +237,7 @@ READ8_MEMBER(a78_rom_pokey_device::read_40xx) return m_rom[offset + 0x4000 - m_base_rom]; } -WRITE8_MEMBER(a78_rom_pokey_device::write_40xx) +void a78_rom_pokey_device::write_40xx(offs_t offset, uint8_t data) { if (offset < 0x4000) m_pokey->write(offset & 0x0f, data); @@ -264,7 +264,7 @@ void a78_rom_pokey_device::device_add_mconfig(machine_config &config) -------------------------------------------------*/ -READ8_MEMBER(a78_rom_mram_device::read_40xx) +uint8_t a78_rom_mram_device::read_40xx(offs_t offset) { if (offset < 0x4000) return m_ram[offset & 0xfeff]; @@ -274,7 +274,7 @@ READ8_MEMBER(a78_rom_mram_device::read_40xx) return m_rom[offset + 0x4000 - m_base_rom]; } -WRITE8_MEMBER(a78_rom_mram_device::write_40xx) +void a78_rom_mram_device::write_40xx(offs_t offset, uint8_t data) { if (offset < 0x4000) m_ram[offset&0xfeff] = data; @@ -298,7 +298,7 @@ WRITE8_MEMBER(a78_rom_mram_device::write_40xx) -------------------------------------------------*/ -READ8_MEMBER(a78_rom_sg_device::read_40xx) +uint8_t a78_rom_sg_device::read_40xx(offs_t offset) { if (offset < 0x4000) return m_rom[(offset & 0x3fff) + ((m_bank_mask - 1) * 0x4000)]; // second to last bank (is this always ok?!?) @@ -308,7 +308,7 @@ READ8_MEMBER(a78_rom_sg_device::read_40xx) return m_rom[(offset & 0x3fff) + (m_bank_mask * 0x4000)]; // last bank } -WRITE8_MEMBER(a78_rom_sg_device::write_40xx) +void a78_rom_sg_device::write_40xx(offs_t offset, uint8_t data) { if (offset >= 0x4000 && offset < 0x8000) m_bank = data & m_bank_mask; @@ -324,7 +324,7 @@ WRITE8_MEMBER(a78_rom_sg_device::write_40xx) -------------------------------------------------*/ -READ8_MEMBER(a78_rom_sg_pokey_device::read_40xx) +uint8_t a78_rom_sg_pokey_device::read_40xx(offs_t offset) { if (offset < 0x4000) return m_pokey->read(offset & 0x0f); @@ -334,7 +334,7 @@ READ8_MEMBER(a78_rom_sg_pokey_device::read_40xx) return m_rom[(offset & 0x3fff) + (m_bank_mask * 0x4000)]; // last bank } -WRITE8_MEMBER(a78_rom_sg_pokey_device::write_40xx) +void a78_rom_sg_pokey_device::write_40xx(offs_t offset, uint8_t data) { if (offset < 0x4000) m_pokey->write(offset & 0x0f, data); @@ -361,7 +361,7 @@ void a78_rom_sg_pokey_device::device_add_mconfig(machine_config &config) -------------------------------------------------*/ -READ8_MEMBER(a78_rom_sg_ram_device::read_40xx) +uint8_t a78_rom_sg_ram_device::read_40xx(offs_t offset) { if (offset < 0x4000) return m_ram[offset]; @@ -371,7 +371,7 @@ READ8_MEMBER(a78_rom_sg_ram_device::read_40xx) return m_rom[(offset & 0x3fff) + (m_bank_mask * 0x4000)]; // last bank } -WRITE8_MEMBER(a78_rom_sg_ram_device::write_40xx) +void a78_rom_sg_ram_device::write_40xx(offs_t offset, uint8_t data) { if (offset < 0x4000) m_ram[offset] = data; @@ -392,7 +392,7 @@ WRITE8_MEMBER(a78_rom_sg_ram_device::write_40xx) -------------------------------------------------*/ -READ8_MEMBER(a78_rom_sg9_device::read_40xx) +uint8_t a78_rom_sg9_device::read_40xx(offs_t offset) { if (offset < 0x4000) return m_rom[(offset & 0x3fff)]; @@ -402,7 +402,7 @@ READ8_MEMBER(a78_rom_sg9_device::read_40xx) return m_rom[(offset & 0x3fff) + ((m_bank_mask + 1) * 0x4000)]; // last bank } -WRITE8_MEMBER(a78_rom_sg9_device::write_40xx) +void a78_rom_sg9_device::write_40xx(offs_t offset, uint8_t data) { if (offset >= 0x4000 && offset < 0x8000) m_bank = (data & m_bank_mask) + 1; @@ -419,7 +419,7 @@ WRITE8_MEMBER(a78_rom_sg9_device::write_40xx) -------------------------------------------------*/ -READ8_MEMBER(a78_rom_abs_device::read_40xx) +uint8_t a78_rom_abs_device::read_40xx(offs_t offset) { if (offset < 0x4000) return m_rom[(offset & 0x3fff) + (m_bank * 0x4000)]; @@ -430,7 +430,7 @@ READ8_MEMBER(a78_rom_abs_device::read_40xx) } } -WRITE8_MEMBER(a78_rom_abs_device::write_40xx) +void a78_rom_abs_device::write_40xx(offs_t offset, uint8_t data) { if (offset == 0x4000) { @@ -457,7 +457,7 @@ WRITE8_MEMBER(a78_rom_abs_device::write_40xx) -------------------------------------------------*/ -READ8_MEMBER(a78_rom_act_device::read_40xx) +uint8_t a78_rom_act_device::read_40xx(offs_t offset) { uint8_t data = 0xff; uint16_t addr = offset & 0x1fff; @@ -488,7 +488,7 @@ READ8_MEMBER(a78_rom_act_device::read_40xx) return data; } -WRITE8_MEMBER(a78_rom_act_device::write_40xx) +void a78_rom_act_device::write_40xx(offs_t offset, uint8_t data) { if (offset >= 0xbf80 && offset <= 0xbf8f) m_bank = offset & 7; diff --git a/src/devices/bus/a7800/rom.h b/src/devices/bus/a7800/rom.h index 1ad27663b6f..8237b07c8ac 100644 --- a/src/devices/bus/a7800/rom.h +++ b/src/devices/bus/a7800/rom.h @@ -19,7 +19,7 @@ public: a78_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_40xx) override; + virtual uint8_t read_40xx(offs_t offset) override; protected: a78_rom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -39,8 +39,8 @@ public: a78_rom_pokey_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_40xx) override; - virtual DECLARE_WRITE8_MEMBER(write_40xx) override; + virtual uint8_t read_40xx(offs_t offset) override; + virtual void write_40xx(offs_t offset, uint8_t data) override; protected: a78_rom_pokey_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -60,8 +60,8 @@ public: a78_rom_mram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_40xx) override; - virtual DECLARE_WRITE8_MEMBER(write_40xx) override; + virtual uint8_t read_40xx(offs_t offset) override; + virtual void write_40xx(offs_t offset, uint8_t data) override; protected: a78_rom_mram_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -77,8 +77,8 @@ public: a78_rom_sg_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_40xx) override; - virtual DECLARE_WRITE8_MEMBER(write_40xx) override; + virtual uint8_t read_40xx(offs_t offset) override; + virtual void write_40xx(offs_t offset, uint8_t data) override; protected: a78_rom_sg_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -100,8 +100,8 @@ public: a78_rom_sg_pokey_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_40xx) override; - virtual DECLARE_WRITE8_MEMBER(write_40xx) override; + virtual uint8_t read_40xx(offs_t offset) override; + virtual void write_40xx(offs_t offset, uint8_t data) override; protected: virtual void device_add_mconfig(machine_config &config) override; @@ -119,8 +119,8 @@ public: a78_rom_sg_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_40xx) override; - virtual DECLARE_WRITE8_MEMBER(write_40xx) override; + virtual uint8_t read_40xx(offs_t offset) override; + virtual void write_40xx(offs_t offset, uint8_t data) override; protected: a78_rom_sg_ram_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -136,8 +136,8 @@ public: a78_rom_sg9_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_40xx) override; - virtual DECLARE_WRITE8_MEMBER(write_40xx) override; + virtual uint8_t read_40xx(offs_t offset) override; + virtual void write_40xx(offs_t offset, uint8_t data) override; protected: a78_rom_sg9_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -153,8 +153,8 @@ public: a78_rom_abs_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_40xx) override; - virtual DECLARE_WRITE8_MEMBER(write_40xx) override; + virtual uint8_t read_40xx(offs_t offset) override; + virtual void write_40xx(offs_t offset, uint8_t data) override; protected: // device-level overrides @@ -174,8 +174,8 @@ public: a78_rom_act_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_40xx) override; - virtual DECLARE_WRITE8_MEMBER(write_40xx) override; + virtual uint8_t read_40xx(offs_t offset) override; + virtual void write_40xx(offs_t offset, uint8_t data) override; protected: // device-level overrides @@ -197,8 +197,8 @@ public: a78_rom_p450_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_04xx) override { if (offset >= 0x50 && offset < 0x60) return m_pokey450->read(offset & 0x0f); else return 0xff; } - virtual DECLARE_WRITE8_MEMBER(write_04xx) override { if (offset >= 0x50 && offset < 0x60) m_pokey450->write(offset & 0x0f, data); } + virtual uint8_t read_04xx(offs_t offset) override { if (offset >= 0x50 && offset < 0x60) return m_pokey450->read(offset & 0x0f); else return 0xff; } + virtual void write_04xx(offs_t offset, uint8_t data) override { if (offset >= 0x50 && offset < 0x60) m_pokey450->write(offset & 0x0f, data); } protected: virtual void device_add_mconfig(machine_config &config) override; @@ -216,8 +216,8 @@ public: a78_rom_p450_pokey_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_04xx) override { if (offset >= 0x50 && offset < 0x60) return m_pokey450->read(offset & 0x0f); else return 0xff; } - virtual DECLARE_WRITE8_MEMBER(write_04xx) override { if (offset >= 0x50 && offset < 0x60) m_pokey450->write(offset & 0x0f, data); } + virtual uint8_t read_04xx(offs_t offset) override { if (offset >= 0x50 && offset < 0x60) return m_pokey450->read(offset & 0x0f); else return 0xff; } + virtual void write_04xx(offs_t offset, uint8_t data) override { if (offset >= 0x50 && offset < 0x60) m_pokey450->write(offset & 0x0f, data); } protected: virtual void device_add_mconfig(machine_config &config) override; @@ -235,8 +235,8 @@ public: a78_rom_p450_sg_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_04xx) override { if (offset >= 0x50 && offset < 0x60) return m_pokey450->read(offset & 0x0f); else return 0xff; } - virtual DECLARE_WRITE8_MEMBER(write_04xx) override { if (offset >= 0x50 && offset < 0x60) m_pokey450->write(offset & 0x0f, data); } + virtual uint8_t read_04xx(offs_t offset) override { if (offset >= 0x50 && offset < 0x60) return m_pokey450->read(offset & 0x0f); else return 0xff; } + virtual void write_04xx(offs_t offset, uint8_t data) override { if (offset >= 0x50 && offset < 0x60) m_pokey450->write(offset & 0x0f, data); } protected: virtual void device_add_mconfig(machine_config &config) override; @@ -254,8 +254,8 @@ public: a78_rom_p450_sg9_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_04xx) override { if (offset >= 0x50 && offset < 0x60) return m_pokey450->read(offset & 0x0f); else return 0xff; } - virtual DECLARE_WRITE8_MEMBER(write_04xx) override { if (offset >= 0x50 && offset < 0x60) m_pokey450->write(offset & 0x0f, data); } + virtual uint8_t read_04xx(offs_t offset) override { if (offset >= 0x50 && offset < 0x60) return m_pokey450->read(offset & 0x0f); else return 0xff; } + virtual void write_04xx(offs_t offset, uint8_t data) override { if (offset >= 0x50 && offset < 0x60) m_pokey450->write(offset & 0x0f, data); } protected: virtual void device_add_mconfig(machine_config &config) override; diff --git a/src/devices/bus/a7800/xboard.cpp b/src/devices/bus/a7800/xboard.cpp index 0005e595a88..bee85d76c98 100644 --- a/src/devices/bus/a7800/xboard.cpp +++ b/src/devices/bus/a7800/xboard.cpp @@ -139,38 +139,38 @@ void a78_xm_device::device_add_mconfig(machine_config &config) -------------------------------------------------*/ -READ8_MEMBER(a78_xboard_device::read_40xx) +uint8_t a78_xboard_device::read_40xx(offs_t offset) { if (BIT(m_reg, 3) && offset < 0x4000) return m_ram[offset + (m_ram_bank * 0x4000)]; else - return m_xbslot->read_40xx(space, offset); + return m_xbslot->read_40xx(offset); } -WRITE8_MEMBER(a78_xboard_device::write_40xx) +void a78_xboard_device::write_40xx(offs_t offset, uint8_t data) { if (BIT(m_reg, 3) && offset < 0x4000) m_ram[offset + (m_ram_bank * 0x4000)] = data; else - m_xbslot->write_40xx(space, offset, data); + m_xbslot->write_40xx(offset, data); } -READ8_MEMBER(a78_xboard_device::read_04xx) +uint8_t a78_xboard_device::read_04xx(offs_t offset) { if (BIT(m_reg, 4) && offset >= 0x50 && offset < 0x60) return m_pokey->read(offset & 0x0f); else if (BIT(m_reg, 4) && offset >= 0x60 && offset < 0x70) - return m_xbslot->read_04xx(space, offset - 0x10); // access second POKEY + return m_xbslot->read_04xx(offset - 0x10); // access second POKEY else return 0xff; } -WRITE8_MEMBER(a78_xboard_device::write_04xx) +void a78_xboard_device::write_04xx(offs_t offset, uint8_t data) { if (BIT(m_reg, 4) && offset >= 0x50 && offset < 0x60) m_pokey->write(offset & 0x0f, data); else if (BIT(m_reg, 4) && offset >= 0x60 && offset < 0x70) - m_xbslot->write_04xx(space, offset - 0x10, data); // access second POKEY + m_xbslot->write_04xx(offset - 0x10, data); // access second POKEY else if (offset >= 0x70 && offset < 0x80) { m_reg = data; @@ -185,41 +185,41 @@ WRITE8_MEMBER(a78_xboard_device::write_04xx) -------------------------------------------------*/ -READ8_MEMBER(a78_xm_device::read_10xx) +uint8_t a78_xm_device::read_10xx(offs_t offset) { return m_nvram[offset]; } -WRITE8_MEMBER(a78_xm_device::write_10xx) +void a78_xm_device::write_10xx(offs_t offset, uint8_t data) { m_nvram[offset] = data; } -READ8_MEMBER(a78_xm_device::read_30xx) +uint8_t a78_xm_device::read_30xx(offs_t offset) { return m_rom[offset]; } -READ8_MEMBER(a78_xm_device::read_04xx) +uint8_t a78_xm_device::read_04xx(offs_t offset) { if (BIT(m_reg, 4) && offset >= 0x50 && offset < 0x60) return m_pokey->read(offset & 0x0f); else if (m_ym_enabled && offset >= 0x60 && offset <= 0x61) return m_ym->read(offset & 1); else if (BIT(m_reg, 4) && offset >= 0x60 && offset < 0x70) - return m_xbslot->read_04xx(space, offset - 0x10); // access second POKEY + return m_xbslot->read_04xx(offset - 0x10); // access second POKEY else return 0xff; } -WRITE8_MEMBER(a78_xm_device::write_04xx) +void a78_xm_device::write_04xx(offs_t offset, uint8_t data) { if (BIT(m_reg, 4) && offset >= 0x50 && offset < 0x60) m_pokey->write(offset & 0x0f, data); else if (m_ym_enabled && offset >= 0x60 && offset <= 0x61) m_ym->write(offset & 1, data); else if (BIT(m_reg, 4) && offset >= 0x60 && offset < 0x70) - m_xbslot->write_04xx(space, offset - 0x10, data); // access second POKEY + m_xbslot->write_04xx(offset - 0x10, data); // access second POKEY else if (offset >= 0x70 && offset < 0x80) { //printf("regs 0x%X\n", data); diff --git a/src/devices/bus/a7800/xboard.h b/src/devices/bus/a7800/xboard.h index 476d9a18aba..8c0c6002ddb 100644 --- a/src/devices/bus/a7800/xboard.h +++ b/src/devices/bus/a7800/xboard.h @@ -20,10 +20,10 @@ public: a78_xboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_04xx) override; - virtual DECLARE_WRITE8_MEMBER(write_04xx) override; - virtual DECLARE_READ8_MEMBER(read_40xx) override; - virtual DECLARE_WRITE8_MEMBER(write_40xx) override; + virtual uint8_t read_04xx(offs_t offset) override; + virtual void write_04xx(offs_t offset, uint8_t data) override; + virtual uint8_t read_40xx(offs_t offset) override; + virtual void write_40xx(offs_t offset, uint8_t data) override; protected: a78_xboard_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -47,11 +47,11 @@ public: a78_xm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_04xx) override; - virtual DECLARE_WRITE8_MEMBER(write_04xx) override; - virtual DECLARE_READ8_MEMBER(read_10xx) override; - virtual DECLARE_WRITE8_MEMBER(write_10xx) override; - virtual DECLARE_READ8_MEMBER(read_30xx) override; + virtual uint8_t read_04xx(offs_t offset) override; + virtual void write_04xx(offs_t offset, uint8_t data) override; + virtual uint8_t read_10xx(offs_t offset) override; + virtual void write_10xx(offs_t offset, uint8_t data) override; + virtual uint8_t read_30xx(offs_t offset) override; protected: virtual void device_start() override; diff --git a/src/devices/bus/a800/a800_slot.cpp b/src/devices/bus/a800/a800_slot.cpp index dbb587ae9f7..a6a2867f874 100644 --- a/src/devices/bus/a800/a800_slot.cpp +++ b/src/devices/bus/a800/a800_slot.cpp @@ -494,18 +494,18 @@ std::string xegs_cart_slot_device::get_default_card_software(get_default_card_so read -------------------------------------------------*/ -READ8_MEMBER(a800_cart_slot_device::read_80xx) +uint8_t a800_cart_slot_device::read_80xx(offs_t offset) { if (m_cart) - return m_cart->read_80xx(space, offset, mem_mask); + return m_cart->read_80xx(offset); else return 0xff; } -READ8_MEMBER(a800_cart_slot_device::read_d5xx) +uint8_t a800_cart_slot_device::read_d5xx(offs_t offset) { if (m_cart) - return m_cart->read_d5xx(space, offset, mem_mask); + return m_cart->read_d5xx(offset); else return 0xff; } @@ -515,14 +515,14 @@ READ8_MEMBER(a800_cart_slot_device::read_d5xx) write -------------------------------------------------*/ -WRITE8_MEMBER(a800_cart_slot_device::write_80xx) +void a800_cart_slot_device::write_80xx(offs_t offset, uint8_t data) { if (m_cart) - m_cart->write_80xx(space, offset, data, mem_mask); + m_cart->write_80xx(offset, data); } -WRITE8_MEMBER(a800_cart_slot_device::write_d5xx) +void a800_cart_slot_device::write_d5xx(offs_t offset, uint8_t data) { if (m_cart) - m_cart->write_d5xx(space, offset, data, mem_mask); + m_cart->write_d5xx(offset, data); } diff --git a/src/devices/bus/a800/a800_slot.h b/src/devices/bus/a800/a800_slot.h index 8a21b8e896f..0951c4a2c3d 100644 --- a/src/devices/bus/a800/a800_slot.h +++ b/src/devices/bus/a800/a800_slot.h @@ -55,10 +55,10 @@ public: virtual ~device_a800_cart_interface(); // memory accessor - virtual DECLARE_READ8_MEMBER(read_80xx) { return 0xff; } - virtual DECLARE_READ8_MEMBER(read_d5xx) { return 0xff; } - virtual DECLARE_WRITE8_MEMBER(write_80xx) {} - virtual DECLARE_WRITE8_MEMBER(write_d5xx) {} + virtual uint8_t read_80xx(offs_t offset) { return 0xff; } + virtual uint8_t read_d5xx(offs_t offset) { return 0xff; } + virtual void write_80xx(offs_t offset, uint8_t data) {} + virtual void write_d5xx(offs_t offset, uint8_t data) {} void rom_alloc(uint32_t size, const char *tag); void ram_alloc(uint32_t size); @@ -124,10 +124,10 @@ public: bool has_cart() { return m_cart != nullptr; } // reading and writing - virtual DECLARE_READ8_MEMBER(read_80xx); - virtual DECLARE_READ8_MEMBER(read_d5xx); - virtual DECLARE_WRITE8_MEMBER(write_80xx); - virtual DECLARE_WRITE8_MEMBER(write_d5xx); + uint8_t read_80xx(offs_t offset); + uint8_t read_d5xx(offs_t offset); + void write_80xx(offs_t offset, uint8_t data); + void write_d5xx(offs_t offset, uint8_t data); protected: a800_cart_slot_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); diff --git a/src/devices/bus/a800/a8sio.cpp b/src/devices/bus/a800/a8sio.cpp index cf975d7b50a..41fb3f863e5 100644 --- a/src/devices/bus/a800/a8sio.cpp +++ b/src/devices/bus/a800/a8sio.cpp @@ -143,7 +143,7 @@ WRITE_LINE_MEMBER( a8sio_device::proceed_w ) m_out_proceed_cb(state); } -WRITE8_MEMBER( a8sio_device::audio_in_w ) +void a8sio_device::audio_in_w(uint8_t data) { m_out_audio_in_cb(data); } diff --git a/src/devices/bus/a800/a8sio.h b/src/devices/bus/a800/a8sio.h index eaf2a7a7784..643dffe19a5 100644 --- a/src/devices/bus/a800/a8sio.h +++ b/src/devices/bus/a800/a8sio.h @@ -69,7 +69,7 @@ public: DECLARE_WRITE_LINE_MEMBER( command_w ); // pin 7 DECLARE_WRITE_LINE_MEMBER( motor_w ); // pin 8 DECLARE_WRITE_LINE_MEMBER( proceed_w ); // pin 9 - DECLARE_WRITE8_MEMBER( audio_in_w ); // pin 11 + void audio_in_w(uint8_t data); // pin 11 DECLARE_WRITE_LINE_MEMBER( interrupt_w ); // pin 13 protected: diff --git a/src/devices/bus/a800/oss.cpp b/src/devices/bus/a800/oss.cpp index 70a9375ef28..f25dfcce130 100644 --- a/src/devices/bus/a800/oss.cpp +++ b/src/devices/bus/a800/oss.cpp @@ -102,7 +102,7 @@ void a800_rom_oss91_device::device_reset() -------------------------------------------------*/ -READ8_MEMBER(a800_rom_oss8k_device::read_80xx) +uint8_t a800_rom_oss8k_device::read_80xx(offs_t offset) { if (offset >= 0x1000) return m_rom[offset & 0xfff]; @@ -110,7 +110,7 @@ READ8_MEMBER(a800_rom_oss8k_device::read_80xx) return m_rom[(offset & 0xfff) + (m_bank * 0x1000)]; } -WRITE8_MEMBER(a800_rom_oss8k_device::write_d5xx) +void a800_rom_oss8k_device::write_d5xx(offs_t offset, uint8_t data) { switch (offset & 0x09) { @@ -136,7 +136,7 @@ WRITE8_MEMBER(a800_rom_oss8k_device::write_d5xx) -------------------------------------------------*/ -READ8_MEMBER(a800_rom_oss34_device::read_80xx) +uint8_t a800_rom_oss34_device::read_80xx(offs_t offset) { if (offset >= 0x1000) return m_rom[(offset & 0xfff) + 0x3000]; @@ -146,7 +146,7 @@ READ8_MEMBER(a800_rom_oss34_device::read_80xx) return m_rom[(offset & 0xfff) + (m_bank * 0x1000)]; } -WRITE8_MEMBER(a800_rom_oss34_device::write_d5xx) +void a800_rom_oss34_device::write_d5xx(offs_t offset, uint8_t data) { switch (offset & 0x0f) { @@ -180,7 +180,7 @@ WRITE8_MEMBER(a800_rom_oss34_device::write_d5xx) -------------------------------------------------*/ -READ8_MEMBER(a800_rom_oss43_device::read_80xx) +uint8_t a800_rom_oss43_device::read_80xx(offs_t offset) { if (offset >= 0x1000) return m_rom[(offset & 0xfff) + 0x3000]; @@ -190,7 +190,7 @@ READ8_MEMBER(a800_rom_oss43_device::read_80xx) return m_rom[(offset & 0xfff) + (m_bank * 0x1000)]; } -WRITE8_MEMBER(a800_rom_oss43_device::write_d5xx) +void a800_rom_oss43_device::write_d5xx(offs_t offset, uint8_t data) { switch (offset & 0x0f) { @@ -225,7 +225,7 @@ WRITE8_MEMBER(a800_rom_oss43_device::write_d5xx) -------------------------------------------------*/ -READ8_MEMBER(a800_rom_oss91_device::read_80xx) +uint8_t a800_rom_oss91_device::read_80xx(offs_t offset) { if (offset >= 0x1000) return m_rom[offset & 0xfff]; @@ -233,7 +233,7 @@ READ8_MEMBER(a800_rom_oss91_device::read_80xx) return m_rom[(offset & 0xfff) + (m_bank * 0x1000)]; } -WRITE8_MEMBER(a800_rom_oss91_device::write_d5xx) +void a800_rom_oss91_device::write_d5xx(offs_t offset, uint8_t data) { switch (offset & 0x09) { diff --git a/src/devices/bus/a800/oss.h b/src/devices/bus/a800/oss.h index 367bd4f8f8d..65527039825 100644 --- a/src/devices/bus/a800/oss.h +++ b/src/devices/bus/a800/oss.h @@ -16,8 +16,8 @@ public: // construction/destruction a800_rom_oss8k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual DECLARE_READ8_MEMBER(read_80xx) override; - virtual DECLARE_WRITE8_MEMBER(write_d5xx) override; + virtual uint8_t read_80xx(offs_t offset) override; + virtual void write_d5xx(offs_t offset, uint8_t data) override; protected: // device-level overrides @@ -36,8 +36,8 @@ public: // construction/destruction a800_rom_oss34_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual DECLARE_READ8_MEMBER(read_80xx) override; - virtual DECLARE_WRITE8_MEMBER(write_d5xx) override; + virtual uint8_t read_80xx(offs_t offset) override; + virtual void write_d5xx(offs_t offset, uint8_t data) override; protected: // device-level overrides @@ -56,8 +56,8 @@ public: // construction/destruction a800_rom_oss43_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual DECLARE_READ8_MEMBER(read_80xx) override; - virtual DECLARE_WRITE8_MEMBER(write_d5xx) override; + virtual uint8_t read_80xx(offs_t offset) override; + virtual void write_d5xx(offs_t offset, uint8_t data) override; protected: // device-level overrides @@ -76,8 +76,8 @@ public: // construction/destruction a800_rom_oss91_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual DECLARE_READ8_MEMBER(read_80xx) override; - virtual DECLARE_WRITE8_MEMBER(write_d5xx) override; + virtual uint8_t read_80xx(offs_t offset) override; + virtual void write_d5xx(offs_t offset, uint8_t data) override; protected: // device-level overrides diff --git a/src/devices/bus/a800/rom.cpp b/src/devices/bus/a800/rom.cpp index f33c8776d52..f6db2cb1cf1 100644 --- a/src/devices/bus/a800/rom.cpp +++ b/src/devices/bus/a800/rom.cpp @@ -206,7 +206,7 @@ void a5200_rom_bbsb_device::device_reset() -------------------------------------------------*/ -READ8_MEMBER(a800_rom_device::read_80xx) +uint8_t a800_rom_device::read_80xx(offs_t offset) { return m_rom[offset & (m_rom_size - 1)]; } @@ -226,7 +226,7 @@ READ8_MEMBER(a800_rom_device::read_80xx) -------------------------------------------------*/ -READ8_MEMBER(a800_rom_bbsb_device::read_80xx) +uint8_t a800_rom_bbsb_device::read_80xx(offs_t offset) { if (offset < 0x1000) return m_rom[(offset & 0xfff) + (m_banks[0] * 0x1000) + 0]; @@ -236,7 +236,7 @@ READ8_MEMBER(a800_rom_bbsb_device::read_80xx) return m_rom[(offset & 0x1fff) + 0x8000]; } -WRITE8_MEMBER(a800_rom_bbsb_device::write_80xx) +void a800_rom_bbsb_device::write_80xx(offs_t offset, uint8_t data) { uint16_t addr = offset & 0xfff; if (addr >= 0xff6 && addr <= 0xff9) @@ -252,7 +252,7 @@ WRITE8_MEMBER(a800_rom_bbsb_device::write_80xx) -------------------------------------------------*/ -READ8_MEMBER(xegs_rom_device::read_80xx) +uint8_t xegs_rom_device::read_80xx(offs_t offset) { if (offset < 0x2000) return m_rom[(offset & 0x1fff) + (m_bank * 0x2000)]; @@ -261,7 +261,7 @@ READ8_MEMBER(xegs_rom_device::read_80xx) } -WRITE8_MEMBER(xegs_rom_device::write_d5xx) +void xegs_rom_device::write_d5xx(offs_t offset, uint8_t data) { m_bank = data & m_bank_mask; } @@ -280,12 +280,12 @@ WRITE8_MEMBER(xegs_rom_device::write_d5xx) -------------------------------------------------*/ -READ8_MEMBER(a800_rom_williams_device::read_80xx) +uint8_t a800_rom_williams_device::read_80xx(offs_t offset) { return m_rom[(offset & 0x1fff) + (m_bank * 0x2000)]; } -WRITE8_MEMBER(a800_rom_williams_device::write_d5xx) +void a800_rom_williams_device::write_d5xx(offs_t offset, uint8_t data) { m_bank = (offset & 0x07); } @@ -303,12 +303,12 @@ WRITE8_MEMBER(a800_rom_williams_device::write_d5xx) -------------------------------------------------*/ -READ8_MEMBER(a800_rom_express_device::read_80xx) +uint8_t a800_rom_express_device::read_80xx(offs_t offset) { return m_rom[(offset & 0x1fff) + (m_bank * 0x2000)]; } -WRITE8_MEMBER(a800_rom_express_device::write_d5xx) +void a800_rom_express_device::write_d5xx(offs_t offset, uint8_t data) { m_bank = (offset ^ 0x07) & 0x0f; } @@ -321,12 +321,12 @@ WRITE8_MEMBER(a800_rom_express_device::write_d5xx) -------------------------------------------------*/ -READ8_MEMBER(a800_rom_turbo_device::read_80xx) +uint8_t a800_rom_turbo_device::read_80xx(offs_t offset) { return m_rom[(offset & 0x1fff) + (m_bank * 0x2000)]; } -WRITE8_MEMBER(a800_rom_turbo_device::write_d5xx) +void a800_rom_turbo_device::write_d5xx(offs_t offset, uint8_t data) { m_bank = offset & m_bank_mask; } @@ -339,7 +339,7 @@ WRITE8_MEMBER(a800_rom_turbo_device::write_d5xx) -------------------------------------------------*/ -READ8_MEMBER(a800_rom_telelink2_device::read_80xx) +uint8_t a800_rom_telelink2_device::read_80xx(offs_t offset) { if (offset >= 0x2000) return m_rom[offset & 0x1fff]; @@ -349,18 +349,18 @@ READ8_MEMBER(a800_rom_telelink2_device::read_80xx) return 0xff; } -WRITE8_MEMBER(a800_rom_telelink2_device::write_80xx) +void a800_rom_telelink2_device::write_80xx(offs_t offset, uint8_t data) { m_nvram[offset & 0xff] = data | 0xf0; // low 4bits only } -READ8_MEMBER(a800_rom_telelink2_device::read_d5xx) +uint8_t a800_rom_telelink2_device::read_d5xx(offs_t offset) { // this should affect NVRAM enable / save return 0xff; } -WRITE8_MEMBER(a800_rom_telelink2_device::write_d5xx) +void a800_rom_telelink2_device::write_d5xx(offs_t offset, uint8_t data) { // this should affect NVRAM enable / save } @@ -374,12 +374,12 @@ WRITE8_MEMBER(a800_rom_telelink2_device::write_d5xx) -------------------------------------------------*/ -READ8_MEMBER(a800_rom_microcalc_device::read_80xx) +uint8_t a800_rom_microcalc_device::read_80xx(offs_t offset) { return m_rom[(offset & 0x1fff) + (m_bank * 0x2000)]; } -WRITE8_MEMBER(a800_rom_microcalc_device::write_d5xx) +void a800_rom_microcalc_device::write_d5xx(offs_t offset, uint8_t data) { m_bank = data; } @@ -407,7 +407,7 @@ WRITE8_MEMBER(a800_rom_microcalc_device::write_d5xx) -------------------------------------------------*/ -READ8_MEMBER(a5200_rom_2chips_device::read_80xx) +uint8_t a5200_rom_2chips_device::read_80xx(offs_t offset) { if (offset < 0x4000) return m_rom[offset & 0x1fff]; @@ -431,7 +431,7 @@ READ8_MEMBER(a5200_rom_2chips_device::read_80xx) -------------------------------------------------*/ -READ8_MEMBER(a5200_rom_bbsb_device::read_80xx) +uint8_t a5200_rom_bbsb_device::read_80xx(offs_t offset) { if (offset < 0x1000) return m_rom[(offset & 0xfff) + (m_banks[0] * 0x1000) + 0]; @@ -443,7 +443,7 @@ READ8_MEMBER(a5200_rom_bbsb_device::read_80xx) return 0; } -WRITE8_MEMBER(a5200_rom_bbsb_device::write_80xx) +void a5200_rom_bbsb_device::write_80xx(offs_t offset, uint8_t data) { uint16_t addr = offset & 0xfff; if (addr >= 0xff6 && addr <= 0xff9) diff --git a/src/devices/bus/a800/rom.h b/src/devices/bus/a800/rom.h index 9ba329b3113..e48b4a4ed7c 100644 --- a/src/devices/bus/a800/rom.h +++ b/src/devices/bus/a800/rom.h @@ -17,7 +17,7 @@ public: // construction/destruction a800_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual DECLARE_READ8_MEMBER(read_80xx) override; + virtual uint8_t read_80xx(offs_t offset) override; protected: a800_rom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -36,8 +36,8 @@ public: // construction/destruction a800_rom_bbsb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual DECLARE_READ8_MEMBER(read_80xx) override; - virtual DECLARE_WRITE8_MEMBER(write_80xx) override; + virtual uint8_t read_80xx(offs_t offset) override; + virtual void write_80xx(offs_t offset, uint8_t data) override; protected: // device-level overrides @@ -56,8 +56,8 @@ public: // construction/destruction a800_rom_williams_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual DECLARE_READ8_MEMBER(read_80xx) override; - virtual DECLARE_WRITE8_MEMBER(write_d5xx) override; + virtual uint8_t read_80xx(offs_t offset) override; + virtual void write_d5xx(offs_t offset, uint8_t data) override; protected: // device-level overrides @@ -76,8 +76,8 @@ public: // construction/destruction a800_rom_express_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual DECLARE_READ8_MEMBER(read_80xx) override; - virtual DECLARE_WRITE8_MEMBER(write_d5xx) override; + virtual uint8_t read_80xx(offs_t offset) override; + virtual void write_d5xx(offs_t offset, uint8_t data) override; protected: // device-level overrides @@ -96,7 +96,7 @@ public: // construction/destruction a800_rom_blizzard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual DECLARE_READ8_MEMBER(read_80xx) override; + virtual uint8_t read_80xx(offs_t offset) override; protected: // device-level overrides @@ -113,8 +113,8 @@ public: // construction/destruction a800_rom_turbo_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual DECLARE_READ8_MEMBER(read_80xx) override; - virtual DECLARE_WRITE8_MEMBER(write_d5xx) override; + virtual uint8_t read_80xx(offs_t offset) override; + virtual void write_d5xx(offs_t offset, uint8_t data) override; protected: // device-level overrides @@ -133,10 +133,10 @@ public: // construction/destruction a800_rom_telelink2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual DECLARE_READ8_MEMBER(read_80xx) override; - virtual DECLARE_WRITE8_MEMBER(write_80xx) override; - virtual DECLARE_READ8_MEMBER(read_d5xx) override; - virtual DECLARE_WRITE8_MEMBER(write_d5xx) override; + virtual uint8_t read_80xx(offs_t offset) override; + virtual void write_80xx(offs_t offset, uint8_t data) override; + virtual uint8_t read_d5xx(offs_t offset) override; + virtual void write_d5xx(offs_t offset, uint8_t data) override; }; @@ -148,8 +148,8 @@ public: // construction/destruction a800_rom_microcalc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual DECLARE_READ8_MEMBER(read_80xx) override; - virtual DECLARE_WRITE8_MEMBER(write_d5xx) override; + virtual uint8_t read_80xx(offs_t offset) override; + virtual void write_d5xx(offs_t offset, uint8_t data) override; protected: // device-level overrides @@ -172,8 +172,8 @@ public: virtual void device_start() override; virtual void device_reset() override; - virtual DECLARE_READ8_MEMBER(read_80xx) override; - virtual DECLARE_WRITE8_MEMBER(write_d5xx) override; + virtual uint8_t read_80xx(offs_t offset) override; + virtual void write_d5xx(offs_t offset, uint8_t data) override; protected: int m_bank; @@ -188,7 +188,7 @@ public: // construction/destruction a5200_rom_2chips_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual DECLARE_READ8_MEMBER(read_80xx) override; + virtual uint8_t read_80xx(offs_t offset) override; }; @@ -200,8 +200,8 @@ public: // construction/destruction a5200_rom_bbsb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual DECLARE_READ8_MEMBER(read_80xx) override; - virtual DECLARE_WRITE8_MEMBER(write_80xx) override; + virtual uint8_t read_80xx(offs_t offset) override; + virtual void write_80xx(offs_t offset, uint8_t data) override; protected: // device-level overrides diff --git a/src/devices/bus/a800/sparta.cpp b/src/devices/bus/a800/sparta.cpp index 30d76eecc38..8b8242d8dad 100644 --- a/src/devices/bus/a800/sparta.cpp +++ b/src/devices/bus/a800/sparta.cpp @@ -55,7 +55,7 @@ void a800_rom_spartados_device::device_reset() -------------------------------------------------*/ -READ8_MEMBER(a800_rom_spartados_device::read_80xx) +uint8_t a800_rom_spartados_device::read_80xx(offs_t offset) { if (!m_subslot_enabled) return m_rom[(offset & 0x1fff) + (m_bank * 0x2000)]; @@ -63,7 +63,7 @@ READ8_MEMBER(a800_rom_spartados_device::read_80xx) return 0xff; // subslot, currently not implemented } -WRITE8_MEMBER(a800_rom_spartados_device::write_d5xx) +void a800_rom_spartados_device::write_d5xx(offs_t offset, uint8_t data) { if (offset & 0x08) m_subslot_enabled = !BIT(offset, 2); diff --git a/src/devices/bus/a800/sparta.h b/src/devices/bus/a800/sparta.h index 614ce86571c..ea211472f31 100644 --- a/src/devices/bus/a800/sparta.h +++ b/src/devices/bus/a800/sparta.h @@ -16,8 +16,8 @@ public: // construction/destruction a800_rom_spartados_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual DECLARE_READ8_MEMBER(read_80xx) override; - virtual DECLARE_WRITE8_MEMBER(write_d5xx) override; + virtual uint8_t read_80xx(offs_t offset) override; + virtual void write_d5xx(offs_t offset, uint8_t data) override; protected: // device-level overrides diff --git a/src/devices/bus/abcbus/abcbus.h b/src/devices/bus/abcbus/abcbus.h index 716a177248d..402f1325136 100644 --- a/src/devices/bus/abcbus/abcbus.h +++ b/src/devices/bus/abcbus/abcbus.h @@ -201,17 +201,15 @@ public: DECLARE_WRITE_LINE_MEMBER( tren_w ) { if (m_card) m_card->abcbus_tren(state); } DECLARE_WRITE_LINE_MEMBER( prac_w ) { if (m_card) m_card->abcbus_prac(state); } - DECLARE_WRITE8_MEMBER( cs_w ) { write_cs(data); } - DECLARE_READ8_MEMBER( rst_r ) { return read_rst(); } - DECLARE_READ8_MEMBER( inp_r ) { return read_inp(); } - DECLARE_WRITE8_MEMBER( out_w ) { write_out(data); } - DECLARE_READ8_MEMBER( stat_r ) { return read_stat(); } - DECLARE_WRITE8_MEMBER( c1_w ) { write_c1(data); } - DECLARE_WRITE8_MEMBER( c2_w ) { write_c2(data); } - DECLARE_WRITE8_MEMBER( c3_w ) { write_c3(data); } - DECLARE_WRITE8_MEMBER( c4_w ) { write_c4(data); } - DECLARE_READ8_MEMBER( xmemfl_r ) { return xmemfl_r(offset); } - DECLARE_WRITE8_MEMBER( xmemw_w ) { xmemw_w(offset, data); } + void cs_w(uint8_t data) { write_cs(data); } + uint8_t rst_r() { return read_rst(); } + uint8_t inp_r() { return read_inp(); } + void out_w(uint8_t data) { write_out(data); } + uint8_t stat_r() { return read_stat(); } + void c1_w(uint8_t data) { write_c1(data); } + void c2_w(uint8_t data) { write_c2(data); } + void c3_w(uint8_t data) { write_c3(data); } + void c4_w(uint8_t data) { write_c4(data); } DECLARE_READ_LINE_MEMBER( irq_r ) { return m_irq; } DECLARE_READ_LINE_MEMBER( nmi_r ) { return m_nmi; } diff --git a/src/devices/bus/abcbus/lux10828.cpp b/src/devices/bus/abcbus/lux10828.cpp index 1dfc47c639e..6db3b9d2196 100644 --- a/src/devices/bus/abcbus/lux10828.cpp +++ b/src/devices/bus/abcbus/lux10828.cpp @@ -455,8 +455,7 @@ void luxor_55_10828_device::device_reset() { m_cs = false; - address_space &space = m_maincpu->space(AS_PROGRAM); - ctrl_w(space, 0, 0); + ctrl_w(0); m_data = 0; } @@ -574,7 +573,7 @@ void luxor_55_10828_device::abcbus_c3(uint8_t data) // ctrl_w - //------------------------------------------------- -WRITE8_MEMBER( luxor_55_10828_device::ctrl_w ) +void luxor_55_10828_device::ctrl_w(uint8_t data) { /* @@ -626,7 +625,7 @@ WRITE8_MEMBER( luxor_55_10828_device::ctrl_w ) // status_w - //------------------------------------------------- -WRITE8_MEMBER( luxor_55_10828_device::status_w ) +void luxor_55_10828_device::status_w(uint8_t data) { /* @@ -657,7 +656,7 @@ WRITE8_MEMBER( luxor_55_10828_device::status_w ) // fdc_r - //------------------------------------------------- -READ8_MEMBER( luxor_55_10828_device::fdc_r ) +uint8_t luxor_55_10828_device::fdc_r(offs_t offset) { if (machine().side_effects_disabled()) return 0xff; @@ -685,7 +684,7 @@ READ8_MEMBER( luxor_55_10828_device::fdc_r ) // fdc_w - //------------------------------------------------- -WRITE8_MEMBER( luxor_55_10828_device::fdc_w ) +void luxor_55_10828_device::fdc_w(offs_t offset, uint8_t data) { if (machine().side_effects_disabled()) return; diff --git a/src/devices/bus/abcbus/lux10828.h b/src/devices/bus/abcbus/lux10828.h index e0fa36d95c0..3e8499a2e64 100644 --- a/src/devices/bus/abcbus/lux10828.h +++ b/src/devices/bus/abcbus/lux10828.h @@ -83,10 +83,10 @@ private: DECLARE_WRITE_LINE_MEMBER( fdc_intrq_w ); DECLARE_WRITE_LINE_MEMBER( fdc_drq_w ); - DECLARE_WRITE8_MEMBER( ctrl_w ); - DECLARE_WRITE8_MEMBER( status_w ); - DECLARE_READ8_MEMBER( fdc_r ); - DECLARE_WRITE8_MEMBER( fdc_w ); + void ctrl_w(uint8_t data); + void status_w(uint8_t data); + uint8_t fdc_r(offs_t offset); + void fdc_w(offs_t offset, uint8_t data); DECLARE_FLOPPY_FORMATS( floppy_formats ); diff --git a/src/devices/bus/abcbus/lux21046.cpp b/src/devices/bus/abcbus/lux21046.cpp index c1a96f155a4..c305f2bfc63 100644 --- a/src/devices/bus/abcbus/lux21046.cpp +++ b/src/devices/bus/abcbus/lux21046.cpp @@ -789,10 +789,9 @@ void luxor_55_21046_device::device_reset() m_maincpu->reset(); - address_space &space = m_maincpu->space(AS_PROGRAM); - _4b_w(space, 0, 0); - _9b_w(space, 0, 0); - _8a_w(space, 0, 0); + _4b_w(0); + _9b_w(0); + _8a_w(0); } @@ -932,9 +931,9 @@ void luxor_55_21046_device::abcbus_c4(uint8_t data) // 3d_r - //------------------------------------------------- -READ8_MEMBER( luxor_55_21046_device::out_r ) +uint8_t luxor_55_21046_device::out_r() { - if (m_busy) + if (m_busy && !machine().side_effects_disabled()) { m_busy = 0; } @@ -947,7 +946,7 @@ READ8_MEMBER( luxor_55_21046_device::out_r ) // 4d_w - //------------------------------------------------- -WRITE8_MEMBER( luxor_55_21046_device::inp_w ) +void luxor_55_21046_device::inp_w(uint8_t data) { if (m_busy) { @@ -962,7 +961,7 @@ WRITE8_MEMBER( luxor_55_21046_device::inp_w ) // 4b_w - //------------------------------------------------- -WRITE8_MEMBER( luxor_55_21046_device::_4b_w ) +void luxor_55_21046_device::_4b_w(uint8_t data) { /* @@ -993,7 +992,7 @@ WRITE8_MEMBER( luxor_55_21046_device::_4b_w ) // 9b_w - //------------------------------------------------- -WRITE8_MEMBER( luxor_55_21046_device::_9b_w ) +void luxor_55_21046_device::_9b_w(uint8_t data) { /* @@ -1033,7 +1032,7 @@ WRITE8_MEMBER( luxor_55_21046_device::_9b_w ) // 8a_w - //------------------------------------------------- -WRITE8_MEMBER( luxor_55_21046_device::_8a_w ) +void luxor_55_21046_device::_8a_w(uint8_t data) { /* @@ -1066,7 +1065,7 @@ WRITE8_MEMBER( luxor_55_21046_device::_8a_w ) // 9a_r - //------------------------------------------------- -READ8_MEMBER( luxor_55_21046_device::_9a_r ) +uint8_t luxor_55_21046_device::_9a_r(offs_t offset) { /* diff --git a/src/devices/bus/abcbus/lux21046.h b/src/devices/bus/abcbus/lux21046.h index db460700fb0..c7e13962b0b 100644 --- a/src/devices/bus/abcbus/lux21046.h +++ b/src/devices/bus/abcbus/lux21046.h @@ -92,12 +92,12 @@ private: DECLARE_WRITE_LINE_MEMBER( fdc_intrq_w ); - DECLARE_READ8_MEMBER( out_r ); - DECLARE_WRITE8_MEMBER( inp_w ); - DECLARE_WRITE8_MEMBER( _4b_w ); - DECLARE_WRITE8_MEMBER( _9b_w ); - DECLARE_WRITE8_MEMBER( _8a_w ); - DECLARE_READ8_MEMBER( _9a_r ); + uint8_t out_r(); + void inp_w(uint8_t data); + void _4b_w(uint8_t data); + void _9b_w(uint8_t data); + void _8a_w(uint8_t data); + uint8_t _9a_r(offs_t offset); void luxor_55_21046_io(address_map &map); void luxor_55_21046_mem(address_map &map); diff --git a/src/devices/bus/abcbus/lux21056.cpp b/src/devices/bus/abcbus/lux21056.cpp index 65ae4ff06de..74a7abd5c9f 100644 --- a/src/devices/bus/abcbus/lux21056.cpp +++ b/src/devices/bus/abcbus/lux21056.cpp @@ -491,7 +491,7 @@ void luxor_55_21056_device::abcbus_c3(uint8_t data) // sasi_status_r - //------------------------------------------------- -READ8_MEMBER( luxor_55_21056_device::sasi_status_r ) +uint8_t luxor_55_21056_device::sasi_status_r() { /* @@ -526,7 +526,7 @@ READ8_MEMBER( luxor_55_21056_device::sasi_status_r ) // stat_w - //------------------------------------------------- -WRITE8_MEMBER( luxor_55_21056_device::stat_w ) +void luxor_55_21056_device::stat_w(uint8_t data) { m_stat = data; @@ -538,7 +538,7 @@ WRITE8_MEMBER( luxor_55_21056_device::stat_w ) // out_r - //------------------------------------------------- -READ8_MEMBER( luxor_55_21056_device::out_r ) +uint8_t luxor_55_21056_device::out_r() { uint8_t data = m_out; @@ -552,7 +552,7 @@ READ8_MEMBER( luxor_55_21056_device::out_r ) // inp_w - //------------------------------------------------- -WRITE8_MEMBER( luxor_55_21056_device::inp_w ) +void luxor_55_21056_device::inp_w(uint8_t data) { m_inp = data; @@ -564,7 +564,7 @@ WRITE8_MEMBER( luxor_55_21056_device::inp_w ) // sasi_data_r - //------------------------------------------------- -READ8_MEMBER( luxor_55_21056_device::sasi_data_r ) +uint8_t luxor_55_21056_device::sasi_data_r() { uint8_t data = m_sasi_data_in->read(); @@ -579,7 +579,7 @@ READ8_MEMBER( luxor_55_21056_device::sasi_data_r ) // sasi_data_w - //------------------------------------------------- -WRITE8_MEMBER( luxor_55_21056_device::sasi_data_w ) +void luxor_55_21056_device::sasi_data_w(uint8_t data) { m_sasi_data = data; @@ -597,9 +597,10 @@ WRITE8_MEMBER( luxor_55_21056_device::sasi_data_w ) // rdy_reset_r - //------------------------------------------------- -READ8_MEMBER( luxor_55_21056_device::rdy_reset_r ) +uint8_t luxor_55_21056_device::rdy_reset_r() { - rdy_reset_w(space, offset, 0xff); + if (!machine().side_effects_disabled()) + rdy_reset_w(0xff); return 0xff; } @@ -609,7 +610,7 @@ READ8_MEMBER( luxor_55_21056_device::rdy_reset_r ) // rdy_reset_w - //------------------------------------------------- -WRITE8_MEMBER( luxor_55_21056_device::rdy_reset_w ) +void luxor_55_21056_device::rdy_reset_w(uint8_t data) { set_rdy(0); } @@ -619,9 +620,10 @@ WRITE8_MEMBER( luxor_55_21056_device::rdy_reset_w ) // sasi_sel_r - //------------------------------------------------- -READ8_MEMBER( luxor_55_21056_device::sasi_sel_r ) +uint8_t luxor_55_21056_device::sasi_sel_r() { - sasi_sel_w(space, offset, 0xff); + if (!machine().side_effects_disabled()) + sasi_sel_w(0xff); return 0xff; } @@ -631,7 +633,7 @@ READ8_MEMBER( luxor_55_21056_device::sasi_sel_r ) // sasi_sel_w - //------------------------------------------------- -WRITE8_MEMBER( luxor_55_21056_device::sasi_sel_w ) +void luxor_55_21056_device::sasi_sel_w(uint8_t data) { m_sasibus->write_sel(!m_sasi_bsy); } @@ -641,9 +643,10 @@ WRITE8_MEMBER( luxor_55_21056_device::sasi_sel_w ) // sasi_rst_r - //------------------------------------------------- -READ8_MEMBER( luxor_55_21056_device::sasi_rst_r ) +uint8_t luxor_55_21056_device::sasi_rst_r() { - sasi_rst_w(space, offset, 0xff); + if (!machine().side_effects_disabled()) + sasi_rst_w(0xff); return 0xff; } @@ -653,7 +656,7 @@ READ8_MEMBER( luxor_55_21056_device::sasi_rst_r ) // sasi_rst_w - //------------------------------------------------- -WRITE8_MEMBER( luxor_55_21056_device::sasi_rst_w ) +void luxor_55_21056_device::sasi_rst_w(uint8_t data) { m_sasibus->write_rst(1); m_sasibus->write_rst(0); diff --git a/src/devices/bus/abcbus/lux21056.h b/src/devices/bus/abcbus/lux21056.h index 2a6c071ff3a..812bb8325a3 100644 --- a/src/devices/bus/abcbus/lux21056.h +++ b/src/devices/bus/abcbus/lux21056.h @@ -64,18 +64,18 @@ private: DECLARE_WRITE_LINE_MEMBER( write_sasi_msg ); DECLARE_WRITE_LINE_MEMBER( write_sasi_bsy ); - DECLARE_READ8_MEMBER( sasi_status_r ); - DECLARE_WRITE8_MEMBER( stat_w ); - DECLARE_READ8_MEMBER( out_r ); - DECLARE_WRITE8_MEMBER( inp_w ); - DECLARE_READ8_MEMBER( sasi_data_r ); - DECLARE_WRITE8_MEMBER( sasi_data_w ); - DECLARE_READ8_MEMBER( rdy_reset_r ); - DECLARE_WRITE8_MEMBER( rdy_reset_w ); - DECLARE_READ8_MEMBER( sasi_sel_r ); - DECLARE_WRITE8_MEMBER( sasi_sel_w ); - DECLARE_READ8_MEMBER( sasi_rst_r ); - DECLARE_WRITE8_MEMBER( sasi_rst_w ); + uint8_t sasi_status_r(); + void stat_w(uint8_t data); + uint8_t out_r(); + void inp_w(uint8_t data); + uint8_t sasi_data_r(); + void sasi_data_w(uint8_t data); + uint8_t rdy_reset_r(); + void rdy_reset_w(uint8_t data); + uint8_t sasi_sel_r(); + void sasi_sel_w(uint8_t data); + uint8_t sasi_rst_r(); + void sasi_rst_w(uint8_t data); void luxor_55_21056_io(address_map &map); void luxor_55_21056_mem(address_map &map); diff --git a/src/devices/bus/apf/rom.cpp b/src/devices/bus/apf/rom.cpp index 113e5bf5259..509aa30f458 100644 --- a/src/devices/bus/apf/rom.cpp +++ b/src/devices/bus/apf/rom.cpp @@ -47,7 +47,7 @@ apf_spacedst_device::apf_spacedst_device(const machine_config &mconfig, const ch mapper specific handlers -------------------------------------------------*/ -READ8_MEMBER(apf_rom_device::read_rom) +uint8_t apf_rom_device::read_rom(offs_t offset) { if (offset < m_rom_size) return m_rom[offset]; @@ -56,7 +56,7 @@ READ8_MEMBER(apf_rom_device::read_rom) } -READ8_MEMBER(apf_basic_device::extra_rom) +uint8_t apf_basic_device::extra_rom(offs_t offset) { if (offset < (m_rom_size - 0x2000)) return m_rom[offset + 0x2000]; @@ -65,12 +65,12 @@ READ8_MEMBER(apf_basic_device::extra_rom) } -READ8_MEMBER(apf_spacedst_device::read_ram) +uint8_t apf_spacedst_device::read_ram(offs_t offset) { return m_ram[offset]; } -WRITE8_MEMBER(apf_spacedst_device::write_ram) +void apf_spacedst_device::write_ram(offs_t offset, uint8_t data) { m_ram[offset] = data; } diff --git a/src/devices/bus/apf/rom.h b/src/devices/bus/apf/rom.h index 89d82f51a99..ab129289493 100644 --- a/src/devices/bus/apf/rom.h +++ b/src/devices/bus/apf/rom.h @@ -16,7 +16,7 @@ public: apf_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom) override; + virtual uint8_t read_rom(offs_t offset) override; protected: apf_rom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -35,7 +35,7 @@ public: apf_basic_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(extra_rom) override; + virtual uint8_t extra_rom(offs_t offset) override; }; // ======================> apf_spacedst_device @@ -47,8 +47,8 @@ public: apf_spacedst_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_ram) override; - virtual DECLARE_WRITE8_MEMBER(write_ram) override; + virtual uint8_t read_ram(offs_t offset) override; + virtual void write_ram(offs_t offset, uint8_t data) override; }; diff --git a/src/devices/bus/apf/slot.cpp b/src/devices/bus/apf/slot.cpp index cf4e3b86c4e..2e62030e54f 100644 --- a/src/devices/bus/apf/slot.cpp +++ b/src/devices/bus/apf/slot.cpp @@ -227,10 +227,10 @@ std::string apf_cart_slot_device::get_default_card_software(get_default_card_sof read -------------------------------------------------*/ -READ8_MEMBER(apf_cart_slot_device::read_rom) +uint8_t apf_cart_slot_device::read_rom(offs_t offset) { if (m_cart) - return m_cart->read_rom(space, offset); + return m_cart->read_rom(offset); else return 0xff; } @@ -239,10 +239,10 @@ READ8_MEMBER(apf_cart_slot_device::read_rom) read -------------------------------------------------*/ -READ8_MEMBER(apf_cart_slot_device::extra_rom) +uint8_t apf_cart_slot_device::extra_rom(offs_t offset) { if (m_cart) - return m_cart->extra_rom(space, offset); + return m_cart->extra_rom(offset); else return 0xff; } @@ -251,10 +251,10 @@ READ8_MEMBER(apf_cart_slot_device::extra_rom) read -------------------------------------------------*/ -READ8_MEMBER(apf_cart_slot_device::read_ram) +uint8_t apf_cart_slot_device::read_ram(offs_t offset) { if (m_cart) - return m_cart->read_ram(space, offset); + return m_cart->read_ram(offset); else return 0xff; } @@ -263,8 +263,8 @@ READ8_MEMBER(apf_cart_slot_device::read_ram) write -------------------------------------------------*/ -WRITE8_MEMBER(apf_cart_slot_device::write_ram) +void apf_cart_slot_device::write_ram(offs_t offset, uint8_t data) { if (m_cart) - m_cart->write_ram(space, offset, data); + m_cart->write_ram(offset, data); } diff --git a/src/devices/bus/apf/slot.h b/src/devices/bus/apf/slot.h index a0996d1ec4c..9ce2b84aec0 100644 --- a/src/devices/bus/apf/slot.h +++ b/src/devices/bus/apf/slot.h @@ -29,10 +29,10 @@ public: virtual ~device_apf_cart_interface(); // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom) { return 0xff; } - virtual DECLARE_READ8_MEMBER(extra_rom) { return 0xff; } - virtual DECLARE_READ8_MEMBER(read_ram) { return 0xff; } - virtual DECLARE_WRITE8_MEMBER(write_ram) {} + virtual uint8_t read_rom(offs_t offset) { return 0xff; } + virtual uint8_t extra_rom(offs_t offset) { return 0xff; } + virtual uint8_t read_ram(offs_t offset) { return 0xff; } + virtual void write_ram(offs_t offset, uint8_t data) {} void rom_alloc(uint32_t size, const char *tag); void ram_alloc(uint32_t size); @@ -93,10 +93,10 @@ public: void save_ram() { if (m_cart && m_cart->get_ram_size()) m_cart->save_ram(); } // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom); - virtual DECLARE_READ8_MEMBER(extra_rom); - virtual DECLARE_READ8_MEMBER(read_ram); - virtual DECLARE_WRITE8_MEMBER(write_ram); + uint8_t read_rom(offs_t offset); + uint8_t extra_rom(offs_t offset); + uint8_t read_ram(offs_t offset); + void write_ram(offs_t offset, uint8_t data); protected: // device-level overrides diff --git a/src/devices/bus/arcadia/rom.cpp b/src/devices/bus/arcadia/rom.cpp index 2221fed2f2c..60bc4b3a88e 100644 --- a/src/devices/bus/arcadia/rom.cpp +++ b/src/devices/bus/arcadia/rom.cpp @@ -42,7 +42,7 @@ arcadia_golf_device::arcadia_golf_device(const machine_config &mconfig, const ch mapper specific handlers -------------------------------------------------*/ -READ8_MEMBER(arcadia_rom_device::read_rom) +uint8_t arcadia_rom_device::read_rom(offs_t offset) { if (offset < m_rom_size) return m_rom[offset]; @@ -51,7 +51,7 @@ READ8_MEMBER(arcadia_rom_device::read_rom) } -READ8_MEMBER(arcadia_rom_device::extra_rom) +uint8_t arcadia_rom_device::extra_rom(offs_t offset) { if (offset + 0x1000 < m_rom_size) return m_rom[offset + 0x1000]; diff --git a/src/devices/bus/arcadia/rom.h b/src/devices/bus/arcadia/rom.h index 31e71d833b5..b0ba196302e 100644 --- a/src/devices/bus/arcadia/rom.h +++ b/src/devices/bus/arcadia/rom.h @@ -18,8 +18,8 @@ public: arcadia_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom) override; - virtual DECLARE_READ8_MEMBER(extra_rom) override; + virtual uint8_t read_rom(offs_t offset) override; + virtual uint8_t extra_rom(offs_t offset) override; public: arcadia_rom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); diff --git a/src/devices/bus/arcadia/slot.cpp b/src/devices/bus/arcadia/slot.cpp index 19d2b1459f8..7d4e7547d9a 100644 --- a/src/devices/bus/arcadia/slot.cpp +++ b/src/devices/bus/arcadia/slot.cpp @@ -215,10 +215,10 @@ std::string arcadia_cart_slot_device::get_default_card_software(get_default_card read -------------------------------------------------*/ -READ8_MEMBER(arcadia_cart_slot_device::read_rom) +uint8_t arcadia_cart_slot_device::read_rom(offs_t offset) { if (m_cart) - return m_cart->read_rom(space, offset); + return m_cart->read_rom(offset); else return 0xff; } @@ -227,10 +227,10 @@ READ8_MEMBER(arcadia_cart_slot_device::read_rom) write -------------------------------------------------*/ -READ8_MEMBER(arcadia_cart_slot_device::extra_rom) +uint8_t arcadia_cart_slot_device::extra_rom(offs_t offset) { if (m_cart) - return m_cart->extra_rom(space, offset); + return m_cart->extra_rom(offset); else return 0xff; } diff --git a/src/devices/bus/arcadia/slot.h b/src/devices/bus/arcadia/slot.h index eb04c946815..ae86bc13847 100644 --- a/src/devices/bus/arcadia/slot.h +++ b/src/devices/bus/arcadia/slot.h @@ -28,8 +28,8 @@ public: virtual ~device_arcadia_cart_interface(); // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom) { return 0xff; } - virtual DECLARE_READ8_MEMBER(extra_rom) { return 0xff; } + virtual uint8_t read_rom(offs_t offset) { return 0xff; } + virtual uint8_t extra_rom(offs_t offset) { return 0xff; } void rom_alloc(uint32_t size, const char *tag); uint8_t* get_rom_base() { return m_rom; } @@ -81,8 +81,8 @@ public: int get_type() { return m_type; } // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom); - virtual DECLARE_READ8_MEMBER(extra_rom); + uint8_t read_rom(offs_t offset); + uint8_t extra_rom(offs_t offset); protected: // device-level overrides diff --git a/src/devices/bus/astrocde/exp.cpp b/src/devices/bus/astrocde/exp.cpp index c0e20a57f88..a33259380f1 100644 --- a/src/devices/bus/astrocde/exp.cpp +++ b/src/devices/bus/astrocde/exp.cpp @@ -66,18 +66,18 @@ void astrocade_exp_device::device_start() read -------------------------------------------------*/ -READ8_MEMBER(astrocade_exp_device::read) +uint8_t astrocade_exp_device::read(offs_t offset) { if (m_card) - return m_card->read(space, offset); + return m_card->read(offset); else return 0xff; } -READ8_MEMBER(astrocade_exp_device::read_io) +uint8_t astrocade_exp_device::read_io(offs_t offset) { if (m_card) - return m_card->read_io(space, offset); + return m_card->read_io(offset); else return 0xff; } @@ -86,14 +86,14 @@ READ8_MEMBER(astrocade_exp_device::read_io) write -------------------------------------------------*/ -WRITE8_MEMBER(astrocade_exp_device::write) +void astrocade_exp_device::write(offs_t offset, uint8_t data) { if (m_card) - m_card->write(space, offset, data); + m_card->write(offset, data); } -WRITE8_MEMBER(astrocade_exp_device::write_io) +void astrocade_exp_device::write_io(offs_t offset, uint8_t data) { if (m_card) - m_card->write_io(space, offset, data); + m_card->write_io(offset, data); } diff --git a/src/devices/bus/astrocde/exp.h b/src/devices/bus/astrocde/exp.h index b26bb51d03e..e2ed2279135 100644 --- a/src/devices/bus/astrocde/exp.h +++ b/src/devices/bus/astrocde/exp.h @@ -12,10 +12,10 @@ public: virtual ~device_astrocade_exp_interface(); // reading and writing - virtual DECLARE_READ8_MEMBER(read) { return 0xff; } - virtual DECLARE_WRITE8_MEMBER(write) { } - virtual DECLARE_READ8_MEMBER(read_io) { return 0xff; } - virtual DECLARE_WRITE8_MEMBER(write_io) { } + virtual uint8_t read(offs_t offset) { return 0xff; } + virtual void write(offs_t offset, uint8_t data) { } + virtual uint8_t read_io(offs_t offset) { return 0xff; } + virtual void write_io(offs_t offset, uint8_t data) { } protected: device_astrocade_exp_interface(const machine_config &mconfig, device_t &device); @@ -46,10 +46,10 @@ public: bool get_card_mounted() { return m_card_mounted; } // reading and writing - virtual DECLARE_READ8_MEMBER(read); - virtual DECLARE_WRITE8_MEMBER(write); - virtual DECLARE_READ8_MEMBER(read_io); - virtual DECLARE_WRITE8_MEMBER(write_io); + uint8_t read(offs_t offset); + void write(offs_t offset, uint8_t data); + uint8_t read_io(offs_t offset); + void write_io(offs_t offset, uint8_t data); protected: bool m_card_mounted; diff --git a/src/devices/bus/astrocde/ram.cpp b/src/devices/bus/astrocde/ram.cpp index 54664617be6..39eb299d8f6 100644 --- a/src/devices/bus/astrocde/ram.cpp +++ b/src/devices/bus/astrocde/ram.cpp @@ -151,7 +151,7 @@ ioport_constructor astrocade_rl64ram_device::device_input_ports() const -------------------------------------------------*/ // Blue RAM expansions have RAM starting at 0x6000, up to the RAM size -READ8_MEMBER(astrocade_blueram_4k_device::read) +uint8_t astrocade_blueram_4k_device::read(offs_t offset) { if (offset >= 0x1000 && offset < 0x1000 + m_ram.size()) return m_ram[offset - 0x1000]; @@ -159,18 +159,18 @@ READ8_MEMBER(astrocade_blueram_4k_device::read) return 0; } -WRITE8_MEMBER(astrocade_blueram_4k_device::write) +void astrocade_blueram_4k_device::write(offs_t offset, uint8_t data) { if (offset >= 0x1000 && offset < 0x1000 + m_ram.size() && !m_write_prot->read()) m_ram[offset - 0x1000] = data; } -READ8_MEMBER(astrocade_blueram_4k_device::read_io) +uint8_t astrocade_blueram_4k_device::read_io(offs_t offset) { return m_ramio->read_io(offset & 0x7f); } -WRITE8_MEMBER(astrocade_blueram_4k_device::write_io) +void astrocade_blueram_4k_device::write_io(offs_t offset, uint8_t data) { logerror("write_io: %04x = %02x\n", offset, data); m_ramio->write_io(offset & 0x7f, data); @@ -196,7 +196,7 @@ void astrocade_blueram_4k_device::portb_w(uint8_t data) } // Viper System 1 expansion has RAM in 0x6000-0x9fff -READ8_MEMBER(astrocade_viper_sys1_device::read) +uint8_t astrocade_viper_sys1_device::read(offs_t offset) { if (offset >= 0x1000 && offset < 0xa000) return m_ram[offset - 0x1000]; @@ -204,7 +204,7 @@ READ8_MEMBER(astrocade_viper_sys1_device::read) return 0; } -WRITE8_MEMBER(astrocade_viper_sys1_device::write) +void astrocade_viper_sys1_device::write(offs_t offset, uint8_t data) { if (offset >= 0x1000 && offset < 0xa000 && !m_write_prot->read()) m_ram[offset - 0x1000] = data; @@ -213,12 +213,12 @@ WRITE8_MEMBER(astrocade_viper_sys1_device::write) // Lil' WHITE RAM expansion has RAM in 0x5000-0xcfff + a mirror of the first 0x3000 bytes up to 0xffff -READ8_MEMBER(astrocade_whiteram_device::read) +uint8_t astrocade_whiteram_device::read(offs_t offset) { return m_ram[offset % 0x8000]; } -WRITE8_MEMBER(astrocade_whiteram_device::write) +void astrocade_whiteram_device::write(offs_t offset, uint8_t data) { if (!m_write_prot->read()) m_ram[offset % 0x8000] = data; @@ -227,12 +227,12 @@ WRITE8_MEMBER(astrocade_whiteram_device::write) // R&L 64K RAM Board (44KB installed) has RAM in 0x5000-0xffff -READ8_MEMBER(astrocade_rl64ram_device::read) +uint8_t astrocade_rl64ram_device::read(offs_t offset) { return m_ram[offset]; } -WRITE8_MEMBER(astrocade_rl64ram_device::write) +void astrocade_rl64ram_device::write(offs_t offset, uint8_t data) { if (!m_write_prot->read()) m_ram[offset] = data; diff --git a/src/devices/bus/astrocde/ram.h b/src/devices/bus/astrocde/ram.h index 5c15029fb26..22e6e3bd590 100644 --- a/src/devices/bus/astrocde/ram.h +++ b/src/devices/bus/astrocde/ram.h @@ -22,10 +22,10 @@ public: virtual ioport_constructor device_input_ports() const override; // reading and writing - virtual DECLARE_READ8_MEMBER(read) override; - virtual DECLARE_WRITE8_MEMBER(write) override; - virtual DECLARE_READ8_MEMBER(read_io) override; - virtual DECLARE_WRITE8_MEMBER(write_io) override; + virtual uint8_t read(offs_t offset) override; + virtual void write(offs_t offset, uint8_t data) override; + virtual uint8_t read_io(offs_t offset) override; + virtual void write_io(offs_t offset, uint8_t data) override; uint8_t porta_r(); uint8_t portb_r(); @@ -79,8 +79,8 @@ public: virtual ioport_constructor device_input_ports() const override; // reading and writing - virtual DECLARE_READ8_MEMBER(read) override; - virtual DECLARE_WRITE8_MEMBER(write) override; + virtual uint8_t read(offs_t offset) override; + virtual void write(offs_t offset, uint8_t data) override; protected: virtual void device_start() override { m_ram.resize(0x4000); save_item(NAME(m_ram)); } @@ -103,8 +103,8 @@ public: virtual ioport_constructor device_input_ports() const override; // reading and writing - virtual DECLARE_READ8_MEMBER(read) override; - virtual DECLARE_WRITE8_MEMBER(write) override; + virtual uint8_t read(offs_t offset) override; + virtual void write(offs_t offset, uint8_t data) override; protected: virtual void device_start() override { m_ram.resize(0x8000); save_item(NAME(m_ram)); } @@ -127,8 +127,8 @@ public: virtual ioport_constructor device_input_ports() const override; // reading and writing - virtual DECLARE_READ8_MEMBER(read) override; - virtual DECLARE_WRITE8_MEMBER(write) override; + virtual uint8_t read(offs_t offset) override; + virtual void write(offs_t offset, uint8_t data) override; protected: virtual void device_start() override { m_ram.resize(0xb000); save_item(NAME(m_ram)); } diff --git a/src/devices/bus/astrocde/rom.cpp b/src/devices/bus/astrocde/rom.cpp index bb5d6912fc2..e574c63ecd7 100644 --- a/src/devices/bus/astrocde/rom.cpp +++ b/src/devices/bus/astrocde/rom.cpp @@ -75,7 +75,7 @@ void astrocade_rom_512k_device::device_reset() mapper specific handlers -------------------------------------------------*/ -READ8_MEMBER(astrocade_rom_device::read_rom) +uint8_t astrocade_rom_device::read_rom(offs_t offset) { if (offset < m_rom_size) return m_rom[offset]; @@ -83,7 +83,7 @@ READ8_MEMBER(astrocade_rom_device::read_rom) return 0xff; } -READ8_MEMBER(astrocade_rom_256k_device::read_rom) +uint8_t astrocade_rom_256k_device::read_rom(offs_t offset) { if (offset < 0x1000) // 0x2000-0x2fff return m_rom[offset + 0x1000 * 0x3f]; @@ -93,7 +93,7 @@ READ8_MEMBER(astrocade_rom_256k_device::read_rom) return m_base_bank = offset & 0x3f; } -READ8_MEMBER(astrocade_rom_512k_device::read_rom) +uint8_t astrocade_rom_512k_device::read_rom(offs_t offset) { if (offset < 0x1000) // 0x2000-0x2fff return m_rom[offset + 0x1000 * 0x7f]; @@ -103,7 +103,7 @@ READ8_MEMBER(astrocade_rom_512k_device::read_rom) return m_base_bank = offset & 0x7f; } -READ8_MEMBER(astrocade_rom_cass_device::read_rom) +uint8_t astrocade_rom_cass_device::read_rom(offs_t offset) { if (offset < m_rom_size) return m_rom[offset]; diff --git a/src/devices/bus/astrocde/rom.h b/src/devices/bus/astrocde/rom.h index efd17b16ded..8a8db1634de 100644 --- a/src/devices/bus/astrocde/rom.h +++ b/src/devices/bus/astrocde/rom.h @@ -19,7 +19,7 @@ public: astrocade_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom) override; + virtual uint8_t read_rom(offs_t offset) override; protected: astrocade_rom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -38,7 +38,7 @@ public: astrocade_rom_256k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom) override; + virtual uint8_t read_rom(offs_t offset) override; private: virtual void device_start() override; @@ -56,7 +56,7 @@ public: astrocade_rom_512k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom) override; + virtual uint8_t read_rom(offs_t offset) override; private: virtual void device_start() override; @@ -74,7 +74,7 @@ public: astrocade_rom_cass_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom) override; + virtual uint8_t read_rom(offs_t offset) override; private: virtual void device_start() override { } diff --git a/src/devices/bus/astrocde/slot.cpp b/src/devices/bus/astrocde/slot.cpp index 15135e08af1..7e7dc8cf059 100644 --- a/src/devices/bus/astrocde/slot.cpp +++ b/src/devices/bus/astrocde/slot.cpp @@ -203,10 +203,10 @@ std::string astrocade_cart_slot_device::get_default_card_software(get_default_ca read -------------------------------------------------*/ -READ8_MEMBER(astrocade_cart_slot_device::read_rom) +uint8_t astrocade_cart_slot_device::read_rom(offs_t offset) { if (m_cart) - return m_cart->read_rom(space, offset); + return m_cart->read_rom(offset); else return 0xff; } diff --git a/src/devices/bus/astrocde/slot.h b/src/devices/bus/astrocde/slot.h index f068d994798..d16f37e0fb1 100644 --- a/src/devices/bus/astrocde/slot.h +++ b/src/devices/bus/astrocde/slot.h @@ -33,7 +33,7 @@ public: virtual ~device_astrocade_cart_interface(); // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom) { return 0xff; } + virtual uint8_t read_rom(offs_t offset) { return 0xff; } void rom_alloc(uint32_t size, const char *tag); uint8_t* get_rom_base() { return m_rom; } @@ -88,7 +88,7 @@ public: int get_type() { return m_type; } // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom); + uint8_t read_rom(offs_t offset); protected: // device-level overrides diff --git a/src/devices/bus/bml3/bml3kanji.cpp b/src/devices/bus/bml3/bml3kanji.cpp index 585cbd93069..22bfe8d58a9 100644 --- a/src/devices/bus/bml3/bml3kanji.cpp +++ b/src/devices/bus/bml3/bml3kanji.cpp @@ -43,12 +43,12 @@ const tiny_rom_entry *bml3bus_kanji_device::device_rom_region() const return ROM_NAME( kanji ); } -READ8_MEMBER( bml3bus_kanji_device::bml3_kanji_r ) +uint8_t bml3bus_kanji_device::bml3_kanji_r(offs_t offset) { return m_rom[((uint32_t)m_kanji_addr << 1) + offset]; } -WRITE8_MEMBER( bml3bus_kanji_device::bml3_kanji_w ) +void bml3bus_kanji_device::bml3_kanji_w(offs_t offset, uint8_t data) { m_kanji_addr &= (0xff << (offset*8)); m_kanji_addr |= (data << ((offset^1)*8)); @@ -76,7 +76,7 @@ void bml3bus_kanji_device::device_start() // install into memory address_space &space_prg = space(); - space_prg.install_readwrite_handler(0xff75, 0xff76, read8_delegate(*this, FUNC(bml3bus_kanji_device::bml3_kanji_r)), write8_delegate(*this, FUNC(bml3bus_kanji_device::bml3_kanji_w))); + space_prg.install_readwrite_handler(0xff75, 0xff76, read8sm_delegate(*this, FUNC(bml3bus_kanji_device::bml3_kanji_r)), write8sm_delegate(*this, FUNC(bml3bus_kanji_device::bml3_kanji_w))); } void bml3bus_kanji_device::device_reset() diff --git a/src/devices/bus/bml3/bml3kanji.h b/src/devices/bus/bml3/bml3kanji.h index cee2b828c6f..2ce54ed8230 100644 --- a/src/devices/bus/bml3/bml3kanji.h +++ b/src/devices/bus/bml3/bml3kanji.h @@ -27,8 +27,8 @@ public: // construction/destruction bml3bus_kanji_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8_MEMBER(bml3_kanji_r); - DECLARE_WRITE8_MEMBER(bml3_kanji_w); + uint8_t bml3_kanji_r(offs_t offset); + void bml3_kanji_w(offs_t offset, uint8_t data); protected: virtual void device_start() override; diff --git a/src/devices/bus/bml3/bml3mp1802.cpp b/src/devices/bus/bml3/bml3mp1802.cpp index 22c84884f68..bd6da666c3a 100644 --- a/src/devices/bus/bml3/bml3mp1802.cpp +++ b/src/devices/bus/bml3/bml3mp1802.cpp @@ -76,12 +76,12 @@ const tiny_rom_entry *bml3bus_mp1802_device::device_rom_region() const return ROM_NAME( mp1802 ); } -READ8_MEMBER( bml3bus_mp1802_device::bml3_mp1802_r) +uint8_t bml3bus_mp1802_device::bml3_mp1802_r() { return m_fdc->drq_r() ? 0x00 : 0x80; } -WRITE8_MEMBER( bml3bus_mp1802_device::bml3_mp1802_w) +void bml3bus_mp1802_device::bml3_mp1802_w(uint8_t data) { floppy_image_device *floppy = nullptr; @@ -130,7 +130,7 @@ void bml3bus_mp1802_device::device_start() // install into memory address_space &space_prg = space(); space_prg.install_readwrite_handler(0xff00, 0xff03, read8sm_delegate(*m_fdc, FUNC(mb8866_device::read)), write8sm_delegate(*m_fdc, FUNC(mb8866_device::write))); - space_prg.install_readwrite_handler(0xff04, 0xff04, read8_delegate(*this, FUNC(bml3bus_mp1802_device::bml3_mp1802_r)), write8_delegate(*this, FUNC(bml3bus_mp1802_device::bml3_mp1802_w))); + space_prg.install_readwrite_handler(0xff04, 0xff04, read8smo_delegate(*this, FUNC(bml3bus_mp1802_device::bml3_mp1802_r)), write8smo_delegate(*this, FUNC(bml3bus_mp1802_device::bml3_mp1802_w))); // overwriting the main ROM (rather than using e.g. install_rom) should mean that bank switches for RAM expansion still work... uint8_t *mainrom = device().machine().root_device().memregion("maincpu")->base(); memcpy(mainrom + 0xf800, m_rom + 0xf800, 0x800); diff --git a/src/devices/bus/bml3/bml3mp1802.h b/src/devices/bus/bml3/bml3mp1802.h index 277d9ae89bd..d1bbdad744b 100644 --- a/src/devices/bus/bml3/bml3mp1802.h +++ b/src/devices/bus/bml3/bml3mp1802.h @@ -31,8 +31,8 @@ public: // construction/destruction bml3bus_mp1802_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8_MEMBER(bml3_mp1802_r); - DECLARE_WRITE8_MEMBER(bml3_mp1802_w); + uint8_t bml3_mp1802_r(); + void bml3_mp1802_w(uint8_t data); protected: virtual void device_start() override; diff --git a/src/devices/bus/bml3/bml3mp1805.cpp b/src/devices/bus/bml3/bml3mp1805.cpp index d5ce2f39598..c5608351b07 100644 --- a/src/devices/bus/bml3/bml3mp1805.cpp +++ b/src/devices/bus/bml3/bml3mp1805.cpp @@ -75,14 +75,14 @@ const tiny_rom_entry *bml3bus_mp1805_device::device_rom_region() const return ROM_NAME( mp1805 ); } -READ8_MEMBER( bml3bus_mp1805_device::bml3_mp1805_r) +uint8_t bml3bus_mp1805_device::bml3_mp1805_r() { // TODO: read supported or not? // return mc6843_drq_r(m_mc6843) ? 0x00 : 0x80; return -1; } -WRITE8_MEMBER( bml3bus_mp1805_device::bml3_mp1805_w) +void bml3bus_mp1805_device::bml3_mp1805_w(uint8_t data) { // b7 b6 b5 b4 b3 b2 b1 b0 // MT ? ? ? D3 D2 D1 D0 @@ -142,7 +142,7 @@ void bml3bus_mp1805_device::device_start() // install into memory address_space &space_prg = space(); space_prg.install_readwrite_handler(0xff18, 0xff1f, read8sm_delegate(*m_mc6843, FUNC(mc6843_device::read)), write8sm_delegate(*m_mc6843, FUNC(mc6843_device::write))); - space_prg.install_readwrite_handler(0xff20, 0xff20, read8_delegate(*this, FUNC(bml3bus_mp1805_device::bml3_mp1805_r)), write8_delegate(*this, FUNC(bml3bus_mp1805_device::bml3_mp1805_w))); + space_prg.install_readwrite_handler(0xff20, 0xff20, read8smo_delegate(*this, FUNC(bml3bus_mp1805_device::bml3_mp1805_r)), write8smo_delegate(*this, FUNC(bml3bus_mp1805_device::bml3_mp1805_w))); // overwriting the main ROM (rather than using e.g. install_rom) should mean that bank switches for RAM expansion still work... uint8_t *mainrom = device().machine().root_device().memregion("maincpu")->base(); memcpy(mainrom + 0xf800, m_rom + 0xf800, 0x800); diff --git a/src/devices/bus/bml3/bml3mp1805.h b/src/devices/bus/bml3/bml3mp1805.h index 5cc814e7723..0c0a40f4fd2 100644 --- a/src/devices/bus/bml3/bml3mp1805.h +++ b/src/devices/bus/bml3/bml3mp1805.h @@ -30,8 +30,8 @@ public: // construction/destruction bml3bus_mp1805_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8_MEMBER(bml3_mp1805_r); - DECLARE_WRITE8_MEMBER(bml3_mp1805_w); + uint8_t bml3_mp1805_r(); + void bml3_mp1805_w(uint8_t data); protected: virtual void device_start() override; diff --git a/src/devices/bus/bml3/bml3rtc.cpp b/src/devices/bus/bml3/bml3rtc.cpp index eced1123289..6fbe66f166e 100644 --- a/src/devices/bus/bml3/bml3rtc.cpp +++ b/src/devices/bus/bml3/bml3rtc.cpp @@ -35,7 +35,7 @@ void bml3bus_rtc_device::device_add_mconfig(machine_config &config) } -READ8_MEMBER(bml3bus_rtc_device::bml3_rtc_r) +uint8_t bml3bus_rtc_device::bml3_rtc_r(offs_t offset) { uint8_t data = 0x00; @@ -53,7 +53,7 @@ READ8_MEMBER(bml3bus_rtc_device::bml3_rtc_r) return data | 0xf0; // return low nibble only } -WRITE8_MEMBER(bml3bus_rtc_device::bml3_rtc_w) +void bml3bus_rtc_device::bml3_rtc_w(offs_t offset, uint8_t data) { switch (offset) { @@ -97,7 +97,7 @@ void bml3bus_rtc_device::device_start() { // install into memory address_space &space_prg = space(); - space_prg.install_readwrite_handler(0xff38, 0xff3a, read8_delegate(*this, FUNC(bml3bus_rtc_device::bml3_rtc_r)), write8_delegate(*this, FUNC(bml3bus_rtc_device::bml3_rtc_w))); + space_prg.install_readwrite_handler(0xff38, 0xff3a, read8sm_delegate(*this, FUNC(bml3bus_rtc_device::bml3_rtc_r)), write8sm_delegate(*this, FUNC(bml3bus_rtc_device::bml3_rtc_w))); m_addr_latch = 0; m_data_latch = 0; diff --git a/src/devices/bus/bml3/bml3rtc.h b/src/devices/bus/bml3/bml3rtc.h index 2adb9870804..16c6cbd0e9c 100644 --- a/src/devices/bus/bml3/bml3rtc.h +++ b/src/devices/bus/bml3/bml3rtc.h @@ -29,8 +29,8 @@ public: // construction/destruction bml3bus_rtc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8_MEMBER(bml3_rtc_r); - DECLARE_WRITE8_MEMBER(bml3_rtc_w); + uint8_t bml3_rtc_r(offs_t offset); + void bml3_rtc_w(offs_t offset, uint8_t data); protected: // device-level overrides diff --git a/src/devices/bus/cgenie/expansion/floppy.cpp b/src/devices/bus/cgenie/expansion/floppy.cpp index 6238aaa936f..ef1dd23128f 100644 --- a/src/devices/bus/cgenie/expansion/floppy.cpp +++ b/src/devices/bus/cgenie/expansion/floppy.cpp @@ -155,13 +155,15 @@ void cgenie_fdc_device::device_reset() // IMPLEMENTATION //************************************************************************** -READ8_MEMBER( cgenie_fdc_device::irq_r ) +uint8_t cgenie_fdc_device::irq_r() { uint8_t data = m_irq_status; - m_irq_status &= ~IRQ_TIMER; - m_slot->int_w(m_irq_status ? ASSERT_LINE : CLEAR_LINE); - + if (!machine().side_effects_disabled()) + { + m_irq_status &= ~IRQ_TIMER; + m_slot->int_w(m_irq_status ? ASSERT_LINE : CLEAR_LINE); + } return data; } @@ -200,7 +202,7 @@ WRITE_LINE_MEMBER( cgenie_fdc_device::intrq_w ) m_slot->int_w(m_irq_status ? ASSERT_LINE : CLEAR_LINE); } -WRITE8_MEMBER( cgenie_fdc_device::select_w ) +void cgenie_fdc_device::select_w(uint8_t data) { if (VERBOSE) logerror("cgenie_fdc_device::motor_w: 0x%02x\n", data); @@ -221,7 +223,7 @@ WRITE8_MEMBER( cgenie_fdc_device::select_w ) } } -WRITE8_MEMBER( cgenie_fdc_device::command_w ) +void cgenie_fdc_device::command_w(uint8_t data) { // density select is encoded into this pseudo-command if ((data & 0xfe) == 0xfe) diff --git a/src/devices/bus/cgenie/expansion/floppy.h b/src/devices/bus/cgenie/expansion/floppy.h index 1b6dbf5268b..80f1f47aa65 100644 --- a/src/devices/bus/cgenie/expansion/floppy.h +++ b/src/devices/bus/cgenie/expansion/floppy.h @@ -43,9 +43,9 @@ private: TIMER_DEVICE_CALLBACK_MEMBER(timer_callback); - DECLARE_READ8_MEMBER(irq_r); - DECLARE_WRITE8_MEMBER(select_w); - DECLARE_WRITE8_MEMBER(command_w); + uint8_t irq_r(); + void select_w(uint8_t data); + void command_w(uint8_t data); void mmio(address_map &map); diff --git a/src/devices/bus/chanf/rom.cpp b/src/devices/bus/chanf/rom.cpp index a3a213ba7ed..ab4b1a83750 100644 --- a/src/devices/bus/chanf/rom.cpp +++ b/src/devices/bus/chanf/rom.cpp @@ -145,7 +145,7 @@ void chanf_multi_final_device::device_reset() mapper specific handlers -------------------------------------------------*/ -READ8_MEMBER(chanf_rom_device::read_rom) +uint8_t chanf_rom_device::read_rom(offs_t offset) { if (offset < m_rom_size) return m_rom[offset]; @@ -212,7 +212,7 @@ void chanf_rom_device::common_write_3853(uint32_t offset, uint8_t data) m_ram[offset] = data; } -READ8_MEMBER(chanf_multi_old_device::read_rom) +uint8_t chanf_multi_old_device::read_rom(offs_t offset) { if (offset < 0x2000) return m_rom[offset + m_base_bank * 0x2000]; @@ -220,13 +220,13 @@ READ8_MEMBER(chanf_multi_old_device::read_rom) return 0xff; } -WRITE8_MEMBER(chanf_multi_old_device::write_bank) +void chanf_multi_old_device::write_bank(uint8_t data) { //printf("0x%x\n", data); m_base_bank = data & 0x1f; } -READ8_MEMBER(chanf_multi_final_device::read_rom) +uint8_t chanf_multi_final_device::read_rom(offs_t offset) { if (offset < 0x2000) return m_rom[offset + (m_base_bank * 0x2000) + (m_half_bank * 0x1000)]; @@ -234,7 +234,7 @@ READ8_MEMBER(chanf_multi_final_device::read_rom) return 0xff; } -WRITE8_MEMBER(chanf_multi_final_device::write_bank) +void chanf_multi_final_device::write_bank(uint8_t data) { //printf("0x%x\n", data); m_base_bank = data & 0x1f; diff --git a/src/devices/bus/chanf/rom.h b/src/devices/bus/chanf/rom.h index bd32f177ff8..76221811881 100644 --- a/src/devices/bus/chanf/rom.h +++ b/src/devices/bus/chanf/rom.h @@ -25,7 +25,7 @@ public: void common_write_3853(uint32_t offset, uint8_t data); // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom) override; + virtual uint8_t read_rom(offs_t offset) override; protected: chanf_rom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -49,8 +49,8 @@ public: virtual void device_reset() override; // reading and writing - virtual DECLARE_READ8_MEMBER(read_ram) override { return common_read_2102(offset); } - virtual DECLARE_WRITE8_MEMBER(write_ram) override { common_write_2102(offset, data); } + virtual uint8_t read_ram(offs_t offset) override { return common_read_2102(offset); } + virtual void write_ram(offs_t offset, uint8_t data) override { common_write_2102(offset, data); } }; @@ -67,8 +67,8 @@ public: virtual void device_reset() override; // reading and writing - virtual DECLARE_READ8_MEMBER(read_ram) override { return common_read_2102(offset); } - virtual DECLARE_WRITE8_MEMBER(write_ram) override { common_write_2102(offset, data); } + virtual uint8_t read_ram(offs_t offset) override { return common_read_2102(offset); } + virtual void write_ram(offs_t offset, uint8_t data) override { common_write_2102(offset, data); } }; @@ -81,8 +81,8 @@ public: chanf_chess_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_ram) override { return common_read_3853(offset); } - virtual DECLARE_WRITE8_MEMBER(write_ram) override { common_write_3853(offset, data); } + virtual uint8_t read_ram(offs_t offset) override { return common_read_3853(offset); } + virtual void write_ram(offs_t offset, uint8_t data) override { common_write_3853(offset, data); } }; @@ -99,10 +99,10 @@ public: virtual void device_reset() override; // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom) override; - virtual DECLARE_READ8_MEMBER(read_ram) override { return common_read_3853(offset); } - virtual DECLARE_WRITE8_MEMBER(write_ram) override { common_write_3853(offset, data); } - virtual DECLARE_WRITE8_MEMBER(write_bank) override; + virtual uint8_t read_rom(offs_t offset) override; + virtual uint8_t read_ram(offs_t offset) override { return common_read_3853(offset); } + virtual void write_ram(offs_t offset, uint8_t data) override { common_write_3853(offset, data); } + virtual void write_bank(uint8_t data) override; private: int m_base_bank; @@ -122,10 +122,10 @@ public: virtual void device_reset() override; // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom) override; - virtual DECLARE_READ8_MEMBER(read_ram) override { return common_read_3853(offset); } - virtual DECLARE_WRITE8_MEMBER(write_ram) override { common_write_3853(offset, data); } - virtual DECLARE_WRITE8_MEMBER(write_bank) override; + virtual uint8_t read_rom(offs_t offset) override; + virtual uint8_t read_ram(offs_t offset) override { return common_read_3853(offset); } + virtual void write_ram(offs_t offset, uint8_t data) override { common_write_3853(offset, data); } + virtual void write_bank(uint8_t data) override; private: int m_base_bank, m_half_bank; diff --git a/src/devices/bus/chanf/slot.cpp b/src/devices/bus/chanf/slot.cpp index ae0b5f6096b..62de4ba67c0 100644 --- a/src/devices/bus/chanf/slot.cpp +++ b/src/devices/bus/chanf/slot.cpp @@ -219,10 +219,10 @@ std::string channelf_cart_slot_device::get_default_card_software(get_default_car read -------------------------------------------------*/ -READ8_MEMBER(channelf_cart_slot_device::read_rom) +uint8_t channelf_cart_slot_device::read_rom(offs_t offset) { if (m_cart) - return m_cart->read_rom(space, offset); + return m_cart->read_rom(offset); else return 0xff; } @@ -231,10 +231,10 @@ READ8_MEMBER(channelf_cart_slot_device::read_rom) read -------------------------------------------------*/ -READ8_MEMBER(channelf_cart_slot_device::read_ram) +uint8_t channelf_cart_slot_device::read_ram(offs_t offset) { if (m_cart) - return m_cart->read_ram(space, offset); + return m_cart->read_ram(offset); else return 0xff; } @@ -243,18 +243,18 @@ READ8_MEMBER(channelf_cart_slot_device::read_ram) write -------------------------------------------------*/ -WRITE8_MEMBER(channelf_cart_slot_device::write_ram) +void channelf_cart_slot_device::write_ram(offs_t offset, uint8_t data) { if (m_cart) - m_cart->write_ram(space, offset, data); + m_cart->write_ram(offset, data); } /*------------------------------------------------- write -------------------------------------------------*/ -WRITE8_MEMBER(channelf_cart_slot_device::write_bank) +void channelf_cart_slot_device::write_bank(uint8_t data) { if (m_cart) - m_cart->write_bank(space, offset, data); + m_cart->write_bank(data); } diff --git a/src/devices/bus/chanf/slot.h b/src/devices/bus/chanf/slot.h index 5287dad72da..09f58f03800 100644 --- a/src/devices/bus/chanf/slot.h +++ b/src/devices/bus/chanf/slot.h @@ -32,10 +32,10 @@ public: virtual ~device_channelf_cart_interface(); // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom) { return 0xff; } - virtual DECLARE_READ8_MEMBER(read_ram) { return 0xff; } - virtual DECLARE_WRITE8_MEMBER(write_ram) { } - virtual DECLARE_WRITE8_MEMBER(write_bank) { } + virtual uint8_t read_rom(offs_t offset) { return 0xff; } + virtual uint8_t read_ram(offs_t offset) { return 0xff; } + virtual void write_ram(offs_t offset, uint8_t data) { } + virtual void write_bank(uint8_t data) { } void rom_alloc(uint32_t size, const char *tag); void ram_alloc(uint32_t size); @@ -98,10 +98,10 @@ public: void save_ram() { if (m_cart && m_cart->get_ram_size()) m_cart->save_ram(); } // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom); - virtual DECLARE_READ8_MEMBER(read_ram); - virtual DECLARE_WRITE8_MEMBER(write_ram); - virtual DECLARE_WRITE8_MEMBER(write_bank); + uint8_t read_rom(offs_t offset); + uint8_t read_ram(offs_t offset); + void write_ram(offs_t offset, uint8_t data); + void write_bank(uint8_t data); protected: // device-level overrides diff --git a/src/devices/bus/crvision/rom.cpp b/src/devices/bus/crvision/rom.cpp index fad177683b0..f4aac5393d8 100644 --- a/src/devices/bus/crvision/rom.cpp +++ b/src/devices/bus/crvision/rom.cpp @@ -72,7 +72,7 @@ crvision_rom18k_device::crvision_rom18k_device(const machine_config &mconfig, co mapper specific handlers -------------------------------------------------*/ -READ8_MEMBER(crvision_rom_device::read_rom80) +uint8_t crvision_rom_device::read_rom80(offs_t offset) { offset &= 0x1fff; if (offset < 0x1000) @@ -82,7 +82,7 @@ READ8_MEMBER(crvision_rom_device::read_rom80) } -READ8_MEMBER(crvision_rom6k_device::read_rom80) +uint8_t crvision_rom6k_device::read_rom80(offs_t offset) { offset &= 0x1fff; if (offset < 0x1000) @@ -92,48 +92,48 @@ READ8_MEMBER(crvision_rom6k_device::read_rom80) } -READ8_MEMBER(crvision_rom8k_device::read_rom80) +uint8_t crvision_rom8k_device::read_rom80(offs_t offset) { return m_rom[offset & 0x1fff]; } -READ8_MEMBER(crvision_rom10k_device::read_rom80) +uint8_t crvision_rom10k_device::read_rom80(offs_t offset) { return m_rom[offset & 0x1fff]; } -READ8_MEMBER(crvision_rom10k_device::read_rom40) +uint8_t crvision_rom10k_device::read_rom40(offs_t offset) { return m_rom[0x2000 + (offset & 0x7ff)]; } -READ8_MEMBER(crvision_rom12k_device::read_rom80) +uint8_t crvision_rom12k_device::read_rom80(offs_t offset) { return m_rom[offset & 0x1fff]; } -READ8_MEMBER(crvision_rom12k_device::read_rom40) +uint8_t crvision_rom12k_device::read_rom40(offs_t offset) { return m_rom[0x2000 + (offset & 0xfff)]; } -READ8_MEMBER(crvision_rom16k_device::read_rom80) +uint8_t crvision_rom16k_device::read_rom80(offs_t offset) { // lower 8K in 0xa000-0xbfff, higher 8K in 0x8000-0x9fff return m_rom[offset ^ 0x2000]; } -READ8_MEMBER(crvision_rom18k_device::read_rom80) +uint8_t crvision_rom18k_device::read_rom80(offs_t offset) { // lower 8K in 0xa000-0xbfff, higher 8K in 0x8000-0x9fff return m_rom[offset ^ 0x2000]; } -READ8_MEMBER(crvision_rom18k_device::read_rom40) +uint8_t crvision_rom18k_device::read_rom40(offs_t offset) { return m_rom[0x4000 + (offset & 0x7ff)]; } diff --git a/src/devices/bus/crvision/rom.h b/src/devices/bus/crvision/rom.h index cf15b1e4e2a..ffb07e8c601 100644 --- a/src/devices/bus/crvision/rom.h +++ b/src/devices/bus/crvision/rom.h @@ -18,7 +18,7 @@ public: crvision_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom80) override; + virtual uint8_t read_rom80(offs_t offset) override; protected: crvision_rom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -37,7 +37,7 @@ public: crvision_rom6k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom80) override; + virtual uint8_t read_rom80(offs_t offset) override; }; // ======================> crvision_rom8k_device @@ -49,7 +49,7 @@ public: crvision_rom8k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom80) override; + virtual uint8_t read_rom80(offs_t offset) override; }; // ======================> crvision_rom10k_device @@ -61,8 +61,8 @@ public: crvision_rom10k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom40) override; - virtual DECLARE_READ8_MEMBER(read_rom80) override; + virtual uint8_t read_rom40(offs_t offset) override; + virtual uint8_t read_rom80(offs_t offset) override; }; // ======================> crvision_rom12k_device @@ -74,8 +74,8 @@ public: crvision_rom12k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom40) override; - virtual DECLARE_READ8_MEMBER(read_rom80) override; + virtual uint8_t read_rom40(offs_t offset) override; + virtual uint8_t read_rom80(offs_t offset) override; }; // ======================> crvision_rom16k_device @@ -87,7 +87,7 @@ public: crvision_rom16k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom80) override; + virtual uint8_t read_rom80(offs_t offset) override; }; // ======================> crvision_rom18k_device @@ -99,8 +99,8 @@ public: crvision_rom18k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom40) override; - virtual DECLARE_READ8_MEMBER(read_rom80) override; + virtual uint8_t read_rom40(offs_t offset) override; + virtual uint8_t read_rom80(offs_t offset) override; }; diff --git a/src/devices/bus/crvision/slot.cpp b/src/devices/bus/crvision/slot.cpp index 068e5b056ab..1df2292c982 100644 --- a/src/devices/bus/crvision/slot.cpp +++ b/src/devices/bus/crvision/slot.cpp @@ -253,18 +253,18 @@ std::string crvision_cart_slot_device::get_default_card_software(get_default_car read_rom -------------------------------------------------*/ -READ8_MEMBER(crvision_cart_slot_device::read_rom40) +uint8_t crvision_cart_slot_device::read_rom40(offs_t offset) { if (m_cart) - return m_cart->read_rom40(space, offset); + return m_cart->read_rom40(offset); else return 0xff; } -READ8_MEMBER(crvision_cart_slot_device::read_rom80) +uint8_t crvision_cart_slot_device::read_rom80(offs_t offset) { if (m_cart) - return m_cart->read_rom80(space, offset); + return m_cart->read_rom80(offset); else return 0xff; } diff --git a/src/devices/bus/crvision/slot.h b/src/devices/bus/crvision/slot.h index ce3de1b3c4c..9ea0c72b5c5 100644 --- a/src/devices/bus/crvision/slot.h +++ b/src/devices/bus/crvision/slot.h @@ -36,8 +36,8 @@ public: virtual ~device_crvision_cart_interface(); // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom40) { return 0xff; } - virtual DECLARE_READ8_MEMBER(read_rom80) { return 0xff; } + virtual uint8_t read_rom40(offs_t offset) { return 0xff; } + virtual uint8_t read_rom80(offs_t offset) { return 0xff; } void rom_alloc(uint32_t size, const char *tag); uint8_t* get_rom_base() { return m_rom; } @@ -91,8 +91,8 @@ public: int get_type() { return m_type; } // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom40); - virtual DECLARE_READ8_MEMBER(read_rom80); + uint8_t read_rom40(offs_t offset); + uint8_t read_rom80(offs_t offset); protected: // device-level overrides diff --git a/src/devices/bus/ecbbus/ecbbus.cpp b/src/devices/bus/ecbbus/ecbbus.cpp index d222573cdf4..5eaeda9f284 100644 --- a/src/devices/bus/ecbbus/ecbbus.cpp +++ b/src/devices/bus/ecbbus/ecbbus.cpp @@ -116,7 +116,7 @@ void ecbbus_device::add_card(device_ecbbus_card_interface &card, int pos) // mem_r - //------------------------------------------------- -READ8_MEMBER( ecbbus_device::mem_r ) +uint8_t ecbbus_device::mem_r(offs_t offset) { uint8_t data = 0; @@ -136,7 +136,7 @@ READ8_MEMBER( ecbbus_device::mem_r ) // mem_w - //------------------------------------------------- -WRITE8_MEMBER( ecbbus_device::mem_w ) +void ecbbus_device::mem_w(offs_t offset, uint8_t data) { for (auto & elem : m_ecbbus_device) { @@ -152,7 +152,7 @@ WRITE8_MEMBER( ecbbus_device::mem_w ) // io_r - //------------------------------------------------- -READ8_MEMBER( ecbbus_device::io_r ) +uint8_t ecbbus_device::io_r(offs_t offset) { uint8_t data = 0; @@ -172,7 +172,7 @@ READ8_MEMBER( ecbbus_device::io_r ) // io_w - //------------------------------------------------- -WRITE8_MEMBER( ecbbus_device::io_w ) +void ecbbus_device::io_w(offs_t offset, uint8_t data) { for (auto & elem : m_ecbbus_device) { diff --git a/src/devices/bus/ecbbus/ecbbus.h b/src/devices/bus/ecbbus/ecbbus.h index 21ee9eb2bd3..bee5201a2fc 100644 --- a/src/devices/bus/ecbbus/ecbbus.h +++ b/src/devices/bus/ecbbus/ecbbus.h @@ -110,11 +110,11 @@ public: void add_card(device_ecbbus_card_interface &card, int pos); - DECLARE_READ8_MEMBER( mem_r ); - DECLARE_WRITE8_MEMBER( mem_w ); + uint8_t mem_r(offs_t offset); + void mem_w(offs_t offset, uint8_t data); - DECLARE_READ8_MEMBER( io_r ); - DECLARE_WRITE8_MEMBER( io_w ); + uint8_t io_r(offs_t offset); + void io_w(offs_t offset, uint8_t data); DECLARE_WRITE_LINE_MEMBER( irq_w ) { m_write_irq(state); } DECLARE_WRITE_LINE_MEMBER( nmi_w ) { m_write_nmi(state); } diff --git a/src/devices/bus/ecbbus/grip.cpp b/src/devices/bus/ecbbus/grip.cpp index a51abad6c91..da925187f5e 100644 --- a/src/devices/bus/ecbbus/grip.cpp +++ b/src/devices/bus/ecbbus/grip.cpp @@ -634,7 +634,7 @@ void ecb_grip21_device::device_reset() // vol0_w - volume 0 //------------------------------------------------- -WRITE8_MEMBER( ecb_grip21_device::vol0_w ) +void ecb_grip21_device::vol0_w(uint8_t data) { m_vol0 = BIT(data, 7); } @@ -644,7 +644,7 @@ WRITE8_MEMBER( ecb_grip21_device::vol0_w ) // vol1_w - volume 1 //------------------------------------------------- -WRITE8_MEMBER( ecb_grip21_device::vol1_w ) +void ecb_grip21_device::vol1_w(uint8_t data) { m_vol1 = BIT(data, 7); } @@ -654,7 +654,7 @@ WRITE8_MEMBER( ecb_grip21_device::vol1_w ) // flash_w - //------------------------------------------------- -WRITE8_MEMBER( ecb_grip21_device::flash_w ) +void ecb_grip21_device::flash_w(uint8_t data) { m_flash = BIT(data, 7); } @@ -664,7 +664,7 @@ WRITE8_MEMBER( ecb_grip21_device::flash_w ) // page_w - video page select //------------------------------------------------- -WRITE8_MEMBER( ecb_grip21_device::page_w ) +void ecb_grip21_device::page_w(uint8_t data) { m_page = BIT(data, 7); @@ -681,7 +681,7 @@ WRITE_LINE_MEMBER(ecb_grip21_device::write_centronics_fault) m_centronics_fault = state; } -READ8_MEMBER( ecb_grip21_device::stat_r ) +uint8_t ecb_grip21_device::stat_r() { /* @@ -739,9 +739,10 @@ READ8_MEMBER( ecb_grip21_device::stat_r ) // lrs_r - //------------------------------------------------- -READ8_MEMBER( ecb_grip21_device::lrs_r ) +uint8_t ecb_grip21_device::lrs_r() { - m_lps = 0; + if (!machine().side_effects_disabled()) + m_lps = 0; return 0; } @@ -751,7 +752,7 @@ READ8_MEMBER( ecb_grip21_device::lrs_r ) // lrs_w - //------------------------------------------------- -WRITE8_MEMBER( ecb_grip21_device::lrs_w ) +void ecb_grip21_device::lrs_w(uint8_t data) { m_lps = 0; } @@ -761,10 +762,13 @@ WRITE8_MEMBER( ecb_grip21_device::lrs_w ) // cxstb_r - centronics strobe //------------------------------------------------- -READ8_MEMBER( ecb_grip21_device::cxstb_r ) +uint8_t ecb_grip21_device::cxstb_r() { - m_centronics->write_strobe(0); - m_centronics->write_strobe(1); + if (!machine().side_effects_disabled()) + { + m_centronics->write_strobe(0); + m_centronics->write_strobe(1); + } return 0; } @@ -774,7 +778,7 @@ READ8_MEMBER( ecb_grip21_device::cxstb_r ) // cxstb_w - centronics strobe //------------------------------------------------- -WRITE8_MEMBER( ecb_grip21_device::cxstb_w ) +void ecb_grip21_device::cxstb_w(uint8_t data) { m_centronics->write_strobe(0); m_centronics->write_strobe(1); @@ -785,9 +789,9 @@ WRITE8_MEMBER( ecb_grip21_device::cxstb_w ) // eprom_w - EPROM bank select //------------------------------------------------- -WRITE8_MEMBER( grip5_state::eprom_w ) +void grip5_state::eprom_w(uint8_t data) { - membank("eprom")->set_entry(BIT(data, 0)); + membank("eprom")->set_entry(BIT(data, 0)); } @@ -795,9 +799,9 @@ WRITE8_MEMBER( grip5_state::eprom_w ) // dpage_w - display page select //------------------------------------------------- -WRITE8_MEMBER( grip5_state::dpage_w ) +void grip5_state::dpage_w(uint8_t data) { - m_dpage = BIT(data, 7); + m_dpage = BIT(data, 7); } */ diff --git a/src/devices/bus/ecbbus/grip.h b/src/devices/bus/ecbbus/grip.h index 9deaa5ddfbe..076a61880d9 100644 --- a/src/devices/bus/ecbbus/grip.h +++ b/src/devices/bus/ecbbus/grip.h @@ -103,23 +103,23 @@ private: // timers emu_timer *m_kb_timer; - DECLARE_WRITE8_MEMBER( vol0_w ); - DECLARE_WRITE8_MEMBER( vol1_w ); - DECLARE_WRITE8_MEMBER( flash_w ); - DECLARE_WRITE8_MEMBER( page_w ); - DECLARE_READ8_MEMBER( stat_r ); - DECLARE_READ8_MEMBER( lrs_r ); - DECLARE_WRITE8_MEMBER( lrs_w ); - DECLARE_READ8_MEMBER( cxstb_r ); - DECLARE_WRITE8_MEMBER( cxstb_w ); + void vol0_w(uint8_t data); + void vol1_w(uint8_t data); + void flash_w(uint8_t data); + void page_w(uint8_t data); + uint8_t stat_r(); + uint8_t lrs_r(); + void lrs_w(uint8_t data); + uint8_t cxstb_r(); + void cxstb_w(uint8_t data); void grip_io(address_map &map); void grip_mem(address_map &map); /* required_device m_crtc; - DECLARE_WRITE8_MEMBER( eprom_w ); - DECLARE_WRITE8_MEMBER( dpage_w ); + void eprom_w(uint8_t data); + void dpage_w(uint8_t data); // video state int m_dpage; // displayed video page diff --git a/src/devices/bus/econet/e01.cpp b/src/devices/bus/econet/e01.cpp index 4a58753628e..ede1c58dafa 100644 --- a/src/devices/bus/econet/e01.cpp +++ b/src/devices/bus/econet/e01.cpp @@ -467,7 +467,7 @@ void econet_e01_device::device_timer(emu_timer &timer, device_timer_id id, int p // read - //------------------------------------------------- -READ8_MEMBER( econet_e01_device::read ) +uint8_t econet_e01_device::read(offs_t offset) { uint8_t data; @@ -488,7 +488,7 @@ READ8_MEMBER( econet_e01_device::read ) // write - //------------------------------------------------- -WRITE8_MEMBER( econet_e01_device::write ) +void econet_e01_device::write(offs_t offset, uint8_t data) { m_ram->pointer()[offset] = data; } @@ -498,9 +498,10 @@ WRITE8_MEMBER( econet_e01_device::write ) // eprom_r - ROM/RAM select read //------------------------------------------------- -READ8_MEMBER( econet_e01_device::ram_select_r ) +uint8_t econet_e01_device::ram_select_r() { - m_ram_en = true; + if (!machine().side_effects_disabled()) + m_ram_en = true; return 0; } @@ -510,7 +511,7 @@ READ8_MEMBER( econet_e01_device::ram_select_r ) // floppy_w - floppy control write //------------------------------------------------- -WRITE8_MEMBER( econet_e01_device::floppy_w ) +void econet_e01_device::floppy_w(uint8_t data) { /* @@ -558,9 +559,10 @@ WRITE8_MEMBER( econet_e01_device::floppy_w ) // network_irq_disable_r - //------------------------------------------------- -READ8_MEMBER( econet_e01_device::network_irq_disable_r ) +uint8_t econet_e01_device::network_irq_disable_r() { - network_irq_enable(0); + if (!machine().side_effects_disabled()) + network_irq_enable(0); return 0; } @@ -570,7 +572,7 @@ READ8_MEMBER( econet_e01_device::network_irq_disable_r ) // network_irq_disable_w - //------------------------------------------------- -WRITE8_MEMBER( econet_e01_device::network_irq_disable_w ) +void econet_e01_device::network_irq_disable_w(uint8_t data) { network_irq_enable(0); } @@ -580,9 +582,10 @@ WRITE8_MEMBER( econet_e01_device::network_irq_disable_w ) // network_irq_enable_r - //------------------------------------------------- -READ8_MEMBER( econet_e01_device::network_irq_enable_r ) +uint8_t econet_e01_device::network_irq_enable_r() { - network_irq_enable(1); + if (!machine().side_effects_disabled()) + network_irq_enable(1); return 0; } @@ -592,7 +595,7 @@ READ8_MEMBER( econet_e01_device::network_irq_enable_r ) // network_irq_enable_w - //------------------------------------------------- -WRITE8_MEMBER( econet_e01_device::network_irq_enable_w ) +void econet_e01_device::network_irq_enable_w(uint8_t data) { network_irq_enable(1); } @@ -602,11 +605,12 @@ WRITE8_MEMBER( econet_e01_device::network_irq_enable_w ) // hdc_data_r - //------------------------------------------------- -READ8_MEMBER( econet_e01_device::hdc_data_r ) +uint8_t econet_e01_device::hdc_data_r() { uint8_t data = m_scsi_data_in->read(); - m_scsibus->write_ack(1); + if (!machine().side_effects_disabled()) + m_scsibus->write_ack(1); return data; } @@ -616,7 +620,7 @@ READ8_MEMBER( econet_e01_device::hdc_data_r ) // hdc_data_w - //------------------------------------------------- -WRITE8_MEMBER( econet_e01_device::hdc_data_w ) +void econet_e01_device::hdc_data_w(uint8_t data) { m_scsi_data_out->write(data); @@ -628,7 +632,7 @@ WRITE8_MEMBER( econet_e01_device::hdc_data_w ) // hdc_select_w - //------------------------------------------------- -WRITE8_MEMBER( econet_e01_device::hdc_select_w ) +void econet_e01_device::hdc_select_w(uint8_t data) { m_scsibus->write_sel(1); } @@ -638,7 +642,7 @@ WRITE8_MEMBER( econet_e01_device::hdc_select_w ) // hdc_irq_enable_w - //------------------------------------------------- -WRITE8_MEMBER( econet_e01_device::hdc_irq_enable_w ) +void econet_e01_device::hdc_irq_enable_w(uint8_t data) { hdc_irq_enable(BIT(data, 0)); } @@ -648,7 +652,7 @@ WRITE8_MEMBER( econet_e01_device::hdc_irq_enable_w ) // rtc_address_r - //------------------------------------------------- -READ8_MEMBER( econet_e01_device::rtc_address_r ) +uint8_t econet_e01_device::rtc_address_r() { return m_rtc->read(0); } @@ -658,7 +662,7 @@ READ8_MEMBER( econet_e01_device::rtc_address_r ) // rtc_address_w - //------------------------------------------------- -WRITE8_MEMBER( econet_e01_device::rtc_address_w ) +void econet_e01_device::rtc_address_w(uint8_t data) { m_rtc->write(0, data); } @@ -668,7 +672,7 @@ WRITE8_MEMBER( econet_e01_device::rtc_address_w ) // rtc_data_r - //------------------------------------------------- -READ8_MEMBER( econet_e01_device::rtc_data_r ) +uint8_t econet_e01_device::rtc_data_r() { return m_rtc->read(1); } @@ -678,7 +682,7 @@ READ8_MEMBER( econet_e01_device::rtc_data_r ) // rtc_data_w - //------------------------------------------------- -WRITE8_MEMBER( econet_e01_device::rtc_data_w ) +void econet_e01_device::rtc_data_w(uint8_t data) { m_rtc->write(1, data); } diff --git a/src/devices/bus/econet/e01.h b/src/devices/bus/econet/e01.h index 6dc2d105949..9c434b58768 100644 --- a/src/devices/bus/econet/e01.h +++ b/src/devices/bus/econet/e01.h @@ -65,22 +65,22 @@ private: DECLARE_WRITE_LINE_MEMBER( fdc_drq_w ); DECLARE_WRITE_LINE_MEMBER( scsi_bsy_w ); DECLARE_WRITE_LINE_MEMBER( scsi_req_w ); - DECLARE_READ8_MEMBER( read ); - DECLARE_WRITE8_MEMBER( write ); - DECLARE_READ8_MEMBER( ram_select_r ); - DECLARE_WRITE8_MEMBER( floppy_w ); - DECLARE_READ8_MEMBER( network_irq_disable_r ); - DECLARE_WRITE8_MEMBER( network_irq_disable_w ); - DECLARE_READ8_MEMBER( network_irq_enable_r ); - DECLARE_WRITE8_MEMBER( network_irq_enable_w ); - DECLARE_READ8_MEMBER( hdc_data_r ); - DECLARE_WRITE8_MEMBER( hdc_data_w ); - DECLARE_WRITE8_MEMBER( hdc_select_w ); - DECLARE_WRITE8_MEMBER( hdc_irq_enable_w ); - DECLARE_READ8_MEMBER( rtc_address_r ); - DECLARE_WRITE8_MEMBER( rtc_address_w ); - DECLARE_READ8_MEMBER( rtc_data_r ); - DECLARE_WRITE8_MEMBER( rtc_data_w ); + uint8_t read(offs_t offset); + void write(offs_t offset, uint8_t data); + uint8_t ram_select_r(); + void floppy_w(uint8_t data); + uint8_t network_irq_disable_r(); + void network_irq_disable_w(uint8_t data); + uint8_t network_irq_enable_r(); + void network_irq_enable_w(uint8_t data); + uint8_t hdc_data_r(); + void hdc_data_w(uint8_t data); + void hdc_select_w(uint8_t data); + void hdc_irq_enable_w(uint8_t data); + uint8_t rtc_address_r(); + void rtc_address_w(uint8_t data); + uint8_t rtc_data_r(); + void rtc_data_w(uint8_t data); DECLARE_FLOPPY_FORMATS(floppy_formats_afs); diff --git a/src/devices/bus/einstein/pipe/silicon_disc.cpp b/src/devices/bus/einstein/pipe/silicon_disc.cpp index ff4ac92a910..c0a29f304bd 100644 --- a/src/devices/bus/einstein/pipe/silicon_disc.cpp +++ b/src/devices/bus/einstein/pipe/silicon_disc.cpp @@ -87,8 +87,8 @@ void einstein_silicon_disc_device::device_reset() // install i/o ports io_space().install_device(0xf0, 0xff, *this, &einstein_silicon_disc_device::map); io_space().install_readwrite_handler(0xfa, 0xfa, 0, 0, 0xff00, - read8_delegate(*this, FUNC(einstein_silicon_disc_device::ram_r)), - write8_delegate(*this, FUNC(einstein_silicon_disc_device::ram_w))); + read8sm_delegate(*this, FUNC(einstein_silicon_disc_device::ram_r)), + write8sm_delegate(*this, FUNC(einstein_silicon_disc_device::ram_w))); } @@ -96,25 +96,25 @@ void einstein_silicon_disc_device::device_reset() // IMPLEMENTATION //************************************************************************** -WRITE8_MEMBER( einstein_silicon_disc_device::sector_low_w ) +void einstein_silicon_disc_device::sector_low_w(uint8_t data) { m_sector &= 0xff00; m_sector |= data; } -WRITE8_MEMBER( einstein_silicon_disc_device::sector_high_w ) +void einstein_silicon_disc_device::sector_high_w(uint8_t data) { m_sector &= 0x00ff; m_sector |= ((data & 0x07) << 8); } // a8 to a14 are used to specify the byte in a 128-byte sector -READ8_MEMBER( einstein_silicon_disc_device::ram_r ) +uint8_t einstein_silicon_disc_device::ram_r(offs_t offset) { return m_ram[(m_sector * 0x80) | ((offset >> 8) & 0x7f)]; } -WRITE8_MEMBER( einstein_silicon_disc_device::ram_w ) +void einstein_silicon_disc_device::ram_w(offs_t offset, uint8_t data) { m_ram[(m_sector * 0x80) | ((offset >> 8) & 0x7f)] = data; } diff --git a/src/devices/bus/einstein/pipe/silicon_disc.h b/src/devices/bus/einstein/pipe/silicon_disc.h index dad8ad7c940..c80ef0ed88c 100644 --- a/src/devices/bus/einstein/pipe/silicon_disc.h +++ b/src/devices/bus/einstein/pipe/silicon_disc.h @@ -42,10 +42,10 @@ private: std::unique_ptr m_ram; uint16_t m_sector; - DECLARE_READ8_MEMBER(ram_r); - DECLARE_WRITE8_MEMBER(ram_w); - DECLARE_WRITE8_MEMBER(sector_low_w); - DECLARE_WRITE8_MEMBER(sector_high_w); + uint8_t ram_r(offs_t offset); + void ram_w(offs_t offset, uint8_t data); + void sector_low_w(uint8_t data); + void sector_high_w(uint8_t data); }; // device type definition diff --git a/src/devices/bus/einstein/pipe/speculator.cpp b/src/devices/bus/einstein/pipe/speculator.cpp index c4afaa4ac2d..e99d3978cb4 100644 --- a/src/devices/bus/einstein/pipe/speculator.cpp +++ b/src/devices/bus/einstein/pipe/speculator.cpp @@ -97,18 +97,18 @@ void einstein_speculator_device::device_reset() { // ram: range 0x1f, 0x3f, 0x5f, 0x7f, 0x9f, 0xbf, 0xdf, 0xff io_space().install_readwrite_handler(0x1f, 0x1f, 0, 0, 0xffe0, - read8_delegate(*this, FUNC(einstein_speculator_device::ram_r)), - write8_delegate(*this, FUNC(einstein_speculator_device::ram_w))); + read8sm_delegate(*this, FUNC(einstein_speculator_device::ram_r)), + write8sm_delegate(*this, FUNC(einstein_speculator_device::ram_w))); // ram: range 0x60 - 0xff io_space().install_readwrite_handler(0x60, 0x60, 0, 0, 0xff9f, - read8_delegate(*this, FUNC(einstein_speculator_device::ram_r)), - write8_delegate(*this, FUNC(einstein_speculator_device::ram_w))); + read8sm_delegate(*this, FUNC(einstein_speculator_device::ram_r)), + write8sm_delegate(*this, FUNC(einstein_speculator_device::ram_w))); // tape read/nmi write register: range 0xff io_space().install_readwrite_handler(0xff, 0xff, 0, 0, 0xff00, - read8_delegate(*this, FUNC(einstein_speculator_device::tape_r)), - write8_delegate(*this, FUNC(einstein_speculator_device::nmi_w))); + read8smo_delegate(*this, FUNC(einstein_speculator_device::tape_r)), + write8smo_delegate(*this, FUNC(einstein_speculator_device::nmi_w))); } @@ -167,19 +167,19 @@ offs_t einstein_speculator_device::address_translate(offs_t offset) return (ra3 << 3) | (ra2 << 2) | (ra1 << 1) | (ra0 << 0); } -READ8_MEMBER( einstein_speculator_device::ram_r ) +uint8_t einstein_speculator_device::ram_r(offs_t offset) { offs_t addr = ((offset << 4) & 0x7f) | address_translate(offset); return m_ram[addr]; } -WRITE8_MEMBER( einstein_speculator_device::ram_w ) +void einstein_speculator_device::ram_w(offs_t offset, uint8_t data) { offs_t addr = ((offset << 4) & 0x7f) | address_translate(offset); m_ram[addr] = data; } -READ8_MEMBER( einstein_speculator_device::tape_r ) +uint8_t einstein_speculator_device::tape_r() { // 7654321- unknown // -------0 cassette input @@ -187,9 +187,9 @@ READ8_MEMBER( einstein_speculator_device::tape_r ) return m_cassette->input() > 0.0038 ? 1 : 0; } -WRITE8_MEMBER( einstein_speculator_device::nmi_w ) +void einstein_speculator_device::nmi_w(uint8_t data) { - logerror("nmi_w offset %04x data %02x\n", offset, data); + logerror("nmi_w data %02x\n", data); // 76543--- unknown // -----2-- nmi enable? diff --git a/src/devices/bus/einstein/pipe/speculator.h b/src/devices/bus/einstein/pipe/speculator.h index bdbb4476e3e..c66b2e0122e 100644 --- a/src/devices/bus/einstein/pipe/speculator.h +++ b/src/devices/bus/einstein/pipe/speculator.h @@ -34,10 +34,10 @@ public: virtual void int_w(int state) override; - DECLARE_READ8_MEMBER(ram_r); - DECLARE_WRITE8_MEMBER(ram_w); - DECLARE_READ8_MEMBER(tape_r); - DECLARE_WRITE8_MEMBER(nmi_w); + uint8_t ram_r(offs_t offset); + void ram_w(offs_t offset, uint8_t data); + uint8_t tape_r(); + void nmi_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(ic5a_q_w); DECLARE_WRITE_LINE_MEMBER(ic5b_q_w); diff --git a/src/devices/bus/einstein/pipe/tk02.cpp b/src/devices/bus/einstein/pipe/tk02.cpp index 5f0a38ed27b..b0cf5998131 100644 --- a/src/devices/bus/einstein/pipe/tk02.cpp +++ b/src/devices/bus/einstein/pipe/tk02.cpp @@ -160,7 +160,7 @@ void tk02_device::device_start() void tk02_device::device_reset() { io_space().install_device(0x40, 0x4f, *this, &tk02_device::map); - io_space().install_readwrite_handler(0x40, 0x47, 0, 0, 0xff00, read8_delegate(*this, FUNC(tk02_device::ram_r)), write8_delegate(*this, FUNC(tk02_device::ram_w))); + io_space().install_readwrite_handler(0x40, 0x47, 0, 0, 0xff00, read8sm_delegate(*this, FUNC(tk02_device::ram_r)), write8sm_delegate(*this, FUNC(tk02_device::ram_w))); } @@ -203,17 +203,17 @@ WRITE_LINE_MEMBER( tk02_device::de_w ) // lower 3 bits of address define a 256-byte "row" // upper 8 bits define the offset in the row -READ8_MEMBER( tk02_device::ram_r ) +uint8_t tk02_device::ram_r(offs_t offset) { return m_ram[((offset & 0x07) << 8) | ((offset >> 8) & 0xff)]; } -WRITE8_MEMBER( tk02_device::ram_w ) +void tk02_device::ram_w(offs_t offset, uint8_t data) { m_ram[((offset & 0x07) << 8) | ((offset >> 8) & 0xff)] = data; } -READ8_MEMBER( tk02_device::status_r ) +uint8_t tk02_device::status_r() { // 7654---- unused // ----3--- link M001 diff --git a/src/devices/bus/einstein/pipe/tk02.h b/src/devices/bus/einstein/pipe/tk02.h index 8782def764c..3834585ed2a 100644 --- a/src/devices/bus/einstein/pipe/tk02.h +++ b/src/devices/bus/einstein/pipe/tk02.h @@ -40,9 +40,9 @@ private: DECLARE_WRITE_LINE_MEMBER(de_w); - DECLARE_READ8_MEMBER(ram_r); - DECLARE_WRITE8_MEMBER(ram_w); - DECLARE_READ8_MEMBER(status_r); + uint8_t ram_r(offs_t offset); + void ram_w(offs_t offset, uint8_t data); + uint8_t status_r(); MC6845_UPDATE_ROW(crtc_update_row); diff --git a/src/devices/bus/ekara/rom.cpp b/src/devices/bus/ekara/rom.cpp index de65f3abeb2..e29f7d03ae6 100644 --- a/src/devices/bus/ekara/rom.cpp +++ b/src/devices/bus/ekara/rom.cpp @@ -66,22 +66,22 @@ ekara_rom_i2c_24lc02_gc0010_device::ekara_rom_i2c_24lc02_gc0010_device(const mac // plain -READ8_MEMBER(ekara_rom_plain_device::read_cart) +uint8_t ekara_rom_plain_device::read_cart(offs_t offset) { - return read_rom(space, offset, mem_mask); + return read_rom(offset); } -READ8_MEMBER(ekara_rom_plain_device::read_rom) +uint8_t ekara_rom_plain_device::read_rom(offs_t offset) { return m_rom[offset & (m_rom_size-1)]; } -WRITE8_MEMBER(ekara_rom_plain_device::write_cart) +void ekara_rom_plain_device::write_cart(offs_t offset, uint8_t data) { - write_rom(space, offset, data, mem_mask); + write_rom(offset, data); } -WRITE8_MEMBER(ekara_rom_plain_device::write_rom) +void ekara_rom_plain_device::write_rom(offs_t offset, uint8_t data) { logerror("ekara_rom_plain_device::write_rom %08x %02x\n", offset, data); } @@ -98,30 +98,30 @@ bool ekara_rom_i2c_base_device::is_write_access_not_rom(void) return (m_buscontrol[0] & 0x08) ? true : false; } -WRITE8_MEMBER(ekara_rom_i2c_base_device::write_bus_control) +void ekara_rom_i2c_base_device::write_bus_control(offs_t offset, uint8_t data) { logerror("ekara_rom_i2c_base_device::write_bus_control %08x %02x\n", offset, data); m_buscontrol[offset] = data; } -WRITE8_MEMBER(ekara_rom_i2c_base_device::write_rom) +void ekara_rom_i2c_base_device::write_rom(offs_t offset, uint8_t data) { logerror("ekara_rom_i2c_base_device::write_rom %08x %02x\n", offset, data); } -READ8_MEMBER(ekara_rom_i2c_base_device::read_rom) +uint8_t ekara_rom_i2c_base_device::read_rom(offs_t offset) { return m_rom[offset & (m_rom_size - 1)]; } -READ8_MEMBER(ekara_rom_i2c_base_device::read_extra) +uint8_t ekara_rom_i2c_base_device::read_extra(offs_t offset) { logerror("ekara_rom_i2c_base_device::read_extra %08x\n", offset); return (m_i2cmem->read_sda() & 1) ? 0xff : 0x00; } -WRITE8_MEMBER(ekara_rom_i2c_base_device::write_extra) +void ekara_rom_i2c_base_device::write_extra(offs_t offset, uint8_t data) { logerror("ekara_rom_i2c_base_device::write_extra %08x %02x\n", offset, data); @@ -177,12 +177,12 @@ bool ekara_rom_i2c_24lc02_gc0010_device::is_write_access_not_rom(void) return false; } -READ8_MEMBER(ekara_rom_i2c_24lc02_gc0010_device::read_extra) +uint8_t ekara_rom_i2c_24lc02_gc0010_device::read_extra(offs_t offset) { return 0; } -WRITE8_MEMBER(ekara_rom_i2c_24lc02_gc0010_device::write_extra) +void ekara_rom_i2c_24lc02_gc0010_device::write_extra(offs_t offset, uint8_t data) { } diff --git a/src/devices/bus/ekara/rom.h b/src/devices/bus/ekara/rom.h index 76c5ed45e46..19dcca1fb36 100644 --- a/src/devices/bus/ekara/rom.h +++ b/src/devices/bus/ekara/rom.h @@ -18,14 +18,14 @@ public: ekara_rom_plain_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_cart) override; - virtual DECLARE_WRITE8_MEMBER(write_cart) override; + virtual uint8_t read_cart(offs_t offset) override; + virtual void write_cart(offs_t offset, uint8_t data) override; - virtual DECLARE_READ8_MEMBER(read_extra) override { return 0xff; }; - virtual DECLARE_WRITE8_MEMBER(write_extra) override { }; + virtual uint8_t read_extra(offs_t offset) override { return 0xff; } + virtual void write_extra(offs_t offset, uint8_t data) override { } - virtual READ8_MEMBER(read_rom); - virtual WRITE8_MEMBER(write_rom); + virtual uint8_t read_rom(offs_t offset); + virtual void write_rom(offs_t offset, uint8_t data); protected: ekara_rom_plain_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -47,15 +47,15 @@ protected: ekara_rom_i2c_base_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual READ8_MEMBER(read_rom) override; - virtual WRITE8_MEMBER(write_rom) override; + virtual uint8_t read_rom(offs_t offset) override; + virtual void write_rom(offs_t offset, uint8_t data) override; optional_device m_i2cmem; - virtual DECLARE_READ8_MEMBER(read_extra) override; - virtual DECLARE_WRITE8_MEMBER(write_extra) override; + virtual uint8_t read_extra(offs_t offset) override; + virtual void write_extra(offs_t offset, uint8_t data) override; - virtual DECLARE_WRITE8_MEMBER(write_bus_control) override; + virtual void write_bus_control(offs_t offset, uint8_t data) override; virtual bool is_read_access_not_rom(void) override; virtual bool is_write_access_not_rom(void) override; @@ -118,8 +118,8 @@ protected: bool is_read_access_not_rom(void) override; bool is_write_access_not_rom(void) override; - DECLARE_READ8_MEMBER(read_extra) override; - DECLARE_WRITE8_MEMBER(write_extra) override; + uint8_t read_extra(offs_t offset) override; + void write_extra(offs_t offset, uint8_t data) override; DECLARE_WRITE_LINE_MEMBER(write_sda) override; DECLARE_WRITE_LINE_MEMBER(write_scl) override; DECLARE_READ_LINE_MEMBER(read_sda ) override; diff --git a/src/devices/bus/ekara/slot.cpp b/src/devices/bus/ekara/slot.cpp index 2b4673f9db9..b8eafff441b 100644 --- a/src/devices/bus/ekara/slot.cpp +++ b/src/devices/bus/ekara/slot.cpp @@ -206,45 +206,45 @@ std::string ekara_cart_slot_device::get_default_card_software(get_default_card_s read -------------------------------------------------*/ -READ8_MEMBER(ekara_cart_slot_device::read_cart) +uint8_t ekara_cart_slot_device::read_cart(offs_t offset) { - return m_cart->read_cart(space, offset); + return m_cart->read_cart(offset); } /*------------------------------------------------- write -------------------------------------------------*/ -WRITE8_MEMBER(ekara_cart_slot_device::write_cart) +void ekara_cart_slot_device::write_cart(offs_t offset, uint8_t data) { - m_cart->write_cart(space, offset, data); + m_cart->write_cart(offset, data); } /*------------------------------------------------- read extra -------------------------------------------------*/ -READ8_MEMBER(ekara_cart_slot_device::read_extra) +uint8_t ekara_cart_slot_device::read_extra(offs_t offset) { - return m_cart->read_extra(space, offset); + return m_cart->read_extra(offset); } /*------------------------------------------------- write extra -------------------------------------------------*/ -WRITE8_MEMBER(ekara_cart_slot_device::write_extra) +void ekara_cart_slot_device::write_extra(offs_t offset, uint8_t data) { - m_cart->write_extra(space, offset, data); + m_cart->write_extra(offset, data); } /*------------------------------------------------- write control -------------------------------------------------*/ -WRITE8_MEMBER(ekara_cart_slot_device::write_bus_control) +void ekara_cart_slot_device::write_bus_control(offs_t offset, uint8_t data) { - m_cart->write_bus_control(space, offset, data); + m_cart->write_bus_control(offset, data); } bool ekara_cart_slot_device::is_read_access_not_rom(void) diff --git a/src/devices/bus/ekara/slot.h b/src/devices/bus/ekara/slot.h index 92442a5353d..895b2b51e41 100644 --- a/src/devices/bus/ekara/slot.h +++ b/src/devices/bus/ekara/slot.h @@ -30,18 +30,18 @@ public: virtual ~device_ekara_cart_interface(); // reading and writing - virtual DECLARE_READ8_MEMBER(read_cart) { return 0xff; } - virtual DECLARE_WRITE8_MEMBER(write_cart) { } + virtual uint8_t read_cart(offs_t offset) { return 0xff; } + virtual void write_cart(offs_t offset, uint8_t data) { } - virtual DECLARE_READ8_MEMBER(read_extra) { return 0xff; } - virtual DECLARE_WRITE8_MEMBER(write_extra) { } + virtual uint8_t read_extra(offs_t offset) { return 0xff; } + virtual void write_extra(offs_t offset, uint8_t data) { } virtual DECLARE_WRITE_LINE_MEMBER(write_sda) { } virtual DECLARE_WRITE_LINE_MEMBER(write_scl) { } //virtual DECLARE_WRITE_LINE_MEMBER( write_wc ) virtual DECLARE_READ_LINE_MEMBER( read_sda ) { return 0; } - virtual DECLARE_WRITE8_MEMBER(write_bus_control) { } + virtual void write_bus_control(offs_t offset, uint8_t data) { } virtual bool is_read_access_not_rom(void) { return false; } virtual bool is_write_access_not_rom(void) { return false; } @@ -100,21 +100,21 @@ public: static int get_cart_type(const uint8_t *ROM, uint32_t len); // reading and writing - virtual DECLARE_READ8_MEMBER(read_cart); - virtual DECLARE_WRITE8_MEMBER(write_cart); + uint8_t read_cart(offs_t offset); + void write_cart(offs_t offset, uint8_t data); - virtual DECLARE_READ8_MEMBER(read_extra); - virtual DECLARE_WRITE8_MEMBER(write_extra); + uint8_t read_extra(offs_t offset); + void write_extra(offs_t offset, uint8_t data); - virtual DECLARE_WRITE_LINE_MEMBER(write_sda); - virtual DECLARE_WRITE_LINE_MEMBER(write_scl); - //virtual DECLARE_WRITE_LINE_MEMBER( write_wc ); - virtual DECLARE_READ_LINE_MEMBER( read_sda ); + DECLARE_WRITE_LINE_MEMBER(write_sda); + DECLARE_WRITE_LINE_MEMBER(write_scl); + //DECLARE_WRITE_LINE_MEMBER( write_wc ); + DECLARE_READ_LINE_MEMBER( read_sda ); - virtual DECLARE_WRITE8_MEMBER(write_bus_control); + void write_bus_control(offs_t offset, uint8_t data); - virtual bool is_read_access_not_rom(void); - virtual bool is_write_access_not_rom(void); + bool is_read_access_not_rom(void); + bool is_write_access_not_rom(void); bool has_cart() { return m_cart ? true : false; } diff --git a/src/devices/bus/gamate/rom.cpp b/src/devices/bus/gamate/rom.cpp index 74af9e76160..7301b6bdfc7 100644 --- a/src/devices/bus/gamate/rom.cpp +++ b/src/devices/bus/gamate/rom.cpp @@ -77,11 +77,11 @@ void gamate_rom_4in1_device::device_reset() -------------------------------------------------*/ -READ8_MEMBER(gamate_rom_plain_device::read_cart) +uint8_t gamate_rom_plain_device::read_cart(offs_t offset) { if (m_protection->is_protection_passed()) { - return read_rom(space, offset, mem_mask); + return read_rom(offset); } else { @@ -91,12 +91,12 @@ READ8_MEMBER(gamate_rom_plain_device::read_cart) return 0xff; } -READ8_MEMBER(gamate_rom_plain_device::read_rom) +uint8_t gamate_rom_plain_device::read_rom(offs_t offset) { return m_rom[offset & (m_rom_size-1)]; } -READ8_MEMBER(gamate_rom_banked_device::read_rom) +uint8_t gamate_rom_banked_device::read_rom(offs_t offset) { if (offset < 0x4000) { @@ -110,7 +110,7 @@ READ8_MEMBER(gamate_rom_banked_device::read_rom) return 0xff; } -READ8_MEMBER(gamate_rom_4in1_device::read_rom) +uint8_t gamate_rom_4in1_device::read_rom(offs_t offset) { if (offset < 0x4000) { @@ -122,11 +122,11 @@ READ8_MEMBER(gamate_rom_4in1_device::read_rom) } } -WRITE8_MEMBER(gamate_rom_plain_device::write_cart) +void gamate_rom_plain_device::write_cart(offs_t offset, uint8_t data) { if (m_protection->is_protection_passed()) { - write_rom(space, offset, data, mem_mask); + write_rom(offset, data); } else { @@ -134,13 +134,13 @@ WRITE8_MEMBER(gamate_rom_plain_device::write_cart) } } -WRITE8_MEMBER(gamate_rom_plain_device::write_rom) +void gamate_rom_plain_device::write_rom(offs_t offset, uint8_t data) { // shouldn't be any write on an unbanked game logerror("gamate_rom_plain_device::write_rom %04x %02x\n", offset, data); } -WRITE8_MEMBER(gamate_rom_banked_device::write_rom) +void gamate_rom_banked_device::write_rom(offs_t offset, uint8_t data) { if (offset == 0x6000) { @@ -152,7 +152,7 @@ WRITE8_MEMBER(gamate_rom_banked_device::write_rom) } } -WRITE8_MEMBER(gamate_rom_4in1_device::write_rom) +void gamate_rom_4in1_device::write_rom(offs_t offset, uint8_t data) { if (offset == 0x2000) { diff --git a/src/devices/bus/gamate/rom.h b/src/devices/bus/gamate/rom.h index 1d500082e36..cad923f3d54 100644 --- a/src/devices/bus/gamate/rom.h +++ b/src/devices/bus/gamate/rom.h @@ -18,10 +18,10 @@ public: gamate_rom_plain_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_cart) override; - virtual DECLARE_WRITE8_MEMBER(write_cart) override; - virtual READ8_MEMBER(read_rom); - virtual WRITE8_MEMBER(write_rom); + virtual uint8_t read_cart(offs_t offset) override; + virtual void write_cart(offs_t offset, uint8_t data) override; + virtual uint8_t read_rom(offs_t offset); + virtual void write_rom(offs_t offset, uint8_t data); protected: gamate_rom_plain_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -47,8 +47,8 @@ protected: gamate_rom_banked_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual READ8_MEMBER(read_rom) override; - virtual WRITE8_MEMBER(write_rom) override; + virtual uint8_t read_rom(offs_t offset) override; + virtual void write_rom(offs_t offset, uint8_t data) override; protected: virtual void device_start() override; @@ -67,8 +67,8 @@ public: gamate_rom_4in1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual READ8_MEMBER(read_rom) override; - virtual WRITE8_MEMBER(write_rom) override; + virtual uint8_t read_rom(offs_t offset) override; + virtual void write_rom(offs_t offset, uint8_t data) override; protected: virtual void device_start() override; diff --git a/src/devices/bus/gamate/slot.cpp b/src/devices/bus/gamate/slot.cpp index cbeb5eae03b..67814aa096e 100644 --- a/src/devices/bus/gamate/slot.cpp +++ b/src/devices/bus/gamate/slot.cpp @@ -225,11 +225,11 @@ std::string gamate_cart_slot_device::get_default_card_software(get_default_card_ read -------------------------------------------------*/ -READ8_MEMBER(gamate_cart_slot_device::read_cart) +uint8_t gamate_cart_slot_device::read_cart(offs_t offset) { if (m_cart) { - return m_cart->read_cart(space, offset); + return m_cart->read_cart(offset); } else return 0xff; @@ -239,10 +239,10 @@ READ8_MEMBER(gamate_cart_slot_device::read_cart) write -------------------------------------------------*/ -WRITE8_MEMBER(gamate_cart_slot_device::write_cart) +void gamate_cart_slot_device::write_cart(offs_t offset, uint8_t data) { if (m_cart) { - m_cart->write_cart(space, offset, data); + m_cart->write_cart(offset, data); } } diff --git a/src/devices/bus/gamate/slot.h b/src/devices/bus/gamate/slot.h index dc060cffea3..81b8b09c109 100644 --- a/src/devices/bus/gamate/slot.h +++ b/src/devices/bus/gamate/slot.h @@ -28,8 +28,8 @@ public: virtual ~device_gamate_cart_interface(); // reading and writing - virtual DECLARE_READ8_MEMBER(read_cart) { return 0xff; } - virtual DECLARE_WRITE8_MEMBER(write_cart) { } + virtual uint8_t read_cart(offs_t offset) { return 0xff; } + virtual void write_cart(offs_t offset, uint8_t data) { } void rom_alloc(uint32_t size, const char *tag); uint8_t* get_rom_base() { return m_rom; } @@ -84,8 +84,8 @@ public: static int get_cart_type(const uint8_t *ROM, uint32_t len); // reading and writing - virtual DECLARE_READ8_MEMBER(read_cart); - virtual DECLARE_WRITE8_MEMBER(write_cart); + uint8_t read_cart(offs_t offset); + void write_cart(offs_t offset, uint8_t data); protected: // device-level overrides diff --git a/src/devices/bus/jakks_gamekey/rom.cpp b/src/devices/bus/jakks_gamekey/rom.cpp index 4d3e3d61d7f..4492d62bddb 100644 --- a/src/devices/bus/jakks_gamekey/rom.cpp +++ b/src/devices/bus/jakks_gamekey/rom.cpp @@ -45,34 +45,34 @@ jakks_gamekey_rom_i2c_24lc04_device::jakks_gamekey_rom_i2c_24lc04_device(const m // plain -READ16_MEMBER(jakks_gamekey_rom_plain_device::read_cart) +uint16_t jakks_gamekey_rom_plain_device::read_cart(offs_t offset) { - return read_rom(space, offset, mem_mask); + return read_rom(offset); } -READ16_MEMBER(jakks_gamekey_rom_plain_device::read_rom) +uint16_t jakks_gamekey_rom_plain_device::read_rom(offs_t offset) { return m_rom[offset & (m_rom_size-1)]; } -WRITE16_MEMBER(jakks_gamekey_rom_plain_device::write_cart) +void jakks_gamekey_rom_plain_device::write_cart(offs_t offset, uint16_t data) { - write_rom(space, offset, data, mem_mask); + write_rom(offset, data); } -WRITE16_MEMBER(jakks_gamekey_rom_plain_device::write_rom) +void jakks_gamekey_rom_plain_device::write_rom(offs_t offset, uint16_t data) { - logerror("jakks_gamekey_rom_plain_device::write_rom %08x %02x\n", offset, data); + logerror("jakks_gamekey_rom_plain_device::write_rom %08x %04x\n", offset, data); } // i2c base -WRITE16_MEMBER(jakks_gamekey_rom_i2c_base_device::write_rom) +void jakks_gamekey_rom_i2c_base_device::write_rom(offs_t offset, uint16_t data) { - logerror("jakks_gamekey_rom_i2c_base_device::write_rom %08x %02x\n", offset, data); + logerror("jakks_gamekey_rom_i2c_base_device::write_rom %08x %04x\n", offset, data); } -READ16_MEMBER(jakks_gamekey_rom_i2c_base_device::read_rom) +uint16_t jakks_gamekey_rom_i2c_base_device::read_rom(offs_t offset) { return m_rom[offset & (m_rom_size - 1)]; } diff --git a/src/devices/bus/jakks_gamekey/rom.h b/src/devices/bus/jakks_gamekey/rom.h index 6e5c40e5407..bcccda73c8a 100644 --- a/src/devices/bus/jakks_gamekey/rom.h +++ b/src/devices/bus/jakks_gamekey/rom.h @@ -18,14 +18,14 @@ public: jakks_gamekey_rom_plain_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ16_MEMBER(read_cart) override; - virtual DECLARE_WRITE16_MEMBER(write_cart) override; + virtual uint16_t read_cart(offs_t offset) override; + virtual void write_cart(offs_t offset, uint16_t data) override; virtual uint8_t read_cart_seeprom(void) override { return 1; }; virtual void write_cart_seeprom(offs_t offset, uint16_t data, uint16_t mem_mask = ~0) override { }; - virtual READ16_MEMBER(read_rom); - virtual WRITE16_MEMBER(write_rom); + virtual uint16_t read_rom(offs_t offset); + virtual void write_rom(offs_t offset, uint16_t data); protected: jakks_gamekey_rom_plain_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -47,8 +47,8 @@ protected: jakks_gamekey_rom_i2c_base_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual READ16_MEMBER(read_rom) override; - virtual WRITE16_MEMBER(write_rom) override; + virtual uint16_t read_rom(offs_t offset) override; + virtual void write_rom(offs_t offset, uint16_t data) override; optional_device m_i2cmem; diff --git a/src/devices/bus/jakks_gamekey/slot.cpp b/src/devices/bus/jakks_gamekey/slot.cpp index 226a4ea5540..2072b8cc3f3 100644 --- a/src/devices/bus/jakks_gamekey/slot.cpp +++ b/src/devices/bus/jakks_gamekey/slot.cpp @@ -204,18 +204,18 @@ std::string jakks_gamekey_slot_device::get_default_card_software(get_default_car read -------------------------------------------------*/ -READ16_MEMBER(jakks_gamekey_slot_device::read_cart) +uint16_t jakks_gamekey_slot_device::read_cart(offs_t offset) { - return m_cart->read_cart(space, offset); + return m_cart->read_cart(offset); } /*------------------------------------------------- write -------------------------------------------------*/ -WRITE16_MEMBER(jakks_gamekey_slot_device::write_cart) +void jakks_gamekey_slot_device::write_cart(offs_t offset, uint16_t data) { - m_cart->write_cart(space, offset, data); + m_cart->write_cart(offset, data); } /*------------------------------------------------- diff --git a/src/devices/bus/jakks_gamekey/slot.h b/src/devices/bus/jakks_gamekey/slot.h index 9862c82ab60..426d55bb67d 100644 --- a/src/devices/bus/jakks_gamekey/slot.h +++ b/src/devices/bus/jakks_gamekey/slot.h @@ -28,8 +28,8 @@ public: virtual ~device_jakks_gamekey_interface(); // reading and writing - virtual DECLARE_READ16_MEMBER(read_cart) { return 0xffff; } - virtual DECLARE_WRITE16_MEMBER(write_cart) { } + virtual uint16_t read_cart(offs_t offset) { return 0xffff; } + virtual void write_cart(offs_t offset, uint16_t data) { } virtual uint8_t read_cart_seeprom(void) { return 1; } virtual void write_cart_seeprom(offs_t offset, uint16_t data, uint16_t mem_mask = ~0) { } @@ -88,8 +88,8 @@ public: static int get_cart_type(const uint8_t *ROM, uint32_t len); // reading and writing - virtual DECLARE_READ16_MEMBER(read_cart); - virtual DECLARE_WRITE16_MEMBER(write_cart); + uint16_t read_cart(offs_t offset); + void write_cart(offs_t offset, uint16_t data); virtual uint8_t read_cart_seeprom(void); virtual void write_cart_seeprom(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); diff --git a/src/devices/bus/m5/rom.cpp b/src/devices/bus/m5/rom.cpp index 5bb1ee371cc..fbf80f5ce29 100644 --- a/src/devices/bus/m5/rom.cpp +++ b/src/devices/bus/m5/rom.cpp @@ -43,7 +43,7 @@ m5_ram_device::m5_ram_device(const machine_config &mconfig, const char *tag, dev mapper specific handlers -------------------------------------------------*/ -READ8_MEMBER(m5_rom_device::read_rom) +uint8_t m5_rom_device::read_rom(offs_t offset) { if (offset < m_rom_size) return m_rom[offset]; @@ -51,12 +51,12 @@ READ8_MEMBER(m5_rom_device::read_rom) return 0xff; } -READ8_MEMBER(m5_ram_device::read_ram) +uint8_t m5_ram_device::read_ram(offs_t offset) { return m_ram[offset]; } -WRITE8_MEMBER(m5_ram_device::write_ram) +void m5_ram_device::write_ram(offs_t offset, uint8_t data) { m_ram[offset] = data; } diff --git a/src/devices/bus/m5/rom.h b/src/devices/bus/m5/rom.h index 6050920c153..890f111cca8 100644 --- a/src/devices/bus/m5/rom.h +++ b/src/devices/bus/m5/rom.h @@ -22,7 +22,7 @@ public: virtual void device_reset() override {} // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom) override; + virtual uint8_t read_rom(offs_t offset) override; protected: m5_rom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -37,8 +37,8 @@ public: m5_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_ram) override; - virtual DECLARE_WRITE8_MEMBER(write_ram) override; + virtual uint8_t read_ram(offs_t offset) override; + virtual void write_ram(offs_t offset, uint8_t data) override; protected: // device-level overrides diff --git a/src/devices/bus/m5/slot.cpp b/src/devices/bus/m5/slot.cpp index ff3d47e9b95..6d7a2e15c77 100644 --- a/src/devices/bus/m5/slot.cpp +++ b/src/devices/bus/m5/slot.cpp @@ -220,10 +220,10 @@ std::string m5_cart_slot_device::get_default_card_software(get_default_card_soft read -------------------------------------------------*/ -READ8_MEMBER(m5_cart_slot_device::read_rom) +uint8_t m5_cart_slot_device::read_rom(offs_t offset) { if (m_cart) - return m_cart->read_rom(space, offset); + return m_cart->read_rom(offset); else return 0xff; } @@ -232,10 +232,10 @@ READ8_MEMBER(m5_cart_slot_device::read_rom) read -------------------------------------------------*/ -READ8_MEMBER(m5_cart_slot_device::read_ram) +uint8_t m5_cart_slot_device::read_ram(offs_t offset) { if (m_cart) - return m_cart->read_ram(space, offset); + return m_cart->read_ram(offset); else return 0xff; } @@ -244,8 +244,8 @@ READ8_MEMBER(m5_cart_slot_device::read_ram) write -------------------------------------------------*/ -WRITE8_MEMBER(m5_cart_slot_device::write_ram) +void m5_cart_slot_device::write_ram(offs_t offset, uint8_t data) { if (m_cart) - m_cart->write_ram(space, offset, data); + m_cart->write_ram(offset, data); } diff --git a/src/devices/bus/m5/slot.h b/src/devices/bus/m5/slot.h index 105bc7c71d2..e1c79bc65fc 100644 --- a/src/devices/bus/m5/slot.h +++ b/src/devices/bus/m5/slot.h @@ -35,9 +35,9 @@ public: virtual ~device_m5_cart_interface(); // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom) { return 0xff; } - virtual DECLARE_READ8_MEMBER(read_ram) { return 0xff; } - virtual DECLARE_WRITE8_MEMBER(write_ram) {} + virtual uint8_t read_rom(offs_t offset) { return 0xff; } + virtual uint8_t read_ram(offs_t offset) { return 0xff; } + virtual void write_ram(offs_t offset, uint8_t data) {} void rom_alloc(uint32_t size, const char *tag); void ram_alloc(uint32_t size); @@ -100,9 +100,9 @@ public: void save_ram() { if (m_cart && m_cart->get_ram_size()) m_cart->save_ram(); } // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom); - virtual DECLARE_READ8_MEMBER(read_ram); - virtual DECLARE_WRITE8_MEMBER(write_ram); + uint8_t read_rom(offs_t offset); + uint8_t read_ram(offs_t offset); + void write_ram(offs_t offset, uint8_t data); protected: // device-level overrides diff --git a/src/devices/bus/mtx/sdx.cpp b/src/devices/bus/mtx/sdx.cpp index 6f3a9d33417..e413e997f5b 100644 --- a/src/devices/bus/mtx/sdx.cpp +++ b/src/devices/bus/mtx/sdx.cpp @@ -240,7 +240,7 @@ void mtx_sdxbas_device::device_reset() /* SDX FDC */ io_space().install_readwrite_handler(0x10, 0x13, read8sm_delegate(*m_fdc, FUNC(mb8877_device::read)), write8sm_delegate(*m_fdc, FUNC(mb8877_device::write))); - io_space().install_readwrite_handler(0x14, 0x14, read8_delegate(*this, FUNC(mtx_sdx_device::sdx_status_r)), write8_delegate(*this, FUNC(mtx_sdx_device::sdx_control_w))); + io_space().install_readwrite_handler(0x14, 0x14, read8smo_delegate(*this, FUNC(mtx_sdx_device::sdx_status_r)), write8smo_delegate(*this, FUNC(mtx_sdx_device::sdx_control_w))); } void mtx_sdxcpm_device::device_reset() @@ -249,10 +249,10 @@ void mtx_sdxcpm_device::device_reset() /* SDX FDC */ io_space().install_readwrite_handler(0x10, 0x13, read8sm_delegate(*m_fdc, FUNC(mb8877_device::read)), write8sm_delegate(*m_fdc, FUNC(mb8877_device::write))); - io_space().install_readwrite_handler(0x14, 0x14, read8_delegate(*this, FUNC(mtx_sdx_device::sdx_status_r)), write8_delegate(*this, FUNC(mtx_sdx_device::sdx_control_w))); + io_space().install_readwrite_handler(0x14, 0x14, read8smo_delegate(*this, FUNC(mtx_sdx_device::sdx_status_r)), write8smo_delegate(*this, FUNC(mtx_sdx_device::sdx_control_w))); /* 80 column */ - io_space().install_readwrite_handler(0x30, 0x33, read8_delegate(*this, FUNC(mtx_sdxcpm_device::mtx_80col_r)), write8_delegate(*this, FUNC(mtx_sdxcpm_device::mtx_80col_w))); + io_space().install_readwrite_handler(0x30, 0x33, read8sm_delegate(*this, FUNC(mtx_sdxcpm_device::mtx_80col_r)), write8sm_delegate(*this, FUNC(mtx_sdxcpm_device::mtx_80col_w))); io_space().install_readwrite_handler(0x38, 0x38, read8smo_delegate(*m_crtc, FUNC(mc6845_device::status_r)), write8smo_delegate(*m_crtc, FUNC(mc6845_device::address_w))); io_space().install_readwrite_handler(0x39, 0x39, read8smo_delegate(*m_crtc, FUNC(mc6845_device::register_r)), write8smo_delegate(*m_crtc, FUNC(mc6845_device::register_w))); @@ -265,7 +265,7 @@ void mtx_sdxcpm_device::device_reset() // IMPLEMENTATION //************************************************************************** -READ8_MEMBER(mtx_sdx_device::sdx_status_r) +uint8_t mtx_sdx_device::sdx_status_r() { /* bit description @@ -294,7 +294,7 @@ READ8_MEMBER(mtx_sdx_device::sdx_status_r) return data; } -WRITE8_MEMBER(mtx_sdx_device::sdx_control_w) +void mtx_sdx_device::sdx_control_w(uint8_t data) { /* bit description @@ -341,7 +341,7 @@ WRITE_LINE_MEMBER(mtx_sdx_device::motor_w) // 80 column video board //------------------------------------------------- -READ8_MEMBER(mtx_sdxcpm_device::mtx_80col_r) +uint8_t mtx_sdxcpm_device::mtx_80col_r(offs_t offset) { uint8_t data = 0xff; @@ -362,7 +362,7 @@ READ8_MEMBER(mtx_sdxcpm_device::mtx_80col_r) return data; } -WRITE8_MEMBER(mtx_sdxcpm_device::mtx_80col_w) +void mtx_sdxcpm_device::mtx_80col_w(offs_t offset, uint8_t data) { switch (offset) { diff --git a/src/devices/bus/mtx/sdx.h b/src/devices/bus/mtx/sdx.h index dff83358dd4..1554c671245 100644 --- a/src/devices/bus/mtx/sdx.h +++ b/src/devices/bus/mtx/sdx.h @@ -32,8 +32,8 @@ public: // optional information overrides virtual ioport_constructor device_input_ports() const override; - DECLARE_READ8_MEMBER(sdx_status_r); - DECLARE_WRITE8_MEMBER(sdx_control_w); + uint8_t sdx_status_r(); + void sdx_control_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER(motor_w); protected: @@ -81,8 +81,8 @@ protected: virtual void device_reset() override; private: - DECLARE_READ8_MEMBER(mtx_80col_r); - DECLARE_WRITE8_MEMBER(mtx_80col_w); + uint8_t mtx_80col_r(offs_t offset); + void mtx_80col_w(offs_t offset, uint8_t data); MC6845_UPDATE_ROW(crtc_update_row); required_device m_screen; diff --git a/src/devices/bus/nasbus/avc.cpp b/src/devices/bus/nasbus/avc.cpp index 8f06a7c0e45..f7bc8e95596 100644 --- a/src/devices/bus/nasbus/avc.cpp +++ b/src/devices/bus/nasbus/avc.cpp @@ -80,7 +80,7 @@ void nascom_avc_device::device_reset() { io_space().install_write_handler(0xb0, 0xb0, write8smo_delegate(*m_crtc, FUNC(mc6845_device::address_w))); io_space().install_readwrite_handler(0xb1, 0xb1, read8smo_delegate(*m_crtc, FUNC(mc6845_device::register_r)), write8smo_delegate(*m_crtc, FUNC(mc6845_device::register_w))); - io_space().install_write_handler(0xb2, 0xb2, write8_delegate(*this, FUNC(nascom_avc_device::control_w))); + io_space().install_write_handler(0xb2, 0xb2, write8smo_delegate(*this, FUNC(nascom_avc_device::control_w))); } @@ -124,7 +124,7 @@ MC6845_UPDATE_ROW( nascom_avc_device::crtc_update_row ) } } -WRITE8_MEMBER( nascom_avc_device::control_w ) +void nascom_avc_device::control_w(uint8_t data) { logerror("nascom_avc_device::control_w: 0x%02x\n", data); @@ -132,7 +132,7 @@ WRITE8_MEMBER( nascom_avc_device::control_w ) if (((m_control & 0x07) == 0) && (data & 0x07)) { ram_disable_w(0); - program_space().install_readwrite_handler(0x8000, 0xbfff, read8_delegate(*this, FUNC(nascom_avc_device::vram_r)), write8_delegate(*this, FUNC(nascom_avc_device::vram_w))); + program_space().install_readwrite_handler(0x8000, 0xbfff, read8sm_delegate(*this, FUNC(nascom_avc_device::vram_r)), write8sm_delegate(*this, FUNC(nascom_avc_device::vram_w))); } else if ((data & 0x07) == 0) { @@ -143,7 +143,7 @@ WRITE8_MEMBER( nascom_avc_device::control_w ) m_control = data; } -READ8_MEMBER( nascom_avc_device::vram_r ) +uint8_t nascom_avc_device::vram_r(offs_t offset) { // manual says only one plane can be read, i assume this is the order if (BIT(m_control, 0)) return m_r_ram[offset]; @@ -154,7 +154,7 @@ READ8_MEMBER( nascom_avc_device::vram_r ) return 0xff; } -WRITE8_MEMBER( nascom_avc_device::vram_w ) +void nascom_avc_device::vram_w(offs_t offset, uint8_t data) { // all planes can be written at the same time if (BIT(m_control, 0)) m_r_ram[offset] = data; diff --git a/src/devices/bus/nasbus/avc.h b/src/devices/bus/nasbus/avc.h index defa2a916c5..58eaaa44626 100644 --- a/src/devices/bus/nasbus/avc.h +++ b/src/devices/bus/nasbus/avc.h @@ -27,10 +27,10 @@ class nascom_avc_device : public device_t, public device_nasbus_card_interface public: // construction/destruction nascom_avc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE8_MEMBER(control_w); + void control_w(uint8_t data); - READ8_MEMBER(vram_r); - WRITE8_MEMBER(vram_w); + uint8_t vram_r(offs_t offset); + void vram_w(offs_t offset, uint8_t data); protected: virtual void device_add_mconfig(machine_config &config) override; diff --git a/src/devices/bus/nasbus/floppy.cpp b/src/devices/bus/nasbus/floppy.cpp index 4b57d7ee0aa..a2a1c2df5f2 100644 --- a/src/devices/bus/nasbus/floppy.cpp +++ b/src/devices/bus/nasbus/floppy.cpp @@ -90,8 +90,8 @@ void nascom_fdc_device::device_start() void nascom_fdc_device::device_reset() { io_space().install_readwrite_handler(0xe0, 0xe3, read8sm_delegate(*m_fdc, FUNC(fd1793_device::read)), write8sm_delegate(*m_fdc, FUNC(fd1793_device::write))); - io_space().install_readwrite_handler(0xe4, 0xe4, read8_delegate(*this, FUNC(nascom_fdc_device::select_r)), write8_delegate(*this, FUNC(nascom_fdc_device::select_w))); - io_space().install_read_handler(0xe5, 0xe5, read8_delegate(*this, FUNC(nascom_fdc_device::status_r))); + io_space().install_readwrite_handler(0xe4, 0xe4, read8smo_delegate(*this, FUNC(nascom_fdc_device::select_r)), write8smo_delegate(*this, FUNC(nascom_fdc_device::select_w))); + io_space().install_read_handler(0xe5, 0xe5, read8smo_delegate(*this, FUNC(nascom_fdc_device::status_r))); } //------------------------------------------------- @@ -130,7 +130,7 @@ TIMER_CALLBACK_MEMBER( nascom_fdc_device::motor_off ) m_floppy3->get_device()->mon_w(1); } -READ8_MEMBER( nascom_fdc_device::select_r ) +uint8_t nascom_fdc_device::select_r() { m_select |= (0x80 | 0x20); @@ -154,7 +154,7 @@ READ8_MEMBER( nascom_fdc_device::select_r ) return m_select; } -WRITE8_MEMBER( nascom_fdc_device::select_w ) +void nascom_fdc_device::select_w(uint8_t data) { if (VERBOSE) logerror("nascom_fdc_device::select_w: 0x%02x\n", data); @@ -182,7 +182,7 @@ WRITE8_MEMBER( nascom_fdc_device::select_w ) m_select = data; } -READ8_MEMBER( nascom_fdc_device::status_r ) +uint8_t nascom_fdc_device::status_r() { uint8_t data = 0; diff --git a/src/devices/bus/nasbus/floppy.h b/src/devices/bus/nasbus/floppy.h index a5bb188a270..2ce536fa176 100644 --- a/src/devices/bus/nasbus/floppy.h +++ b/src/devices/bus/nasbus/floppy.h @@ -28,9 +28,9 @@ public: // construction/destruction nascom_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8_MEMBER(select_r); - DECLARE_WRITE8_MEMBER(select_w); - DECLARE_READ8_MEMBER(status_r); + uint8_t select_r(); + void select_w(uint8_t data); + uint8_t status_r(); protected: virtual void device_add_mconfig(machine_config &config) override; diff --git a/src/devices/bus/newbrain/eim.cpp b/src/devices/bus/newbrain/eim.cpp index 3f0b7a19ee0..be3cae2e615 100644 --- a/src/devices/bus/newbrain/eim.cpp +++ b/src/devices/bus/newbrain/eim.cpp @@ -185,7 +185,7 @@ void newbrain_eim_device::iorq_w(offs_t offset, uint8_t data, bool &prtov) // anout_r - //------------------------------------------------- -READ8_MEMBER( newbrain_eim_device::anout_r ) +uint8_t newbrain_eim_device::anout_r() { return 0xff; } @@ -195,7 +195,7 @@ READ8_MEMBER( newbrain_eim_device::anout_r ) // anout_w - //------------------------------------------------- -WRITE8_MEMBER( newbrain_eim_device::anout_w ) +void newbrain_eim_device::anout_w(uint8_t data) { } @@ -204,7 +204,7 @@ WRITE8_MEMBER( newbrain_eim_device::anout_w ) // anin_r - //------------------------------------------------- -READ8_MEMBER( newbrain_eim_device::anin_r ) +uint8_t newbrain_eim_device::anin_r() { return 0; } @@ -214,7 +214,7 @@ READ8_MEMBER( newbrain_eim_device::anin_r ) // anio_w - //------------------------------------------------- -WRITE8_MEMBER( newbrain_eim_device::anio_w ) +void newbrain_eim_device::anio_w(uint8_t data) { } diff --git a/src/devices/bus/newbrain/eim.h b/src/devices/bus/newbrain/eim.h index 19b456338fd..4241fd4b69a 100644 --- a/src/devices/bus/newbrain/eim.h +++ b/src/devices/bus/newbrain/eim.h @@ -33,10 +33,10 @@ public: // construction/destruction newbrain_eim_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8_MEMBER( anout_r ); - DECLARE_WRITE8_MEMBER( anout_w ); - DECLARE_READ8_MEMBER( anin_r ); - DECLARE_WRITE8_MEMBER( anio_w ); + uint8_t anout_r(); + void anout_w(uint8_t data); + uint8_t anin_r(); + void anio_w(uint8_t data); protected: // device-level overrides diff --git a/src/devices/bus/odyssey2/rom.cpp b/src/devices/bus/odyssey2/rom.cpp index a7b705308fd..c76759c5cc5 100644 --- a/src/devices/bus/odyssey2/rom.cpp +++ b/src/devices/bus/odyssey2/rom.cpp @@ -68,29 +68,29 @@ void o2_rom_device::write_bank(int bank) m_bank_base = bank; } -READ8_MEMBER(o2_rom_device::read_rom04) +uint8_t o2_rom_device::read_rom04(offs_t offset) { return m_rom[(offset + (m_bank_base & 0x03) * 0x800) & (m_rom_size - 1)]; } -READ8_MEMBER(o2_rom_device::read_rom0c) +uint8_t o2_rom_device::read_rom0c(offs_t offset) { return m_rom[(offset + (m_bank_base & 0x03) * 0x800) & (m_rom_size - 1)]; } -READ8_MEMBER(o2_rom12_device::read_rom04) +uint8_t o2_rom12_device::read_rom04(offs_t offset) { return m_rom[offset + (m_bank_base & 0x03) * 0xc00]; } -READ8_MEMBER(o2_rom12_device::read_rom0c) +uint8_t o2_rom12_device::read_rom0c(offs_t offset) { return m_rom[offset + 0x800 + (m_bank_base & 0x03) * 0xc00]; } -READ8_MEMBER(o2_rom16_device::read_rom04) +uint8_t o2_rom16_device::read_rom04(offs_t offset) { return m_rom[offset + 0x400 + (m_bank_base & 0x03) * 0x1000]; } -READ8_MEMBER(o2_rom16_device::read_rom0c) +uint8_t o2_rom16_device::read_rom0c(offs_t offset) { return m_rom[offset + 0xc00 + (m_bank_base & 0x03) * 0x1000]; } diff --git a/src/devices/bus/odyssey2/rom.h b/src/devices/bus/odyssey2/rom.h index 823b47462c7..68c63dc8e40 100644 --- a/src/devices/bus/odyssey2/rom.h +++ b/src/devices/bus/odyssey2/rom.h @@ -18,8 +18,8 @@ public: o2_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom04) override; - virtual DECLARE_READ8_MEMBER(read_rom0c) override; + virtual uint8_t read_rom04(offs_t offset) override; + virtual uint8_t read_rom0c(offs_t offset) override; virtual void write_bank(int bank) override; @@ -42,8 +42,8 @@ public: o2_rom12_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom04) override; - virtual DECLARE_READ8_MEMBER(read_rom0c) override; + virtual uint8_t read_rom04(offs_t offset) override; + virtual uint8_t read_rom0c(offs_t offset) override; }; // ======================> o2_rom16_device @@ -55,8 +55,8 @@ public: o2_rom16_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom04) override; - virtual DECLARE_READ8_MEMBER(read_rom0c) override; + virtual uint8_t read_rom04(offs_t offset) override; + virtual uint8_t read_rom0c(offs_t offset) override; }; diff --git a/src/devices/bus/odyssey2/slot.cpp b/src/devices/bus/odyssey2/slot.cpp index 574b93ec01b..3b743b6964b 100644 --- a/src/devices/bus/odyssey2/slot.cpp +++ b/src/devices/bus/odyssey2/slot.cpp @@ -214,18 +214,18 @@ std::string o2_cart_slot_device::get_default_card_software(get_default_card_soft read_rom** -------------------------------------------------*/ -READ8_MEMBER(o2_cart_slot_device::read_rom04) +uint8_t o2_cart_slot_device::read_rom04(offs_t offset) { if (m_cart) - return m_cart->read_rom04(space, offset); + return m_cart->read_rom04(offset); else return 0xff; } -READ8_MEMBER(o2_cart_slot_device::read_rom0c) +uint8_t o2_cart_slot_device::read_rom0c(offs_t offset) { if (m_cart) - return m_cart->read_rom0c(space, offset); + return m_cart->read_rom0c(offset); else return 0xff; } @@ -234,10 +234,10 @@ READ8_MEMBER(o2_cart_slot_device::read_rom0c) io_write -------------------------------------------------*/ -WRITE8_MEMBER(o2_cart_slot_device::io_write) +void o2_cart_slot_device::io_write(offs_t offset, uint8_t data) { if (m_cart) - m_cart->io_write(space, offset, data); + m_cart->io_write(offset, data); } diff --git a/src/devices/bus/odyssey2/slot.h b/src/devices/bus/odyssey2/slot.h index c951fda1ef8..69e107edc11 100644 --- a/src/devices/bus/odyssey2/slot.h +++ b/src/devices/bus/odyssey2/slot.h @@ -33,11 +33,11 @@ public: virtual ~device_o2_cart_interface(); // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom04) { return 0xff; } - virtual DECLARE_READ8_MEMBER(read_rom0c) { return 0xff; } + virtual uint8_t read_rom04(offs_t offset) { return 0xff; } + virtual uint8_t read_rom0c(offs_t offset) { return 0xff; } virtual void write_bank(int bank) { } - virtual DECLARE_WRITE8_MEMBER(io_write) { } + virtual void io_write(offs_t offset, uint8_t data) { } virtual DECLARE_READ_LINE_MEMBER(t0_read) { return 0; } void rom_alloc(uint32_t size, const char *tag); @@ -97,9 +97,9 @@ public: int get_type() { return m_type; } // reading and writing - DECLARE_READ8_MEMBER(read_rom04); - DECLARE_READ8_MEMBER(read_rom0c); - DECLARE_WRITE8_MEMBER(io_write); + uint8_t read_rom04(offs_t offset); + uint8_t read_rom0c(offs_t offset); + void io_write(offs_t offset, uint8_t data); DECLARE_READ_LINE_MEMBER(t0_read) { if (m_cart) return m_cart->t0_read(); else return 0; } void write_bank(int bank) { if (m_cart) m_cart->write_bank(bank); } diff --git a/src/devices/bus/odyssey2/voice.cpp b/src/devices/bus/odyssey2/voice.cpp index 83c199f7431..490b9b286ad 100644 --- a/src/devices/bus/odyssey2/voice.cpp +++ b/src/devices/bus/odyssey2/voice.cpp @@ -86,7 +86,7 @@ WRITE_LINE_MEMBER(o2_voice_device::lrq_callback) m_lrq_state = state; } -WRITE8_MEMBER(o2_voice_device::io_write) +void o2_voice_device::io_write(offs_t offset, uint8_t data) { if (data & 0x20) m_speech->ald_w(offset & 0x7f); diff --git a/src/devices/bus/odyssey2/voice.h b/src/devices/bus/odyssey2/voice.h index 296094e5bca..37ac35dcdcb 100644 --- a/src/devices/bus/odyssey2/voice.h +++ b/src/devices/bus/odyssey2/voice.h @@ -19,12 +19,12 @@ public: o2_voice_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom04) override { if (m_subslot->exists()) return m_subslot->read_rom04(space, offset); else return 0xff; } - virtual DECLARE_READ8_MEMBER(read_rom0c) override { if (m_subslot->exists()) return m_subslot->read_rom0c(space, offset); else return 0xff; } + virtual uint8_t read_rom04(offs_t offset) override { if (m_subslot->exists()) return m_subslot->read_rom04(offset); else return 0xff; } + virtual uint8_t read_rom0c(offs_t offset) override { if (m_subslot->exists()) return m_subslot->read_rom0c(offset); else return 0xff; } virtual void write_bank(int bank) override { if (m_subslot->exists()) m_subslot->write_bank(bank); } - virtual DECLARE_WRITE8_MEMBER(io_write) override; + virtual void io_write(offs_t offset, uint8_t data) override; virtual DECLARE_READ_LINE_MEMBER(t0_read) override { return m_speech->lrq_r() ? 0 : 1; } protected: diff --git a/src/devices/bus/oricext/microdisc.cpp b/src/devices/bus/oricext/microdisc.cpp index a3f92c23c52..16af24029e6 100644 --- a/src/devices/bus/oricext/microdisc.cpp +++ b/src/devices/bus/oricext/microdisc.cpp @@ -108,7 +108,7 @@ void oric_microdisc_device::remap() } } -WRITE8_MEMBER(oric_microdisc_device::port_314_w) +void oric_microdisc_device::port_314_w(uint8_t data) { port_314 = data; remap(); @@ -122,12 +122,12 @@ WRITE8_MEMBER(oric_microdisc_device::port_314_w) irq_w(intrq_state && (port_314 & P_IRQEN)); } -READ8_MEMBER(oric_microdisc_device::port_314_r) +uint8_t oric_microdisc_device::port_314_r() { return (intrq_state && (port_314 & P_IRQEN)) ? 0x7f : 0xff; } -READ8_MEMBER(oric_microdisc_device::port_318_r) +uint8_t oric_microdisc_device::port_318_r() { return drq_state ? 0x7f : 0xff; } diff --git a/src/devices/bus/oricext/microdisc.h b/src/devices/bus/oricext/microdisc.h index 648e1651310..73cd8d6519b 100644 --- a/src/devices/bus/oricext/microdisc.h +++ b/src/devices/bus/oricext/microdisc.h @@ -45,9 +45,9 @@ private: DECLARE_WRITE_LINE_MEMBER(fdc_drq_w); DECLARE_WRITE_LINE_MEMBER(fdc_hld_w); - DECLARE_WRITE8_MEMBER(port_314_w); - DECLARE_READ8_MEMBER(port_314_r); - DECLARE_READ8_MEMBER(port_318_r); + void port_314_w(uint8_t data); + uint8_t port_314_r(); + uint8_t port_318_r(); void map(address_map &map); diff --git a/src/devices/bus/pc_kbd/iskr1030.cpp b/src/devices/bus/pc_kbd/iskr1030.cpp index 9835b4ca7fb..5a39c103b50 100644 --- a/src/devices/bus/pc_kbd/iskr1030.cpp +++ b/src/devices/bus/pc_kbd/iskr1030.cpp @@ -392,7 +392,7 @@ READ_LINE_MEMBER( iskr_1030_keyboard_device::t1_r ) // ram_w - //------------------------------------------------- -WRITE8_MEMBER( iskr_1030_keyboard_device::ram_w ) +void iskr_1030_keyboard_device::ram_w(offs_t offset, uint8_t data) { LOGDBG("ram_w[%02x] <- %02x\n", offset, data); @@ -405,7 +405,7 @@ WRITE8_MEMBER( iskr_1030_keyboard_device::ram_w ) // ram_r - //------------------------------------------------- -READ8_MEMBER( iskr_1030_keyboard_device::ram_r ) +uint8_t iskr_1030_keyboard_device::ram_r(offs_t offset) { LOGDBG("ram_r[%02x] = %02x\n", offset, m_ram[offset]); diff --git a/src/devices/bus/pc_kbd/iskr1030.h b/src/devices/bus/pc_kbd/iskr1030.h index 358934b87a8..5c849a2b6b0 100644 --- a/src/devices/bus/pc_kbd/iskr1030.h +++ b/src/devices/bus/pc_kbd/iskr1030.h @@ -49,8 +49,8 @@ private: void p2_w(uint8_t data); DECLARE_READ_LINE_MEMBER( t1_r ); - DECLARE_READ8_MEMBER( ram_r ); - DECLARE_WRITE8_MEMBER( ram_w ); + uint8_t ram_r(offs_t offset); + void ram_w(offs_t offset, uint8_t data); void iskr_1030_keyboard_io(address_map &map); diff --git a/src/devices/bus/pc_kbd/keytro.cpp b/src/devices/bus/pc_kbd/keytro.cpp index 6d80655c236..d178bfceb6f 100644 --- a/src/devices/bus/pc_kbd/keytro.cpp +++ b/src/devices/bus/pc_kbd/keytro.cpp @@ -468,7 +468,7 @@ WRITE_LINE_MEMBER( pc_kbd_keytronic_pc3270_device::data_write ) } -READ8_MEMBER( pc_kbd_keytronic_pc3270_device::internal_data_read ) +uint8_t pc_kbd_keytronic_pc3270_device::internal_data_read(offs_t offset) { if (LOG) logerror("keytronic_pc3270::internal_data_read(): read from %04x\n", offset); @@ -483,7 +483,7 @@ READ8_MEMBER( pc_kbd_keytronic_pc3270_device::internal_data_read ) } -WRITE8_MEMBER( pc_kbd_keytronic_pc3270_device::internal_data_write ) +void pc_kbd_keytronic_pc3270_device::internal_data_write(offs_t offset, uint8_t data) { if (LOG) logerror("keytronic_pc3270::internal_data_write(): write to offset %04x\n", offset); diff --git a/src/devices/bus/pc_kbd/keytro.h b/src/devices/bus/pc_kbd/keytro.h index 3adcaf4aa8f..8fb6f021967 100644 --- a/src/devices/bus/pc_kbd/keytro.h +++ b/src/devices/bus/pc_kbd/keytro.h @@ -47,8 +47,8 @@ protected: virtual DECLARE_WRITE_LINE_MEMBER(clock_write) override; virtual DECLARE_WRITE_LINE_MEMBER(data_write) override; - DECLARE_READ8_MEMBER( internal_data_read ); - DECLARE_WRITE8_MEMBER( internal_data_write ); + uint8_t internal_data_read(offs_t offset); + void internal_data_write(offs_t offset, uint8_t data); uint8_t p1_read(); void p1_write(uint8_t data); uint8_t p2_read(); diff --git a/src/devices/bus/pce/pce_rom.cpp b/src/devices/bus/pce/pce_rom.cpp index cb4070d14a1..4522e850426 100644 --- a/src/devices/bus/pce/pce_rom.cpp +++ b/src/devices/bus/pce/pce_rom.cpp @@ -125,14 +125,14 @@ void pce_tennokoe_device::nvram_write(emu_file &file) mapper specific handlers -------------------------------------------------*/ -READ8_MEMBER(pce_rom_device::read_cart) +uint8_t pce_rom_device::read_cart(offs_t offset) { int bank = offset / 0x20000; return m_rom[rom_bank_map[bank] * 0x20000 + (offset & 0x1ffff)]; } -READ8_MEMBER(pce_cdsys3_device::read_cart) +uint8_t pce_cdsys3_device::read_cart(offs_t offset) { int bank = offset / 0x20000; if (!m_ram.empty() && offset >= 0xd0000) @@ -141,14 +141,14 @@ READ8_MEMBER(pce_cdsys3_device::read_cart) return m_rom[rom_bank_map[bank] * 0x20000 + (offset & 0x1ffff)]; } -WRITE8_MEMBER(pce_cdsys3_device::write_cart) +void pce_cdsys3_device::write_cart(offs_t offset, uint8_t data) { if (!m_ram.empty() && offset >= 0xd0000) m_ram[offset - 0xd0000] = data; } -READ8_MEMBER(pce_populous_device::read_cart) +uint8_t pce_populous_device::read_cart(offs_t offset) { int bank = offset / 0x20000; if (!m_ram.empty() && offset >= 0x80000 && offset < 0x88000) @@ -157,14 +157,14 @@ READ8_MEMBER(pce_populous_device::read_cart) return m_rom[rom_bank_map[bank] * 0x20000 + (offset & 0x1ffff)]; } -WRITE8_MEMBER(pce_populous_device::write_cart) +void pce_populous_device::write_cart(offs_t offset, uint8_t data) { if (!m_ram.empty() && offset >= 0x80000 && offset < 0x88000) m_ram[offset & 0x7fff] = data; } -READ8_MEMBER(pce_sf2_device::read_cart) +uint8_t pce_sf2_device::read_cart(offs_t offset) { if (offset < 0x80000) return m_rom[offset]; @@ -172,13 +172,13 @@ READ8_MEMBER(pce_sf2_device::read_cart) return m_rom[0x80000 + m_bank_base * 0x80000 + (offset & 0x7ffff)]; } -WRITE8_MEMBER(pce_sf2_device::write_cart) +void pce_sf2_device::write_cart(offs_t offset, uint8_t data) { if (offset >= 0x1ff0 && offset < 0x1ff4) m_bank_base = offset & 3; } -READ8_MEMBER(pce_tennokoe_device::read_cart) +uint8_t pce_tennokoe_device::read_cart(offs_t offset) { switch((offset & 0xf0000) >> 16) { @@ -202,7 +202,7 @@ READ8_MEMBER(pce_tennokoe_device::read_cart) return 0xff; } -WRITE8_MEMBER(pce_tennokoe_device::write_cart) +void pce_tennokoe_device::write_cart(offs_t offset, uint8_t data) { switch((offset & 0xf0000) >> 16) { diff --git a/src/devices/bus/pce/pce_rom.h b/src/devices/bus/pce/pce_rom.h index 7521e764d03..8d77b94e0e9 100644 --- a/src/devices/bus/pce/pce_rom.h +++ b/src/devices/bus/pce/pce_rom.h @@ -19,7 +19,7 @@ public: pce_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_cart) override; + virtual uint8_t read_cart(offs_t offset) override; protected: pce_rom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -38,8 +38,8 @@ public: pce_cdsys3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_cart) override; - virtual DECLARE_WRITE8_MEMBER(write_cart) override; + virtual uint8_t read_cart(offs_t offset) override; + virtual void write_cart(offs_t offset, uint8_t data) override; }; @@ -52,8 +52,8 @@ public: pce_populous_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_cart) override; - virtual DECLARE_WRITE8_MEMBER(write_cart) override; + virtual uint8_t read_cart(offs_t offset) override; + virtual void write_cart(offs_t offset, uint8_t data) override; }; @@ -66,8 +66,8 @@ public: pce_sf2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_cart) override; - virtual DECLARE_WRITE8_MEMBER(write_cart) override; + virtual uint8_t read_cart(offs_t offset) override; + virtual void write_cart(offs_t offset, uint8_t data) override; protected: // device-level overrides @@ -88,8 +88,8 @@ public: pce_tennokoe_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_cart) override; - virtual DECLARE_WRITE8_MEMBER(write_cart) override; + virtual uint8_t read_cart(offs_t offset) override; + virtual void write_cart(offs_t offset, uint8_t data) override; protected: // device-level overrides diff --git a/src/devices/bus/pce/pce_slot.cpp b/src/devices/bus/pce/pce_slot.cpp index 70ab09e23c1..4a9dd78bd98 100644 --- a/src/devices/bus/pce/pce_slot.cpp +++ b/src/devices/bus/pce/pce_slot.cpp @@ -344,10 +344,10 @@ std::string pce_cart_slot_device::get_default_card_software(get_default_card_sof read -------------------------------------------------*/ -READ8_MEMBER(pce_cart_slot_device::read_cart) +uint8_t pce_cart_slot_device::read_cart(offs_t offset) { if (m_cart) - return m_cart->read_cart(space, offset); + return m_cart->read_cart(offset); else return 0xff; } @@ -356,8 +356,8 @@ READ8_MEMBER(pce_cart_slot_device::read_cart) write -------------------------------------------------*/ -WRITE8_MEMBER(pce_cart_slot_device::write_cart) +void pce_cart_slot_device::write_cart(offs_t offset, uint8_t data) { if (m_cart) - m_cart->write_cart(space, offset, data); + m_cart->write_cart(offset, data); } diff --git a/src/devices/bus/pce/pce_slot.h b/src/devices/bus/pce/pce_slot.h index cabff4f47e3..79934087a0e 100644 --- a/src/devices/bus/pce/pce_slot.h +++ b/src/devices/bus/pce/pce_slot.h @@ -34,8 +34,8 @@ public: virtual ~device_pce_cart_interface(); // reading and writing - virtual DECLARE_READ8_MEMBER(read_cart) { return 0xff; } - virtual DECLARE_WRITE8_MEMBER(write_cart) {}; + virtual uint8_t read_cart(offs_t offset) { return 0xff; } + virtual void write_cart(offs_t offset, uint8_t data) {}; void rom_alloc(uint32_t size, const char *tag); void ram_alloc(uint32_t size); @@ -102,8 +102,8 @@ public: void set_intf(const char * interface) { m_interface = interface; } // reading and writing - virtual DECLARE_READ8_MEMBER(read_cart); - virtual DECLARE_WRITE8_MEMBER(write_cart); + uint8_t read_cart(offs_t offset); + void write_cart(offs_t offset, uint8_t data); protected: // device-level overrides diff --git a/src/devices/bus/scv/rom.cpp b/src/devices/bus/scv/rom.cpp index 027d94d9075..8be6a020752 100644 --- a/src/devices/bus/scv/rom.cpp +++ b/src/devices/bus/scv/rom.cpp @@ -122,25 +122,25 @@ void scv_rom128ram4_device::device_reset() mapper specific handlers -------------------------------------------------*/ -READ8_MEMBER(scv_rom8_device::read_cart) +uint8_t scv_rom8_device::read_cart(offs_t offset) { return m_rom[offset & 0x1fff]; } -READ8_MEMBER(scv_rom16_device::read_cart) +uint8_t scv_rom16_device::read_cart(offs_t offset) { return m_rom[offset & 0x3fff]; } -READ8_MEMBER(scv_rom32_device::read_cart) +uint8_t scv_rom32_device::read_cart(offs_t offset) { return m_rom[offset]; } -READ8_MEMBER(scv_rom32ram8_device::read_cart) +uint8_t scv_rom32ram8_device::read_cart(offs_t offset) { if (m_ram_enabled && offset >= 0x6000) return m_ram[offset & 0x1fff]; @@ -148,7 +148,7 @@ READ8_MEMBER(scv_rom32ram8_device::read_cart) return m_rom[offset]; } -WRITE8_MEMBER(scv_rom32ram8_device::write_cart) +void scv_rom32ram8_device::write_cart(offs_t offset, uint8_t data) { if (m_ram_enabled && offset >= 0x6000) m_ram[offset & 0x1fff] = data; @@ -160,7 +160,7 @@ void scv_rom32ram8_device::write_bank(uint8_t data) } -READ8_MEMBER(scv_rom64_device::read_cart) +uint8_t scv_rom64_device::read_cart(offs_t offset) { return m_rom[offset + (m_bank_base * 0x8000)]; } @@ -171,7 +171,7 @@ void scv_rom64_device::write_bank(uint8_t data) } -READ8_MEMBER(scv_rom128_device::read_cart) +uint8_t scv_rom128_device::read_cart(offs_t offset) { return m_rom[offset + (m_bank_base * 0x8000)]; } @@ -182,7 +182,7 @@ void scv_rom128_device::write_bank(uint8_t data) } -READ8_MEMBER(scv_rom128ram4_device::read_cart) +uint8_t scv_rom128ram4_device::read_cart(offs_t offset) { if (m_ram_enabled && offset >= 0x7000) return m_ram[offset & 0xfff]; @@ -190,7 +190,7 @@ READ8_MEMBER(scv_rom128ram4_device::read_cart) return m_rom[offset + (m_bank_base * 0x8000)]; } -WRITE8_MEMBER(scv_rom128ram4_device::write_cart) +void scv_rom128ram4_device::write_cart(offs_t offset, uint8_t data) { if (m_ram_enabled && offset >= 0x7000) m_ram[offset & 0xfff] = data; diff --git a/src/devices/bus/scv/rom.h b/src/devices/bus/scv/rom.h index 16799084ddf..74fa0591179 100644 --- a/src/devices/bus/scv/rom.h +++ b/src/devices/bus/scv/rom.h @@ -18,7 +18,7 @@ public: scv_rom8_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_cart) override; + virtual uint8_t read_cart(offs_t offset) override; protected: scv_rom8_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -37,7 +37,7 @@ public: scv_rom16_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_cart) override; + virtual uint8_t read_cart(offs_t offset) override; }; @@ -50,7 +50,7 @@ public: scv_rom32_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_cart) override; + virtual uint8_t read_cart(offs_t offset) override; }; @@ -63,8 +63,8 @@ public: scv_rom32ram8_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_cart) override; - virtual DECLARE_WRITE8_MEMBER(write_cart) override; + virtual uint8_t read_cart(offs_t offset) override; + virtual void write_cart(offs_t offset, uint8_t data) override; virtual void write_bank(uint8_t data) override; protected: @@ -90,7 +90,7 @@ public: virtual void device_reset() override; // reading and writing - virtual DECLARE_READ8_MEMBER(read_cart) override; + virtual uint8_t read_cart(offs_t offset) override; virtual void write_bank(uint8_t data) override; private: @@ -107,7 +107,7 @@ public: scv_rom128_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_cart) override; + virtual uint8_t read_cart(offs_t offset) override; virtual void write_bank(uint8_t data) override; protected: @@ -129,8 +129,8 @@ public: scv_rom128ram4_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_cart) override; - virtual DECLARE_WRITE8_MEMBER(write_cart) override; + virtual uint8_t read_cart(offs_t offset) override; + virtual void write_cart(offs_t offset, uint8_t data) override; virtual void write_bank(uint8_t data) override; protected: diff --git a/src/devices/bus/scv/slot.cpp b/src/devices/bus/scv/slot.cpp index 412c9c5818f..ccb604b38d8 100644 --- a/src/devices/bus/scv/slot.cpp +++ b/src/devices/bus/scv/slot.cpp @@ -261,10 +261,10 @@ std::string scv_cart_slot_device::get_default_card_software(get_default_card_sof read -------------------------------------------------*/ -READ8_MEMBER(scv_cart_slot_device::read_cart) +uint8_t scv_cart_slot_device::read_cart(offs_t offset) { if (m_cart) - return m_cart->read_cart(space, offset); + return m_cart->read_cart(offset); else return 0xff; } @@ -273,10 +273,10 @@ READ8_MEMBER(scv_cart_slot_device::read_cart) write -------------------------------------------------*/ -WRITE8_MEMBER(scv_cart_slot_device::write_cart) +void scv_cart_slot_device::write_cart(offs_t offset, uint8_t data) { if (m_cart) - m_cart->write_cart(space, offset, data); + m_cart->write_cart(offset, data); } diff --git a/src/devices/bus/scv/slot.h b/src/devices/bus/scv/slot.h index 7394cd401e3..2d962f6fc30 100644 --- a/src/devices/bus/scv/slot.h +++ b/src/devices/bus/scv/slot.h @@ -35,8 +35,8 @@ public: virtual ~device_scv_cart_interface(); // reading and writing - virtual DECLARE_READ8_MEMBER(read_cart) { return 0xff; } - virtual DECLARE_WRITE8_MEMBER(write_cart) { } + virtual uint8_t read_cart(offs_t offset) { return 0xff; } + virtual void write_cart(offs_t offset, uint8_t data) { } virtual void write_bank(uint8_t data) { } void rom_alloc(uint32_t size, const char *tag); @@ -101,9 +101,9 @@ public: void save_ram() { if (m_cart && m_cart->get_ram_size()) m_cart->save_ram(); } // reading and writing - virtual DECLARE_READ8_MEMBER(read_cart); - virtual DECLARE_WRITE8_MEMBER(write_cart); - virtual void write_bank(uint8_t data); + uint8_t read_cart(offs_t offset); + void write_cart(offs_t offset, uint8_t data); + void write_bank(uint8_t data); protected: // device-level overrides diff --git a/src/devices/bus/spc1000/exp.cpp b/src/devices/bus/spc1000/exp.cpp index c786894c154..ba8b22c1456 100644 --- a/src/devices/bus/spc1000/exp.cpp +++ b/src/devices/bus/spc1000/exp.cpp @@ -64,10 +64,10 @@ void spc1000_exp_device::device_start() read -------------------------------------------------*/ -READ8_MEMBER(spc1000_exp_device::read) +uint8_t spc1000_exp_device::read(offs_t offset) { if (m_card) - return m_card->read(space, offset); + return m_card->read(offset); else return 0xff; } @@ -76,8 +76,8 @@ READ8_MEMBER(spc1000_exp_device::read) write -------------------------------------------------*/ -WRITE8_MEMBER(spc1000_exp_device::write) +void spc1000_exp_device::write(offs_t offset, uint8_t data) { if (m_card) - m_card->write(space, offset, data); + m_card->write(offset, data); } diff --git a/src/devices/bus/spc1000/exp.h b/src/devices/bus/spc1000/exp.h index ca6960809a1..e2b1baeb958 100644 --- a/src/devices/bus/spc1000/exp.h +++ b/src/devices/bus/spc1000/exp.h @@ -14,8 +14,8 @@ public: virtual ~device_spc1000_card_interface(); // reading and writing - virtual DECLARE_READ8_MEMBER(read) { return 0xff; } - virtual DECLARE_WRITE8_MEMBER(write) { } + virtual uint8_t read(offs_t offset) { return 0xff; } + virtual void write(offs_t offset, uint8_t data) { } protected: device_spc1000_card_interface(const machine_config &mconfig, device_t &device); @@ -41,8 +41,8 @@ public: virtual ~spc1000_exp_device(); // reading and writing - virtual DECLARE_READ8_MEMBER(read); - virtual DECLARE_WRITE8_MEMBER(write); + uint8_t read(offs_t offset); + void write(offs_t offset, uint8_t data); protected: // device-level overrides diff --git a/src/devices/bus/spc1000/fdd.cpp b/src/devices/bus/spc1000/fdd.cpp index 531010349e8..60c2f4197af 100644 --- a/src/devices/bus/spc1000/fdd.cpp +++ b/src/devices/bus/spc1000/fdd.cpp @@ -33,18 +33,21 @@ void spc1000_fdd_exp_device::i8255_c_w(uint8_t data) // fdc interrupt //------------------------------------------------- -READ8_MEMBER( spc1000_fdd_exp_device::tc_r ) +uint8_t spc1000_fdd_exp_device::tc_r() { - logerror("%s: tc_r\n", machine().describe_context()); + if (!machine().side_effects_disabled()) + { + logerror("%s: tc_r\n", machine().describe_context()); - // toggle tc on read - m_fdc->tc_w(true); - m_timer_tc->adjust(attotime::zero); + // toggle tc on read + m_fdc->tc_w(true); + m_timer_tc->adjust(attotime::zero); + } return 0xff; } -WRITE8_MEMBER( spc1000_fdd_exp_device::control_w ) +void spc1000_fdd_exp_device::control_w(uint8_t data) { logerror("%s: control_w(%02x)\n", machine().describe_context(), data); @@ -182,7 +185,7 @@ void spc1000_fdd_exp_device::device_timer(emu_timer &timer, device_timer_id id, read -------------------------------------------------*/ -READ8_MEMBER(spc1000_fdd_exp_device::read) +uint8_t spc1000_fdd_exp_device::read(offs_t offset) { // this should be m_ppi->read on the whole 0x00-0x03 range? if (offset >= 3) @@ -207,7 +210,7 @@ READ8_MEMBER(spc1000_fdd_exp_device::read) // write //------------------------------------------------- -WRITE8_MEMBER(spc1000_fdd_exp_device::write) +void spc1000_fdd_exp_device::write(offs_t offset, uint8_t data) { // this should be m_ppi->write on the whole 0x00-0x03 range? if (offset < 3) diff --git a/src/devices/bus/spc1000/fdd.h b/src/devices/bus/spc1000/fdd.h index 3b3ef8bb00b..f8dac7aaedf 100644 --- a/src/devices/bus/spc1000/fdd.h +++ b/src/devices/bus/spc1000/fdd.h @@ -31,8 +31,8 @@ protected: virtual const tiny_rom_entry *device_rom_region() const override; virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override; - virtual DECLARE_READ8_MEMBER(read) override; - virtual DECLARE_WRITE8_MEMBER(write) override; + virtual uint8_t read(offs_t offset) override; + virtual void write(offs_t offset, uint8_t data) override; private: static constexpr device_timer_id TIMER_TC = 0; @@ -55,8 +55,8 @@ private: uint8_t i8255_c_r(); void i8255_c_w(uint8_t data); - DECLARE_READ8_MEMBER(tc_r); - DECLARE_WRITE8_MEMBER(control_w); + uint8_t tc_r(); + void control_w(uint8_t data); void sd725_io(address_map &map); void sd725_mem(address_map &map); diff --git a/src/devices/bus/spc1000/vdp.cpp b/src/devices/bus/spc1000/vdp.cpp index 61f496183b7..f85a64f59b9 100644 --- a/src/devices/bus/spc1000/vdp.cpp +++ b/src/devices/bus/spc1000/vdp.cpp @@ -74,7 +74,7 @@ void spc1000_vdp_exp_device::device_reset() /*------------------------------------------------- read -------------------------------------------------*/ -READ8_MEMBER(spc1000_vdp_exp_device::read) +uint8_t spc1000_vdp_exp_device::read(offs_t offset) { if (!(offset & 0x800)) return 0xff; @@ -89,7 +89,7 @@ READ8_MEMBER(spc1000_vdp_exp_device::read) // write //------------------------------------------------- -WRITE8_MEMBER(spc1000_vdp_exp_device::write) +void spc1000_vdp_exp_device::write(offs_t offset, uint8_t data) { if (offset & 0x800) { diff --git a/src/devices/bus/spc1000/vdp.h b/src/devices/bus/spc1000/vdp.h index 757c6cda0ec..989b25d5a90 100644 --- a/src/devices/bus/spc1000/vdp.h +++ b/src/devices/bus/spc1000/vdp.h @@ -27,8 +27,8 @@ protected: virtual void device_reset() override; virtual void device_add_mconfig(machine_config &config) override; - virtual DECLARE_READ8_MEMBER(read) override; - virtual DECLARE_WRITE8_MEMBER(write) override; + virtual uint8_t read(offs_t offset) override; + virtual void write(offs_t offset, uint8_t data) override; DECLARE_WRITE_LINE_MEMBER(vdp_interrupt); diff --git a/src/devices/bus/tvc/hbf.cpp b/src/devices/bus/tvc/hbf.cpp index bb9dcae91db..f60b201e0a7 100644 --- a/src/devices/bus/tvc/hbf.cpp +++ b/src/devices/bus/tvc/hbf.cpp @@ -105,7 +105,7 @@ const tiny_rom_entry *tvc_hbf_device::device_rom_region() const /*------------------------------------------------- read -------------------------------------------------*/ -READ8_MEMBER(tvc_hbf_device::read) +uint8_t tvc_hbf_device::read(offs_t offset) { if (offset>=0x1000) return m_ram[offset& 0x0fff]; @@ -117,7 +117,7 @@ READ8_MEMBER(tvc_hbf_device::read) // write //------------------------------------------------- -WRITE8_MEMBER(tvc_hbf_device::write) +void tvc_hbf_device::write(offs_t offset, uint8_t data) { if (offset>=0x1000) m_ram[offset & 0x0fff] = data; @@ -130,7 +130,7 @@ WRITE8_MEMBER(tvc_hbf_device::write) // IO read //------------------------------------------------- -READ8_MEMBER(tvc_hbf_device::io_read) +uint8_t tvc_hbf_device::io_read(offs_t offset) { switch((offset>>2) & 0x03) { @@ -147,7 +147,7 @@ READ8_MEMBER(tvc_hbf_device::io_read) // IO write //------------------------------------------------- -WRITE8_MEMBER(tvc_hbf_device::io_write) +void tvc_hbf_device::io_write(offs_t offset, uint8_t data) { switch((offset>>2) & 0x03) { diff --git a/src/devices/bus/tvc/hbf.h b/src/devices/bus/tvc/hbf.h index cc154d71294..82534b82949 100644 --- a/src/devices/bus/tvc/hbf.h +++ b/src/devices/bus/tvc/hbf.h @@ -34,10 +34,10 @@ protected: // tvcexp_interface overrides virtual uint8_t id_r() override { return 0x02; } // ID_A to GND, ID_B to VCC - virtual DECLARE_READ8_MEMBER(read) override; - virtual DECLARE_WRITE8_MEMBER(write) override; - virtual DECLARE_READ8_MEMBER(io_read) override; - virtual DECLARE_WRITE8_MEMBER(io_write) override; + virtual uint8_t read(offs_t offset) override; + virtual void write(offs_t offset, uint8_t data) override; + virtual uint8_t io_read(offs_t offset) override; + virtual void io_write(offs_t offset, uint8_t data) override; private: DECLARE_FLOPPY_FORMATS( floppy_formats ); diff --git a/src/devices/bus/tvc/tvc.cpp b/src/devices/bus/tvc/tvc.cpp index f73e5e4e8db..d3b4cee5652 100644 --- a/src/devices/bus/tvc/tvc.cpp +++ b/src/devices/bus/tvc/tvc.cpp @@ -124,10 +124,10 @@ uint8_t tvcexp_slot_device::int_r() read -------------------------------------------------*/ -READ8_MEMBER(tvcexp_slot_device::read) +uint8_t tvcexp_slot_device::read(offs_t offset) { if (m_cart) - return m_cart->read(space, offset); + return m_cart->read(offset); else return 0x00; } @@ -137,20 +137,20 @@ READ8_MEMBER(tvcexp_slot_device::read) write -------------------------------------------------*/ -WRITE8_MEMBER(tvcexp_slot_device::write) +void tvcexp_slot_device::write(offs_t offset, uint8_t data) { if (m_cart) - m_cart->write(space, offset, data); + m_cart->write(offset, data); } /*------------------------------------------------- IO read -------------------------------------------------*/ -READ8_MEMBER(tvcexp_slot_device::io_read) +uint8_t tvcexp_slot_device::io_read(offs_t offset) { if (m_cart) - return m_cart->io_read(space, offset); + return m_cart->io_read(offset); else return 0x00; } @@ -160,8 +160,8 @@ READ8_MEMBER(tvcexp_slot_device::io_read) IO write -------------------------------------------------*/ -WRITE8_MEMBER(tvcexp_slot_device::io_write) +void tvcexp_slot_device::io_write(offs_t offset, uint8_t data) { if (m_cart) - m_cart->io_write(space, offset, data); + m_cart->io_write(offset, data); } diff --git a/src/devices/bus/tvc/tvc.h b/src/devices/bus/tvc/tvc.h index 51db38c1096..bf184967685 100644 --- a/src/devices/bus/tvc/tvc.h +++ b/src/devices/bus/tvc/tvc.h @@ -75,10 +75,10 @@ public: virtual uint8_t id_r() { return 0x00; } // ID_A and ID_B lines virtual void int_ack() { } virtual uint8_t int_r() { return 1; } - virtual DECLARE_READ8_MEMBER(read) { return 0x00; } - virtual DECLARE_WRITE8_MEMBER(write) { } - virtual DECLARE_READ8_MEMBER(io_read) { return 0x00; } - virtual DECLARE_WRITE8_MEMBER(io_write) { } + virtual uint8_t read(offs_t offset) { return 0x00; } + virtual void write(offs_t offset, uint8_t data) { } + virtual uint8_t io_read(offs_t offset) { return 0x00; } + virtual void io_write(offs_t offset, uint8_t data) { } protected: device_tvcexp_interface(const machine_config &mconfig, device_t &device); @@ -107,13 +107,13 @@ public: auto out_nmi_callback() { return m_out_nmi_cb.bind(); } // reading and writing - virtual uint8_t id_r(); - virtual void int_ack(); - virtual uint8_t int_r(); - virtual DECLARE_READ8_MEMBER(read); - virtual DECLARE_WRITE8_MEMBER(write); - virtual DECLARE_READ8_MEMBER(io_read); - virtual DECLARE_WRITE8_MEMBER(io_write); + uint8_t id_r(); + void int_ack(); + uint8_t int_r(); + uint8_t read(offs_t offset); + void write(offs_t offset, uint8_t data); + uint8_t io_read(offs_t offset); + void io_write(offs_t offset, uint8_t data); protected: // device-level overrides diff --git a/src/devices/bus/vectrex/rom.cpp b/src/devices/bus/vectrex/rom.cpp index 273d9d55b4f..04410dd5623 100644 --- a/src/devices/bus/vectrex/rom.cpp +++ b/src/devices/bus/vectrex/rom.cpp @@ -64,7 +64,7 @@ void vectrex_rom64k_device::device_reset() mapper specific handlers -------------------------------------------------*/ -READ8_MEMBER(vectrex_rom_device::read_rom) +uint8_t vectrex_rom_device::read_rom(offs_t offset) { if (offset < m_rom_size) return m_rom[offset]; @@ -73,7 +73,7 @@ READ8_MEMBER(vectrex_rom_device::read_rom) } -READ8_MEMBER(vectrex_rom64k_device::read_rom) +uint8_t vectrex_rom64k_device::read_rom(offs_t offset) { return m_rom[(offset + m_bank * 0x8000) & (m_rom_size - 1)]; } @@ -83,7 +83,7 @@ void vectrex_rom64k_device::write_bank(uint8_t data) m_bank = data >> 6; } -WRITE8_MEMBER(vectrex_sram_device::write_ram) +void vectrex_sram_device::write_ram(offs_t offset, uint8_t data) { m_rom[offset & (m_rom_size - 1)] = data; } diff --git a/src/devices/bus/vectrex/rom.h b/src/devices/bus/vectrex/rom.h index 6aeeed2545f..dd83f54042c 100644 --- a/src/devices/bus/vectrex/rom.h +++ b/src/devices/bus/vectrex/rom.h @@ -18,7 +18,7 @@ public: vectrex_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom) override; + virtual uint8_t read_rom(offs_t offset) override; protected: vectrex_rom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -37,7 +37,7 @@ public: vectrex_rom64k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom) override; + virtual uint8_t read_rom(offs_t offset) override; virtual void write_bank(uint8_t data) override; protected: @@ -58,7 +58,7 @@ public: vectrex_sram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_WRITE8_MEMBER(write_ram) override; + virtual void write_ram(offs_t offset, uint8_t data) override; }; diff --git a/src/devices/bus/vectrex/slot.cpp b/src/devices/bus/vectrex/slot.cpp index 4a19cd20065..120e1518e0e 100644 --- a/src/devices/bus/vectrex/slot.cpp +++ b/src/devices/bus/vectrex/slot.cpp @@ -225,10 +225,10 @@ std::string vectrex_cart_slot_device::get_default_card_software(get_default_card read_rom -------------------------------------------------*/ -READ8_MEMBER(vectrex_cart_slot_device::read_rom) +uint8_t vectrex_cart_slot_device::read_rom(offs_t offset) { if (m_cart) - return m_cart->read_rom(space, offset); + return m_cart->read_rom(offset); else return 0xff; } @@ -237,10 +237,10 @@ READ8_MEMBER(vectrex_cart_slot_device::read_rom) write_ram -------------------------------------------------*/ -WRITE8_MEMBER(vectrex_cart_slot_device::write_ram) +void vectrex_cart_slot_device::write_ram(offs_t offset, uint8_t data) { if (m_cart) - m_cart->write_ram(space, offset, data); + m_cart->write_ram(offset, data); } /*------------------------------------------------- diff --git a/src/devices/bus/vectrex/slot.h b/src/devices/bus/vectrex/slot.h index b81cd67ede3..38819b2bb8e 100644 --- a/src/devices/bus/vectrex/slot.h +++ b/src/devices/bus/vectrex/slot.h @@ -39,8 +39,8 @@ public: virtual ~device_vectrex_cart_interface(); // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom) { return 0xff; } - virtual DECLARE_WRITE8_MEMBER(write_ram) { } + virtual uint8_t read_rom(offs_t offset) { return 0xff; } + virtual void write_ram(offs_t offset, uint8_t data) { } virtual void write_bank(uint8_t data) { } void rom_alloc(uint32_t size, const char *tag); @@ -87,9 +87,9 @@ public: int get_vec3d() { return m_vec3d; } // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom); - virtual DECLARE_WRITE8_MEMBER(write_ram); - virtual void write_bank(uint8_t data); + uint8_t read_rom(offs_t offset); + void write_ram(offs_t offset, uint8_t data); + void write_bank(uint8_t data); protected: // device-level overrides diff --git a/src/devices/bus/vsmile/rom.cpp b/src/devices/bus/vsmile/rom.cpp index 584a8cfe058..ca2780a2725 100644 --- a/src/devices/bus/vsmile/rom.cpp +++ b/src/devices/bus/vsmile/rom.cpp @@ -62,7 +62,7 @@ void vsmile_rom_device::device_reset() Cart with NVRAM -------------------------------------------------*/ -READ16_MEMBER(vsmile_rom_nvram_device::bank2_r) +uint16_t vsmile_rom_nvram_device::bank2_r(offs_t offset) { if (!m_nvram.empty() && offset < m_nvram.size()) return m_nvram[offset]; @@ -70,10 +70,10 @@ READ16_MEMBER(vsmile_rom_nvram_device::bank2_r) return 0; } -WRITE16_MEMBER(vsmile_rom_nvram_device::bank2_w) +void vsmile_rom_nvram_device::bank2_w(offs_t offset, uint16_t data) { if (!m_nvram.empty() && offset < m_nvram.size()) - COMBINE_DATA(&m_nvram[offset]); + m_nvram[offset] = data; } /*------------------------------------------------- diff --git a/src/devices/bus/vsmile/rom.h b/src/devices/bus/vsmile/rom.h index ec39f1f743e..617d1ad6ecd 100644 --- a/src/devices/bus/vsmile/rom.h +++ b/src/devices/bus/vsmile/rom.h @@ -16,10 +16,10 @@ public: vsmile_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ16_MEMBER(bank0_r) override { return m_rom[m_bank_offset + 0x000000 + offset]; } - virtual DECLARE_READ16_MEMBER(bank1_r) override { return m_rom[m_bank_offset + 0x100000 + offset]; } - virtual DECLARE_READ16_MEMBER(bank2_r) override { return m_rom[m_bank_offset + 0x200000 + offset]; } - virtual DECLARE_READ16_MEMBER(bank3_r) override { return m_rom[m_bank_offset + 0x300000 + offset]; } + virtual uint16_t bank0_r(offs_t offset) override { return m_rom[m_bank_offset + 0x000000 + offset]; } + virtual uint16_t bank1_r(offs_t offset) override { return m_rom[m_bank_offset + 0x100000 + offset]; } + virtual uint16_t bank2_r(offs_t offset) override { return m_rom[m_bank_offset + 0x200000 + offset]; } + virtual uint16_t bank3_r(offs_t offset) override { return m_rom[m_bank_offset + 0x300000 + offset]; } // banking virtual void set_cs2(bool cs2) override; @@ -43,8 +43,8 @@ public: // construction/destruction vsmile_rom_nvram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - virtual DECLARE_READ16_MEMBER(bank2_r) override; - virtual DECLARE_WRITE16_MEMBER(bank2_w) override; + virtual uint16_t bank2_r(offs_t offset) override; + virtual void bank2_w(offs_t offset, uint16_t data) override; protected: vsmile_rom_nvram_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); diff --git a/src/devices/bus/vsmile/vsmile_slot.cpp b/src/devices/bus/vsmile/vsmile_slot.cpp index 7bc440f541d..116292c5f78 100644 --- a/src/devices/bus/vsmile/vsmile_slot.cpp +++ b/src/devices/bus/vsmile/vsmile_slot.cpp @@ -208,44 +208,44 @@ std::string vsmile_cart_slot_device::get_default_card_software(get_default_card_ cart accessors -------------------------------------------------*/ -READ16_MEMBER(vsmile_cart_slot_device::bank0_r) +uint16_t vsmile_cart_slot_device::bank0_r(offs_t offset) { - return m_cart->bank0_r(space, offset, mem_mask); + return m_cart->bank0_r(offset); } -READ16_MEMBER(vsmile_cart_slot_device::bank1_r) +uint16_t vsmile_cart_slot_device::bank1_r(offs_t offset) { - return m_cart->bank1_r(space, offset, mem_mask); + return m_cart->bank1_r(offset); } -READ16_MEMBER(vsmile_cart_slot_device::bank2_r) +uint16_t vsmile_cart_slot_device::bank2_r(offs_t offset) { - return m_cart->bank2_r(space, offset, mem_mask); + return m_cart->bank2_r(offset); } -READ16_MEMBER(vsmile_cart_slot_device::bank3_r) +uint16_t vsmile_cart_slot_device::bank3_r(offs_t offset) { - return m_cart->bank3_r(space, offset, mem_mask); + return m_cart->bank3_r(offset); } -WRITE16_MEMBER(vsmile_cart_slot_device::bank0_w) +void vsmile_cart_slot_device::bank0_w(offs_t offset, uint16_t data) { - m_cart->bank0_w(space, offset, data, mem_mask); + m_cart->bank0_w(offset, data); } -WRITE16_MEMBER(vsmile_cart_slot_device::bank1_w) +void vsmile_cart_slot_device::bank1_w(offs_t offset, uint16_t data) { - m_cart->bank1_w(space, offset, data, mem_mask); + m_cart->bank1_w(offset, data); } -WRITE16_MEMBER(vsmile_cart_slot_device::bank2_w) +void vsmile_cart_slot_device::bank2_w(offs_t offset, uint16_t data) { - m_cart->bank2_w(space, offset, data, mem_mask); + m_cart->bank2_w(offset, data); } -WRITE16_MEMBER(vsmile_cart_slot_device::bank3_w) +void vsmile_cart_slot_device::bank3_w(offs_t offset, uint16_t data) { - m_cart->bank3_w(space, offset, data, mem_mask); + m_cart->bank3_w(offset, data); } void vsmile_cart_slot_device::set_cs2(bool cs2) diff --git a/src/devices/bus/vsmile/vsmile_slot.h b/src/devices/bus/vsmile/vsmile_slot.h index d103dfb309c..a17163ad105 100644 --- a/src/devices/bus/vsmile/vsmile_slot.h +++ b/src/devices/bus/vsmile/vsmile_slot.h @@ -29,14 +29,14 @@ public: virtual ~device_vsmile_cart_interface(); // reading and writing - virtual DECLARE_READ16_MEMBER(bank0_r) { return 0; } - virtual DECLARE_READ16_MEMBER(bank1_r) { return 0; } - virtual DECLARE_READ16_MEMBER(bank2_r) { return 0; } - virtual DECLARE_READ16_MEMBER(bank3_r) { return 0; } - virtual DECLARE_WRITE16_MEMBER(bank0_w) { } - virtual DECLARE_WRITE16_MEMBER(bank1_w) { } - virtual DECLARE_WRITE16_MEMBER(bank2_w) { } - virtual DECLARE_WRITE16_MEMBER(bank3_w) { } + virtual uint16_t bank0_r(offs_t offset) { return 0; } + virtual uint16_t bank1_r(offs_t offset) { return 0; } + virtual uint16_t bank2_r(offs_t offset) { return 0; } + virtual uint16_t bank3_r(offs_t offset) { return 0; } + virtual void bank0_w(offs_t offset, uint16_t data) { } + virtual void bank1_w(offs_t offset, uint16_t data) { } + virtual void bank2_w(offs_t offset, uint16_t data) { } + virtual void bank3_w(offs_t offset, uint16_t data) { } // banking virtual void set_cs2(bool cs2) = 0; @@ -101,14 +101,14 @@ public: uint32_t get_rom_size() { return m_cart ? m_cart->get_rom_size() : 0; } // reading and writing - virtual DECLARE_READ16_MEMBER(bank0_r); - virtual DECLARE_READ16_MEMBER(bank1_r); - virtual DECLARE_READ16_MEMBER(bank2_r); - virtual DECLARE_READ16_MEMBER(bank3_r); - virtual DECLARE_WRITE16_MEMBER(bank0_w); - virtual DECLARE_WRITE16_MEMBER(bank1_w); - virtual DECLARE_WRITE16_MEMBER(bank2_w); - virtual DECLARE_WRITE16_MEMBER(bank3_w); + uint16_t bank0_r(offs_t offset); + uint16_t bank1_r(offs_t offset); + uint16_t bank2_r(offs_t offset); + uint16_t bank3_r(offs_t offset); + void bank0_w(offs_t offset, uint16_t data); + void bank1_w(offs_t offset, uint16_t data); + void bank2_w(offs_t offset, uint16_t data); + void bank3_w(offs_t offset, uint16_t data); // banking void set_cs2(bool cs2); diff --git a/src/devices/bus/vtech/ioexp/joystick.cpp b/src/devices/bus/vtech/ioexp/joystick.cpp index f8521538195..a352c555fbd 100644 --- a/src/devices/bus/vtech/ioexp/joystick.cpp +++ b/src/devices/bus/vtech/ioexp/joystick.cpp @@ -89,7 +89,7 @@ void vtech_joystick_interface_device::device_start() void vtech_joystick_interface_device::device_reset() { - io_space().install_read_handler(0x20, 0x2f, read8_delegate(*this, FUNC(vtech_joystick_interface_device::joystick_r))); + io_space().install_read_handler(0x20, 0x2f, read8sm_delegate(*this, FUNC(vtech_joystick_interface_device::joystick_r))); } @@ -97,7 +97,7 @@ void vtech_joystick_interface_device::device_reset() // IMPLEMENTATION //************************************************************************** -READ8_MEMBER( vtech_joystick_interface_device::joystick_r ) +uint8_t vtech_joystick_interface_device::joystick_r(offs_t offset) { uint8_t data = 0xff; diff --git a/src/devices/bus/vtech/ioexp/joystick.h b/src/devices/bus/vtech/ioexp/joystick.h index 0c05403ad2b..f648bb9e469 100644 --- a/src/devices/bus/vtech/ioexp/joystick.h +++ b/src/devices/bus/vtech/ioexp/joystick.h @@ -29,7 +29,7 @@ public: // construction/destruction vtech_joystick_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8_MEMBER( joystick_r ); + uint8_t joystick_r(offs_t offset); protected: virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/vtech/ioexp/printer.cpp b/src/devices/bus/vtech/ioexp/printer.cpp index ddc0bdf960c..fa452ce3928 100644 --- a/src/devices/bus/vtech/ioexp/printer.cpp +++ b/src/devices/bus/vtech/ioexp/printer.cpp @@ -64,8 +64,8 @@ void vtech_printer_interface_device::device_start() void vtech_printer_interface_device::device_reset() { - io_space().install_read_handler(0x00, 0x00, read8_delegate(*this, FUNC(vtech_printer_interface_device::busy_r))); - io_space().install_write_handler(0x0d, 0x0d, write8_delegate(*this, FUNC(vtech_printer_interface_device::strobe_w))); + io_space().install_read_handler(0x00, 0x00, read8smo_delegate(*this, FUNC(vtech_printer_interface_device::busy_r))); + io_space().install_write_handler(0x0d, 0x0d, write8smo_delegate(*this, FUNC(vtech_printer_interface_device::strobe_w))); io_space().install_write_handler(0x0e, 0x0e, write8smo_delegate(*m_latch, FUNC(output_latch_device::write))); } @@ -79,12 +79,12 @@ WRITE_LINE_MEMBER( vtech_printer_interface_device::busy_w ) m_centronics_busy = state; } -READ8_MEMBER( vtech_printer_interface_device::busy_r ) +uint8_t vtech_printer_interface_device::busy_r() { return 0xfe | m_centronics_busy; } -WRITE8_MEMBER( vtech_printer_interface_device::strobe_w ) +void vtech_printer_interface_device::strobe_w(uint8_t data) { m_centronics->write_strobe(1); m_centronics->write_strobe(0); diff --git a/src/devices/bus/vtech/ioexp/printer.h b/src/devices/bus/vtech/ioexp/printer.h index 013d2366528..58f8493f3ab 100644 --- a/src/devices/bus/vtech/ioexp/printer.h +++ b/src/devices/bus/vtech/ioexp/printer.h @@ -36,8 +36,8 @@ protected: private: DECLARE_WRITE_LINE_MEMBER( busy_w ); - DECLARE_READ8_MEMBER( busy_r ); - DECLARE_WRITE8_MEMBER( strobe_w ); + uint8_t busy_r(); + void strobe_w(uint8_t data); required_device m_centronics; required_device m_latch; diff --git a/src/devices/bus/vtech/memexp/floppy.cpp b/src/devices/bus/vtech/memexp/floppy.cpp index 5807588ec27..1b3cfa2d91d 100644 --- a/src/devices/bus/vtech/memexp/floppy.cpp +++ b/src/devices/bus/vtech/memexp/floppy.cpp @@ -133,7 +133,7 @@ void vtech_floppy_controller_device::device_reset() // bit 6: !write request // bits 4,7: floppy select -WRITE8_MEMBER(vtech_floppy_controller_device::latch_w) +void vtech_floppy_controller_device::latch_w(uint8_t data) { uint8_t diff = m_latch ^ data; m_latch = data; @@ -209,17 +209,20 @@ WRITE8_MEMBER(vtech_floppy_controller_device::latch_w) // - the inverted inverter output is shifted through the lsb of the shift register // - the inverter is cleared -READ8_MEMBER(vtech_floppy_controller_device::shifter_r) +uint8_t vtech_floppy_controller_device::shifter_r() { - update_latching_inverter(); - m_shifter = (m_shifter << 1) | !m_latching_inverter; - m_latching_inverter = false; + if (!machine().side_effects_disabled()) + { + update_latching_inverter(); + m_shifter = (m_shifter << 1) | !m_latching_inverter; + m_latching_inverter = false; + } return m_shifter; } // Linked to the latching inverter on bit 7, rest is floating -READ8_MEMBER(vtech_floppy_controller_device::rd_r) +uint8_t vtech_floppy_controller_device::rd_r() { update_latching_inverter(); return m_latching_inverter ? 0x80 : 0x00; @@ -227,7 +230,7 @@ READ8_MEMBER(vtech_floppy_controller_device::rd_r) // Linked to wp signal on bit 7, rest is floating -READ8_MEMBER(vtech_floppy_controller_device::wpt_r) +uint8_t vtech_floppy_controller_device::wpt_r() { return m_floppy && m_floppy->wpt_r() ? 0x80 : 0x00; } diff --git a/src/devices/bus/vtech/memexp/floppy.h b/src/devices/bus/vtech/memexp/floppy.h index a81ea420395..56a926e17b1 100644 --- a/src/devices/bus/vtech/memexp/floppy.h +++ b/src/devices/bus/vtech/memexp/floppy.h @@ -39,10 +39,10 @@ protected: private: void map(address_map &map); - DECLARE_WRITE8_MEMBER(latch_w); - DECLARE_READ8_MEMBER(shifter_r); - DECLARE_READ8_MEMBER(rd_r); - DECLARE_READ8_MEMBER(wpt_r); + void latch_w(uint8_t data); + uint8_t shifter_r(); + uint8_t rd_r(); + uint8_t wpt_r(); void index_callback(floppy_image_device *floppy, int state); void update_latching_inverter(); diff --git a/src/devices/bus/vtech/memexp/memory.cpp b/src/devices/bus/vtech/memexp/memory.cpp index 19330332bed..22bcc69b959 100644 --- a/src/devices/bus/vtech/memexp/memory.cpp +++ b/src/devices/bus/vtech/memexp/memory.cpp @@ -158,10 +158,10 @@ void vtech_laser_64k_device::device_reset() membank(tag())->set_entry(1); // bank switch - io_space().install_write_handler(0x70, 0x7f, write8_delegate(*this, FUNC(vtech_laser_64k_device::bankswitch_w))); + io_space().install_write_handler(0x70, 0x7f, write8smo_delegate(*this, FUNC(vtech_laser_64k_device::bankswitch_w))); } -WRITE8_MEMBER( vtech_laser_64k_device::bankswitch_w ) +void vtech_laser_64k_device::bankswitch_w(uint8_t data) { membank(tag())->set_entry(data & 0x03); } diff --git a/src/devices/bus/vtech/memexp/memory.h b/src/devices/bus/vtech/memexp/memory.h index f8a0fe78e7d..6f87f3b51b8 100644 --- a/src/devices/bus/vtech/memexp/memory.h +++ b/src/devices/bus/vtech/memexp/memory.h @@ -74,7 +74,7 @@ public: // construction/destruction vtech_laser_64k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_WRITE8_MEMBER( bankswitch_w ); + void bankswitch_w(uint8_t data); protected: virtual void device_start() override; diff --git a/src/devices/bus/vtech/memexp/rs232.cpp b/src/devices/bus/vtech/memexp/rs232.cpp index 959ef7d1adc..d731880d2b7 100644 --- a/src/devices/bus/vtech/memexp/rs232.cpp +++ b/src/devices/bus/vtech/memexp/rs232.cpp @@ -75,8 +75,8 @@ void vtech_rs232_interface_device::device_reset() program_space().install_rom(0x4000, 0x47ff, 0x800, memregion("software")->base()); // data - program_space().install_read_handler(0x5000, 0x57ff, read8_delegate(*this, FUNC(vtech_rs232_interface_device::receive_data_r))); - program_space().install_write_handler(0x5800, 0x5fff, write8_delegate(*this, FUNC(vtech_rs232_interface_device::transmit_data_w))); + program_space().install_read_handler(0x5000, 0x57ff, read8smo_delegate(*this, FUNC(vtech_rs232_interface_device::receive_data_r))); + program_space().install_write_handler(0x5800, 0x5fff, write8smo_delegate(*this, FUNC(vtech_rs232_interface_device::transmit_data_w))); } @@ -89,12 +89,12 @@ WRITE_LINE_MEMBER( vtech_rs232_interface_device::rs232_rx_w ) m_rx = state; } -READ8_MEMBER( vtech_rs232_interface_device::receive_data_r ) +uint8_t vtech_rs232_interface_device::receive_data_r() { return 0x7f | (m_rx << 7); } -WRITE8_MEMBER( vtech_rs232_interface_device::transmit_data_w ) +void vtech_rs232_interface_device::transmit_data_w(uint8_t data) { m_rs232->write_txd(!BIT(data, 7)); } diff --git a/src/devices/bus/vtech/memexp/rs232.h b/src/devices/bus/vtech/memexp/rs232.h index 272ef41e2d6..25094dcc7a2 100644 --- a/src/devices/bus/vtech/memexp/rs232.h +++ b/src/devices/bus/vtech/memexp/rs232.h @@ -35,8 +35,8 @@ protected: private: DECLARE_WRITE_LINE_MEMBER( rs232_rx_w ); - DECLARE_READ8_MEMBER( receive_data_r ); - DECLARE_WRITE8_MEMBER( transmit_data_w ); + uint8_t receive_data_r(); + void transmit_data_w(uint8_t data); required_device m_rs232; diff --git a/src/devices/bus/vtech/memexp/rtty.cpp b/src/devices/bus/vtech/memexp/rtty.cpp index 02b3aba005b..6830ff14c13 100644 --- a/src/devices/bus/vtech/memexp/rtty.cpp +++ b/src/devices/bus/vtech/memexp/rtty.cpp @@ -63,9 +63,9 @@ void vtech_rtty_interface_device::device_reset() program_space().install_rom(0x4000, 0x4fff, 0x1000, memregion("software")->base()); // data - program_space().install_read_handler(0x5000, 0x57ff, read8_delegate(*this, FUNC(vtech_rtty_interface_device::receive_data_r))); - program_space().install_write_handler(0x5800, 0x5fff, write8_delegate(*this, FUNC(vtech_rtty_interface_device::transmit_data_w))); - program_space().install_write_handler(0x6000, 0x67ff, write8_delegate(*this, FUNC(vtech_rtty_interface_device::relay_w))); + program_space().install_read_handler(0x5000, 0x57ff, read8smo_delegate(*this, FUNC(vtech_rtty_interface_device::receive_data_r))); + program_space().install_write_handler(0x5800, 0x5fff, write8smo_delegate(*this, FUNC(vtech_rtty_interface_device::transmit_data_w))); + program_space().install_write_handler(0x6000, 0x67ff, write8smo_delegate(*this, FUNC(vtech_rtty_interface_device::relay_w))); } @@ -73,17 +73,17 @@ void vtech_rtty_interface_device::device_reset() // IMPLEMENTATION //************************************************************************** -READ8_MEMBER( vtech_rtty_interface_device::receive_data_r ) +uint8_t vtech_rtty_interface_device::receive_data_r() { return 0xff; } -WRITE8_MEMBER( vtech_rtty_interface_device::transmit_data_w ) +void vtech_rtty_interface_device::transmit_data_w(uint8_t data) { logerror("transmit_w: %d\n", BIT(data, 7)); } -WRITE8_MEMBER( vtech_rtty_interface_device::relay_w ) +void vtech_rtty_interface_device::relay_w(uint8_t data) { logerror("relay_w: %d\n", BIT(data, 7)); } diff --git a/src/devices/bus/vtech/memexp/rtty.h b/src/devices/bus/vtech/memexp/rtty.h index 82c3b150f34..9868bef9bee 100644 --- a/src/devices/bus/vtech/memexp/rtty.h +++ b/src/devices/bus/vtech/memexp/rtty.h @@ -26,9 +26,9 @@ public: // construction/destruction vtech_rtty_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - DECLARE_READ8_MEMBER( receive_data_r ); - DECLARE_WRITE8_MEMBER( transmit_data_w ); - DECLARE_WRITE8_MEMBER( relay_w ); + uint8_t receive_data_r(); + void transmit_data_w(uint8_t data); + void relay_w(uint8_t data); protected: virtual const tiny_rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/z88/flash.cpp b/src/devices/bus/z88/flash.cpp index ee92f351ec7..c769530b1de 100644 --- a/src/devices/bus/z88/flash.cpp +++ b/src/devices/bus/z88/flash.cpp @@ -71,7 +71,7 @@ uint8_t* z88_1024k_flash_device::get_cart_base() read -------------------------------------------------*/ -READ8_MEMBER(z88_1024k_flash_device::read) +uint8_t z88_1024k_flash_device::read(offs_t offset) { return m_flash->read(offset & (get_cart_size() - 1)); } @@ -80,7 +80,7 @@ READ8_MEMBER(z88_1024k_flash_device::read) write -------------------------------------------------*/ -WRITE8_MEMBER(z88_1024k_flash_device::write) +void z88_1024k_flash_device::write(offs_t offset, uint8_t data) { m_flash->write(offset & (get_cart_size() - 1), data); } diff --git a/src/devices/bus/z88/flash.h b/src/devices/bus/z88/flash.h index b26be3b515d..f92a9448d1b 100644 --- a/src/devices/bus/z88/flash.h +++ b/src/devices/bus/z88/flash.h @@ -27,8 +27,8 @@ protected: virtual void device_start() override; // z88cart_interface overrides - virtual DECLARE_READ8_MEMBER(read) override; - virtual DECLARE_WRITE8_MEMBER(write) override; + virtual uint8_t read(offs_t offset) override; + virtual void write(offs_t offset, uint8_t data) override; virtual uint8_t* get_cart_base() override; virtual uint32_t get_cart_size() override { return 0x100000; } diff --git a/src/devices/bus/z88/ram.cpp b/src/devices/bus/z88/ram.cpp index 69ddd3125a6..9c259260c58 100644 --- a/src/devices/bus/z88/ram.cpp +++ b/src/devices/bus/z88/ram.cpp @@ -93,7 +93,7 @@ uint8_t* z88_32k_ram_device::get_cart_base() read -------------------------------------------------*/ -READ8_MEMBER(z88_32k_ram_device::read) +uint8_t z88_32k_ram_device::read(offs_t offset) { return m_ram[offset & (get_cart_size() - 1)]; } @@ -102,7 +102,7 @@ READ8_MEMBER(z88_32k_ram_device::read) write -------------------------------------------------*/ -WRITE8_MEMBER(z88_32k_ram_device::write) +void z88_32k_ram_device::write(offs_t offset, uint8_t data) { m_ram[offset & (get_cart_size() - 1)] = data; } diff --git a/src/devices/bus/z88/ram.h b/src/devices/bus/z88/ram.h index 357959064a8..3a304bf80ea 100644 --- a/src/devices/bus/z88/ram.h +++ b/src/devices/bus/z88/ram.h @@ -27,8 +27,8 @@ protected: virtual void device_start() override; // z88cart_interface overrides - virtual DECLARE_READ8_MEMBER(read) override; - virtual DECLARE_WRITE8_MEMBER(write) override; + virtual uint8_t read(offs_t offset) override; + virtual void write(offs_t offset, uint8_t data) override; virtual uint8_t* get_cart_base() override; virtual uint32_t get_cart_size() override { return 0x8000; } diff --git a/src/devices/bus/z88/rom.cpp b/src/devices/bus/z88/rom.cpp index ea1feb603f4..c265d99dfc9 100644 --- a/src/devices/bus/z88/rom.cpp +++ b/src/devices/bus/z88/rom.cpp @@ -81,7 +81,7 @@ uint8_t* z88_32k_rom_device::get_cart_base() read -------------------------------------------------*/ -READ8_MEMBER(z88_32k_rom_device::read) +uint8_t z88_32k_rom_device::read(offs_t offset) { return m_rom[offset & (get_cart_size() - 1)]; } diff --git a/src/devices/bus/z88/rom.h b/src/devices/bus/z88/rom.h index 9508efbef14..41598dcb869 100644 --- a/src/devices/bus/z88/rom.h +++ b/src/devices/bus/z88/rom.h @@ -27,7 +27,7 @@ protected: virtual void device_start() override; // z88cart_interface overrides - virtual DECLARE_READ8_MEMBER(read) override; + virtual uint8_t read(offs_t offset) override; virtual uint8_t* get_cart_base() override; virtual uint32_t get_cart_size() override { return 0x8000; } diff --git a/src/devices/bus/z88/z88.cpp b/src/devices/bus/z88/z88.cpp index c65cc3d97a7..024c960a9b7 100644 --- a/src/devices/bus/z88/z88.cpp +++ b/src/devices/bus/z88/z88.cpp @@ -170,10 +170,10 @@ std::string z88cart_slot_device::get_default_card_software(get_default_card_soft read -------------------------------------------------*/ -READ8_MEMBER(z88cart_slot_device::read) +uint8_t z88cart_slot_device::read(offs_t offset) { if (m_cart) - return m_cart->read(space, offset); + return m_cart->read(offset); else return 0xff; } @@ -183,10 +183,10 @@ READ8_MEMBER(z88cart_slot_device::read) write -------------------------------------------------*/ -WRITE8_MEMBER(z88cart_slot_device::write) +void z88cart_slot_device::write(offs_t offset, uint8_t data) { if (m_cart) - m_cart->write(space, offset, data); + m_cart->write(offset, data); } diff --git a/src/devices/bus/z88/z88.h b/src/devices/bus/z88/z88.h index 923765517b0..15207ff66df 100644 --- a/src/devices/bus/z88/z88.h +++ b/src/devices/bus/z88/z88.h @@ -72,8 +72,8 @@ public: virtual ~device_z88cart_interface(); // reading and writing - virtual DECLARE_READ8_MEMBER(read) { return 0xff; } - virtual DECLARE_WRITE8_MEMBER(write) { } + virtual uint8_t read(offs_t offset) { return 0xff; } + virtual void write(offs_t offset, uint8_t data) { } virtual uint8_t* get_cart_base() { return nullptr; } virtual uint32_t get_cart_size() { return 0; } @@ -120,9 +120,9 @@ public: virtual std::string get_default_card_software(get_default_card_software_hook &hook) const override; // reading and writing - virtual DECLARE_READ8_MEMBER(read); - virtual DECLARE_WRITE8_MEMBER(write); - virtual uint8_t* get_cart_base(); + uint8_t read(offs_t offset); + void write(offs_t offset, uint8_t data); + uint8_t* get_cart_base(); protected: // device-level overrides diff --git a/src/mame/drivers/a7800.cpp b/src/mame/drivers/a7800.cpp index 5d100dac5e6..2db5ebc4376 100644 --- a/src/mame/drivers/a7800.cpp +++ b/src/mame/drivers/a7800.cpp @@ -133,7 +133,7 @@ public: void a7800_ntsc(machine_config &config); protected: - uint8_t bios_or_cart_r(address_space &space, offs_t offset); + uint8_t bios_or_cart_r(offs_t offset); uint8_t tia_r(offs_t offset); void tia_w(offs_t offset, uint8_t data); void a7800_palette(palette_device &palette) const; @@ -288,12 +288,12 @@ TIMER_CALLBACK_MEMBER(a7800_state::maria_startdma) // ROM -uint8_t a7800_state::bios_or_cart_r(address_space &space, offs_t offset) +uint8_t a7800_state::bios_or_cart_r(offs_t offset) { if (!(m_ctrl_reg & 0x04)) return m_bios[offset]; else - return m_cart->read_40xx(space, offset + 0x8000); + return m_cart->read_40xx(offset + 0x8000); } /*************************************************************************** @@ -1343,8 +1343,8 @@ void a7800_state::machine_start() { case A78_HSC: // ROM+NVRAM accesses for HiScore - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x1000, 0x17ff, read8_delegate(*m_cart, FUNC(a78_cart_slot_device::read_10xx)), write8_delegate(*m_cart, FUNC(a78_cart_slot_device::write_10xx))); - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x3000, 0x3fff, read8_delegate(*m_cart, FUNC(a78_cart_slot_device::read_30xx)), write8_delegate(*m_cart, FUNC(a78_cart_slot_device::write_30xx))); + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x1000, 0x17ff, read8sm_delegate(*m_cart, FUNC(a78_cart_slot_device::read_10xx)), write8sm_delegate(*m_cart, FUNC(a78_cart_slot_device::write_10xx))); + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x3000, 0x3fff, read8sm_delegate(*m_cart, FUNC(a78_cart_slot_device::read_30xx)), write8sm_delegate(*m_cart, FUNC(a78_cart_slot_device::write_30xx))); break; case A78_XB_BOARD: case A78_TYPE0_POK450: @@ -1353,14 +1353,14 @@ void a7800_state::machine_start() case A78_TYPEA_POK450: case A78_VERSA_POK450: // POKEY and RAM regs at 0x400-0x47f - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x0400, 0x047f, read8_delegate(*m_cart, FUNC(a78_cart_slot_device::read_04xx)), write8_delegate(*m_cart, FUNC(a78_cart_slot_device::write_04xx))); + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x0400, 0x047f, read8sm_delegate(*m_cart, FUNC(a78_cart_slot_device::read_04xx)), write8sm_delegate(*m_cart, FUNC(a78_cart_slot_device::write_04xx))); break; case A78_XM_BOARD: // POKEY and RAM and YM regs at 0x400-0x47f - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x0400, 0x047f, read8_delegate(*m_cart, FUNC(a78_cart_slot_device::read_04xx)), write8_delegate(*m_cart, FUNC(a78_cart_slot_device::write_04xx))); + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x0400, 0x047f, read8sm_delegate(*m_cart, FUNC(a78_cart_slot_device::read_04xx)), write8sm_delegate(*m_cart, FUNC(a78_cart_slot_device::write_04xx))); // ROM+NVRAM accesses for HiScore - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x1000, 0x17ff, read8_delegate(*m_cart, FUNC(a78_cart_slot_device::read_10xx)), write8_delegate(*m_cart, FUNC(a78_cart_slot_device::write_10xx))); - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x3000, 0x3fff, read8_delegate(*m_cart, FUNC(a78_cart_slot_device::read_30xx)), write8_delegate(*m_cart, FUNC(a78_cart_slot_device::write_30xx))); + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x1000, 0x17ff, read8sm_delegate(*m_cart, FUNC(a78_cart_slot_device::read_10xx)), write8sm_delegate(*m_cart, FUNC(a78_cart_slot_device::write_10xx))); + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x3000, 0x3fff, read8sm_delegate(*m_cart, FUNC(a78_cart_slot_device::read_30xx)), write8sm_delegate(*m_cart, FUNC(a78_cart_slot_device::write_30xx))); break; } } diff --git a/src/mame/drivers/abc80.cpp b/src/mame/drivers/abc80.cpp index 028f9e1e142..c63a7c329d2 100644 --- a/src/mame/drivers/abc80.cpp +++ b/src/mame/drivers/abc80.cpp @@ -103,14 +103,14 @@ ROM checksum program: // read - //------------------------------------------------- -READ8_MEMBER( abc80_state::read ) +u8 abc80_state::read(offs_t offset) { - uint8_t data = 0xff; - uint8_t mmu = m_mmu_rom->base()[0x40 | (offset >> 10)]; + u8 data = 0xff; + u8 mmu = m_mmu_rom->base()[0x40 | (offset >> 10)]; if (!(mmu & MMU_XM)) { - data = m_bus->xmemfl_r(space, offset); + data = m_bus->xmemfl_r(offset); } else if (!(mmu & MMU_ROM)) { @@ -133,13 +133,13 @@ READ8_MEMBER( abc80_state::read ) // write - //------------------------------------------------- -WRITE8_MEMBER( abc80_state::write ) +void abc80_state::write(offs_t offset, u8 data) { - uint8_t mmu = m_mmu_rom->base()[0x40 | (offset >> 10)]; + u8 mmu = m_mmu_rom->base()[0x40 | (offset >> 10)]; if (!(mmu & MMU_XM)) { - m_bus->xmemw_w(space, offset, data); + m_bus->xmemw_w(offset, data); } else if (mmu & MMU_VRAMS) { @@ -161,7 +161,7 @@ WRITE8_MEMBER( abc80_state::write ) // csg_w - //------------------------------------------------- -WRITE8_MEMBER( abc80_state::csg_w ) +void abc80_state::csg_w(u8 data) { m_csg->enable_w(!BIT(data, 0)); m_csg->vco_voltage_w(BIT(data, 1) ? 2.5 : 0); @@ -219,7 +219,7 @@ void abc80_state::abc80_io(address_map &map) // Z80PIO //------------------------------------------------- -uint8_t abc80_state::pio_pa_r() +u8 abc80_state::pio_pa_r() { /* @@ -238,7 +238,7 @@ uint8_t abc80_state::pio_pa_r() */ - uint8_t data = 0; + u8 data = 0; //data |= m_kb->data_r(); data |= m_key_data; @@ -247,7 +247,7 @@ uint8_t abc80_state::pio_pa_r() return data; } -uint8_t abc80_state::pio_pb_r() +u8 abc80_state::pio_pb_r() { /* @@ -264,7 +264,7 @@ uint8_t abc80_state::pio_pb_r() */ - uint8_t data = 0; + u8 data = 0; // receive data data |= m_rs232->rxd_r(); @@ -283,7 +283,7 @@ uint8_t abc80_state::pio_pb_r() return data; } -void abc80_state::pio_pb_w(uint8_t data) +void abc80_state::pio_pb_w(u8 data) { /* @@ -362,7 +362,7 @@ void abc80_state::kbd_w(u8 data) m_key_data = data; m_key_strobe = 1; - uint8_t pio_data = 0x80 | data; + u8 pio_data = 0x80 | data; m_pio->port_a_write(pio_data); timer_set(attotime::from_msec(50), TIMER_ID_FAKE_KEYBOARD_CLEAR); @@ -462,7 +462,7 @@ QUICKLOAD_LOAD_MEMBER(abc80_state::quickload_cb) offs_t address = space.read_byte(BOFA + 1) << 8 | space.read_byte(BOFA); if (LOG) logerror("BOFA %04x\n",address); - std::vector data; + std::vector data; data.resize(quickload_size); image.fread(&data[0], quickload_size); for (int i = 1; i < quickload_size; i++) diff --git a/src/mame/drivers/abc80x.cpp b/src/mame/drivers/abc80x.cpp index f65d5fa39b4..dcac4e7164b 100644 --- a/src/mame/drivers/abc80x.cpp +++ b/src/mame/drivers/abc80x.cpp @@ -174,10 +174,13 @@ DISCRETE_SOUND_END // pling_r - speaker read //------------------------------------------------- -READ8_MEMBER( abc800_state::pling_r ) +uint8_t abc800_state::pling_r() { - m_discrete->write(NODE_01, 0); - m_discrete->write(NODE_01, 1); + if (!machine().side_effects_disabled()) + { + m_discrete->write(NODE_01, 0); + m_discrete->write(NODE_01, 1); + } return 0xff; } @@ -188,7 +191,7 @@ READ8_MEMBER( abc800_state::pling_r ) // MEMORY BANKING //************************************************************************** -READ8_MEMBER( abc800_state::read ) +uint8_t abc800_state::read(offs_t offset) { uint8_t data = 0xff; @@ -216,7 +219,7 @@ READ8_MEMBER( abc800_state::read ) return data; } -WRITE8_MEMBER( abc800_state::write ) +void abc800_state::write(offs_t offset, uint8_t data) { if (offset < 0x4000 && (!m_keydtr || m_fetch_charram)) { @@ -232,7 +235,7 @@ WRITE8_MEMBER( abc800_state::write ) } } -READ8_MEMBER( abc802_state::read ) +uint8_t abc802_state::read(offs_t offset) { uint8_t data = 0xff; @@ -269,7 +272,7 @@ READ8_MEMBER( abc802_state::read ) return data; } -WRITE8_MEMBER( abc802_state::write ) +void abc802_state::write(offs_t offset, uint8_t data) { if (offset < 0x8000) { @@ -344,7 +347,7 @@ void abc806_state::read_pal_p4(offs_t offset, bool m1l, bool xml, offs_t &m, boo m = (mux ? ((map & 0x7f) << 12 | (offset & 0xfff)) : ((m_hrs & 0xf0) << 11 | (offset & 0x7fff))) & videoram_mask; } -READ8_MEMBER( abc806_state::read ) +uint8_t abc806_state::read(offs_t offset) { uint8_t data = 0xff; @@ -369,13 +372,13 @@ READ8_MEMBER( abc806_state::read ) if (!vr) { - data = charram_r(space, offset & 0x7ff); + data = charram_r(offset & 0x7ff); } return data; } -READ8_MEMBER( abc806_state::m1_r ) +uint8_t abc806_state::m1_r(offs_t offset) { uint8_t data = 0xff; @@ -400,13 +403,13 @@ READ8_MEMBER( abc806_state::m1_r ) if (!vr) { - data = charram_r(space, offset & 0x7ff); + data = charram_r(offset & 0x7ff); } return data; } -WRITE8_MEMBER( abc806_state::write ) +void abc806_state::write(offs_t offset, uint8_t data) { offs_t m = 0; bool m1l = 1, xml = 1, romd = 0, ramd = 0, hre = 0, vr = 1; @@ -424,7 +427,7 @@ WRITE8_MEMBER( abc806_state::write ) if (!vr) { - charram_w(space, offset & 0x7ff, data); + charram_w(offset & 0x7ff, data); } } @@ -433,7 +436,7 @@ WRITE8_MEMBER( abc806_state::write ) // m1_r - opcode read //------------------------------------------------- -READ8_MEMBER( abc800_state::m1_r ) +uint8_t abc800_state::m1_r(offs_t offset) { if (offset >= 0x7800 && offset < 0x8000) { @@ -452,7 +455,7 @@ READ8_MEMBER( abc800_state::m1_r ) // mai_r - memory bank map read //------------------------------------------------- -READ8_MEMBER( abc806_state::mai_r ) +uint8_t abc806_state::mai_r(offs_t offset) { int bank = offset >> 12; @@ -464,7 +467,7 @@ READ8_MEMBER( abc806_state::mai_r ) // mao_w - memory bank map write //------------------------------------------------- -WRITE8_MEMBER( abc806_state::mao_w ) +void abc806_state::mao_w(offs_t offset, uint8_t data) { /* diff --git a/src/mame/drivers/apf.cpp b/src/mame/drivers/apf.cpp index 2799abb6ec2..1216e071935 100644 --- a/src/mame/drivers/apf.cpp +++ b/src/mame/drivers/apf.cpp @@ -252,11 +252,11 @@ void apf_state::machine_start() switch (m_cart->get_type()) { case APF_BASIC: - m_maincpu->space(AS_PROGRAM).install_read_handler(0x6800, 0x7fff, read8_delegate(*m_cart, FUNC(apf_cart_slot_device::extra_rom))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x6800, 0x7fff, read8sm_delegate(*m_cart, FUNC(apf_cart_slot_device::extra_rom))); break; case APF_SPACEDST: m_maincpu->space(AS_PROGRAM).unmap_readwrite(0x9800, 0x9fff); - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x9800, 0x9bff, read8_delegate(*m_cart, FUNC(apf_cart_slot_device::read_ram)), write8_delegate(*m_cart, FUNC(apf_cart_slot_device::write_ram))); + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x9800, 0x9bff, read8sm_delegate(*m_cart, FUNC(apf_cart_slot_device::read_ram)), write8sm_delegate(*m_cart, FUNC(apf_cart_slot_device::write_ram))); m_has_cart_ram = true; break; } diff --git a/src/mame/drivers/arcadia.cpp b/src/mame/drivers/arcadia.cpp index dc36f5307d1..157438a3e3e 100644 --- a/src/mame/drivers/arcadia.cpp +++ b/src/mame/drivers/arcadia.cpp @@ -455,10 +455,10 @@ void arcadia_state::machine_start() switch (m_cart->get_type()) { case ARCADIA_STD: - m_maincpu->space(AS_PROGRAM).install_read_handler(0x2000, 0x7fff, read8_delegate(*m_cart, FUNC(arcadia_cart_slot_device::extra_rom))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x2000, 0x7fff, read8sm_delegate(*m_cart, FUNC(arcadia_cart_slot_device::extra_rom))); break; case ARCADIA_GOLF: - m_maincpu->space(AS_PROGRAM).install_read_handler(0x4000, 0x4fff, read8_delegate(*m_cart, FUNC(arcadia_cart_slot_device::extra_rom))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x4000, 0x4fff, read8sm_delegate(*m_cart, FUNC(arcadia_cart_slot_device::extra_rom))); break; } } diff --git a/src/mame/drivers/astrohome.cpp b/src/mame/drivers/astrohome.cpp index 931510dffdf..b9d05c6f639 100644 --- a/src/mame/drivers/astrohome.cpp +++ b/src/mame/drivers/astrohome.cpp @@ -264,14 +264,14 @@ void astrocde_state::init_astrocde() MACHINE_START_MEMBER(astrocde_home_state, astrocde) { if (m_cart->exists()) - m_maincpu->space(AS_PROGRAM).install_read_handler(0x2000, 0x3fff, read8_delegate(*m_cart, FUNC(astrocade_cart_slot_device::read_rom))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x2000, 0x3fff, read8sm_delegate(*m_cart, FUNC(astrocade_cart_slot_device::read_rom))); // if no RAM is mounted and the handlers are installed, the system starts with garbage on screen and a RESET is necessary // thus, install RAM only if an expansion is mounted if (m_exp->get_card_mounted()) { - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x5000, 0xffff, read8_delegate(*m_exp, FUNC(astrocade_exp_device::read)), write8_delegate(*m_exp, FUNC(astrocade_exp_device::write))); - m_maincpu->space(AS_IO).install_readwrite_handler(0x0080, 0x00ff, 0x0000, 0x0000, 0xff00, read8_delegate(*m_exp, FUNC(astrocade_exp_device::read_io)), write8_delegate(*m_exp, FUNC(astrocade_exp_device::write_io))); + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x5000, 0xffff, read8sm_delegate(*m_exp, FUNC(astrocade_exp_device::read)), write8sm_delegate(*m_exp, FUNC(astrocade_exp_device::write))); + m_maincpu->space(AS_IO).install_readwrite_handler(0x0080, 0x00ff, 0x0000, 0x0000, 0xff00, read8sm_delegate(*m_exp, FUNC(astrocade_exp_device::read_io)), write8sm_delegate(*m_exp, FUNC(astrocade_exp_device::write_io))); } } diff --git a/src/mame/drivers/atari400.cpp b/src/mame/drivers/atari400.cpp index b87e7ab7a47..daa194c4cc1 100644 --- a/src/mame/drivers/atari400.cpp +++ b/src/mame/drivers/atari400.cpp @@ -290,27 +290,27 @@ private: void a600xl_pia_pb_w(uint8_t data); void a800xl_pia_pb_w(uint8_t data); - DECLARE_READ8_MEMBER(read_d5xx); // at least one cart type can enable/disable roms when reading - DECLARE_WRITE8_MEMBER(disable_cart); + uint8_t read_d5xx(offs_t offset); // at least one cart type can enable/disable roms when reading + void disable_cart(offs_t offset, uint8_t data); // these are needed to handle carts which can disable ROM without // installing/disinstalling continuously RAM and ROM (with e.g. big // performance hit in Williams carts) - DECLARE_READ8_MEMBER(special_read_8000); - DECLARE_WRITE8_MEMBER(special_write_8000); - DECLARE_READ8_MEMBER(special_read_a000); - DECLARE_WRITE8_MEMBER(special_write_a000); - - DECLARE_READ8_MEMBER(a600xl_low_r); - DECLARE_READ8_MEMBER(a1200xl_low_r); - DECLARE_READ8_MEMBER(a800xl_low_r); - DECLARE_WRITE8_MEMBER(a800xl_low_w); - DECLARE_READ8_MEMBER(a800xl_high_r); - DECLARE_WRITE8_MEMBER(a800xl_high_w); - DECLARE_READ8_MEMBER(a130xe_low_r); - DECLARE_WRITE8_MEMBER(a130xe_low_w); - DECLARE_READ8_MEMBER(xegs_low_r); - DECLARE_WRITE8_MEMBER(xegs_low_w); + uint8_t special_read_8000(offs_t offset); + void special_write_8000(offs_t offset, uint8_t data); + uint8_t special_read_a000(offs_t offset); + void special_write_a000(offs_t offset, uint8_t data); + + uint8_t a600xl_low_r(offs_t offset); + uint8_t a1200xl_low_r(offs_t offset); + uint8_t a800xl_low_r(offs_t offset); + void a800xl_low_w(offs_t offset, uint8_t data); + uint8_t a800xl_high_r(offs_t offset); + void a800xl_high_w(offs_t offset, uint8_t data); + uint8_t a130xe_low_r(offs_t offset); + void a130xe_low_w(offs_t offset, uint8_t data); + uint8_t xegs_low_r(offs_t offset); + void xegs_low_w(offs_t offset, uint8_t data); TIMER_DEVICE_CALLBACK_MEMBER(a400_interrupt); TIMER_DEVICE_CALLBACK_MEMBER(a800xl_interrupt); @@ -351,7 +351,7 @@ private: * **************************************************************/ -READ8_MEMBER(a400_state::a600xl_low_r) +uint8_t a400_state::a600xl_low_r(offs_t offset) { if (m_mmu & 0x80) return 0xff; @@ -360,7 +360,7 @@ READ8_MEMBER(a400_state::a600xl_low_r) } -READ8_MEMBER(a400_state::a1200xl_low_r) +uint8_t a400_state::a1200xl_low_r(offs_t offset) { if (offset < 0x5000) // 0x0000-0x4fff return m_ram->pointer()[offset]; @@ -382,7 +382,7 @@ READ8_MEMBER(a400_state::a1200xl_low_r) } } -READ8_MEMBER(a400_state::a800xl_low_r) +uint8_t a400_state::a800xl_low_r(offs_t offset) { if (offset < 0x5000) // 0x0000-0x4fff return m_ram->pointer()[offset]; @@ -411,7 +411,7 @@ READ8_MEMBER(a400_state::a800xl_low_r) } } -WRITE8_MEMBER(a400_state::a800xl_low_w) +void a400_state::a800xl_low_w(offs_t offset, uint8_t data) { if (offset < 0x5000) // 0x0000-0x4fff m_ram->pointer()[offset] = data; @@ -434,7 +434,7 @@ WRITE8_MEMBER(a400_state::a800xl_low_w) } } -READ8_MEMBER(a400_state::a800xl_high_r) +uint8_t a400_state::a800xl_high_r(offs_t offset) { if (m_mmu & 0x01) return m_region_maincpu->base()[0xd800 + offset]; @@ -442,13 +442,13 @@ READ8_MEMBER(a400_state::a800xl_high_r) return m_ram->pointer()[0xd800 + offset]; } -WRITE8_MEMBER(a400_state::a800xl_high_w) +void a400_state::a800xl_high_w(offs_t offset, uint8_t data) { if (!(m_mmu & 0x01)) m_ram->pointer()[0xd800 + offset] = data; } -READ8_MEMBER(a400_state::a130xe_low_r) +uint8_t a400_state::a130xe_low_r(offs_t offset) { if (offset < 0x4000) // 0x0000-0x3fff return m_ram->pointer()[offset]; @@ -480,7 +480,7 @@ READ8_MEMBER(a400_state::a130xe_low_r) } } -WRITE8_MEMBER(a400_state::a130xe_low_w) +void a400_state::a130xe_low_w(offs_t offset, uint8_t data) { if (offset < 0x4000) // 0x0000-0x3fff m_ram->pointer()[offset] = data; @@ -508,7 +508,7 @@ WRITE8_MEMBER(a400_state::a130xe_low_w) } } -READ8_MEMBER(a400_state::xegs_low_r) +uint8_t a400_state::xegs_low_r(offs_t offset) { if (offset < 0x5000) // 0x0000-0x4fff return m_ram->pointer()[offset]; @@ -534,7 +534,7 @@ READ8_MEMBER(a400_state::xegs_low_r) } } -WRITE8_MEMBER(a400_state::xegs_low_w) +void a400_state::xegs_low_w(offs_t offset, uint8_t data) { if (offset < 0x5000) // 0x0000-0x4fff m_ram->pointer()[offset] = data; @@ -1775,10 +1775,10 @@ void a400_state::setup_ram(int bank, uint32_t size) // these handle cart enable/disable without calling setup_ram thousands of times -READ8_MEMBER(a400_state::special_read_8000) +uint8_t a400_state::special_read_8000(offs_t offset) { if (!m_cart_disabled) - return m_cart->read_80xx(space, offset); + return m_cart->read_80xx(offset); else { offset += 0x8000; @@ -1789,7 +1789,7 @@ READ8_MEMBER(a400_state::special_read_8000) } } -WRITE8_MEMBER(a400_state::special_write_8000) +void a400_state::special_write_8000(offs_t offset, uint8_t data) { if (m_cart_disabled) { @@ -1799,10 +1799,10 @@ WRITE8_MEMBER(a400_state::special_write_8000) } } -READ8_MEMBER(a400_state::special_read_a000) +uint8_t a400_state::special_read_a000(offs_t offset) { if (!m_cart_disabled) - return m_cart->read_80xx(space, offset); + return m_cart->read_80xx(offset); else { offset += 0xa000; @@ -1813,7 +1813,7 @@ READ8_MEMBER(a400_state::special_read_a000) } } -WRITE8_MEMBER(a400_state::special_write_a000) +void a400_state::special_write_a000(offs_t offset, uint8_t data) { if (m_cart_disabled) { @@ -1824,13 +1824,14 @@ WRITE8_MEMBER(a400_state::special_write_a000) } -READ8_MEMBER(a400_state::read_d5xx) +uint8_t a400_state::read_d5xx(offs_t offset) { - disable_cart(space, offset, 0); + if (!machine().side_effects_disabled()) + disable_cart(offset, 0); return 0xff; } -WRITE8_MEMBER(a400_state::disable_cart) +void a400_state::disable_cart(offs_t offset, uint8_t data) { if (m_cart->exists()) { @@ -1859,7 +1860,7 @@ WRITE8_MEMBER(a400_state::disable_cart) { // we enter here only if we are writing to a different offset than last time m_last_offs = offset & 0x7; - m_cart->write_d5xx(space, offset, data); + m_cart->write_d5xx(offset, data); } } break; @@ -1876,13 +1877,13 @@ WRITE8_MEMBER(a400_state::disable_cart) { // we enter here only if we are writing to a different offset than last time m_last_offs = offset & 0x0f; - m_cart->write_d5xx(space, offset & 0x0f, data); + m_cart->write_d5xx(offset & 0x0f, data); } } break; case A800_SPARTADOS: // writes with offset & 8 are also used to enable/disable the subcart, so they go through! - m_cart->write_d5xx(space, offset, data); + m_cart->write_d5xx(offset, data); break; case A800_OSSM091: case A800_OSS8K: @@ -1891,7 +1892,7 @@ WRITE8_MEMBER(a400_state::disable_cart) else { m_cart_disabled = 0; - m_cart->write_d5xx(space, offset, data); + m_cart->write_d5xx(offset, data); } break; case A800_MICROCALC: @@ -1901,7 +1902,7 @@ WRITE8_MEMBER(a400_state::disable_cart) else { m_cart_disabled = 0; - m_cart->write_d5xx(space, offset, m_cart_helper); + m_cart->write_d5xx(offset, m_cart_helper); } break; default: @@ -1920,20 +1921,20 @@ void a400_state::setup_cart(a800_cart_slot_device *slot) switch (slot->get_cart_type()) { case A800_8K: - m_maincpu->space(AS_PROGRAM).install_read_handler(0xa000, 0xbfff, read8_delegate(*slot, FUNC(a800_cart_slot_device::read_80xx))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0xa000, 0xbfff, read8sm_delegate(*slot, FUNC(a800_cart_slot_device::read_80xx))); m_maincpu->space(AS_PROGRAM).unmap_write(0xa000, 0xbfff); break; case A800_8K_RIGHT: - m_maincpu->space(AS_PROGRAM).install_read_handler(0x8000, 0x9fff, read8_delegate(*slot, FUNC(a800_cart_slot_device::read_80xx))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x8000, 0x9fff, read8sm_delegate(*slot, FUNC(a800_cart_slot_device::read_80xx))); m_maincpu->space(AS_PROGRAM).unmap_write(0x8000, 0x9fff); break; case A800_16K: - m_maincpu->space(AS_PROGRAM).install_read_handler(0x8000, 0xbfff, read8_delegate(*slot, FUNC(a800_cart_slot_device::read_80xx))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x8000, 0xbfff, read8sm_delegate(*slot, FUNC(a800_cart_slot_device::read_80xx))); m_maincpu->space(AS_PROGRAM).unmap_write(0x8000, 0xbfff); break; case A800_BBSB: - m_maincpu->space(AS_PROGRAM).install_read_handler(0x8000, 0xbfff, read8_delegate(*slot, FUNC(a800_cart_slot_device::read_80xx))); - m_maincpu->space(AS_PROGRAM).install_write_handler(0x8000, 0x9fff, write8_delegate(*slot, FUNC(a800_cart_slot_device::write_80xx))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x8000, 0xbfff, read8sm_delegate(*slot, FUNC(a800_cart_slot_device::read_80xx))); + m_maincpu->space(AS_PROGRAM).install_write_handler(0x8000, 0x9fff, write8sm_delegate(*slot, FUNC(a800_cart_slot_device::write_80xx))); m_maincpu->space(AS_PROGRAM).unmap_write(0xa000, 0xbfff); break; case A800_OSS034M: @@ -1943,57 +1944,57 @@ void a400_state::setup_cart(a800_cart_slot_device *slot) case A800_TURBO64: case A800_TURBO128: case A800_PHOENIX: - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xa000, 0xbfff, read8_delegate(*this, FUNC(a400_state::special_read_a000)), write8_delegate(*this, FUNC(a400_state::special_write_a000))); - m_maincpu->space(AS_PROGRAM).install_write_handler(0xd500, 0xd5ff, write8_delegate(*this, FUNC(a400_state::disable_cart))); + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xa000, 0xbfff, read8sm_delegate(*this, FUNC(a400_state::special_read_a000)), write8sm_delegate(*this, FUNC(a400_state::special_write_a000))); + m_maincpu->space(AS_PROGRAM).install_write_handler(0xd500, 0xd5ff, write8sm_delegate(*this, FUNC(a400_state::disable_cart))); break; case A800_EXPRESS: - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xa000, 0xbfff, read8_delegate(*this, FUNC(a400_state::special_read_a000)), write8_delegate(*this, FUNC(a400_state::special_write_a000))); - m_maincpu->space(AS_PROGRAM).install_write_handler(0xd570, 0xd57f, write8_delegate(*this, FUNC(a400_state::disable_cart))); + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xa000, 0xbfff, read8sm_delegate(*this, FUNC(a400_state::special_read_a000)), write8sm_delegate(*this, FUNC(a400_state::special_write_a000))); + m_maincpu->space(AS_PROGRAM).install_write_handler(0xd570, 0xd57f, write8sm_delegate(*this, FUNC(a400_state::disable_cart))); break; case A800_DIAMOND: - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xa000, 0xbfff, read8_delegate(*this, FUNC(a400_state::special_read_a000)), write8_delegate(*this, FUNC(a400_state::special_write_a000))); - m_maincpu->space(AS_PROGRAM).install_write_handler(0xd5d0, 0xd5df, write8_delegate(*this, FUNC(a400_state::disable_cart))); + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xa000, 0xbfff, read8sm_delegate(*this, FUNC(a400_state::special_read_a000)), write8sm_delegate(*this, FUNC(a400_state::special_write_a000))); + m_maincpu->space(AS_PROGRAM).install_write_handler(0xd5d0, 0xd5df, write8sm_delegate(*this, FUNC(a400_state::disable_cart))); break; case A800_WILLIAMS: - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xa000, 0xbfff, read8_delegate(*this, FUNC(a400_state::special_read_a000)), write8_delegate(*this, FUNC(a400_state::special_write_a000))); - m_maincpu->space(AS_PROGRAM).install_write_handler(0xd500, 0xd50f, write8_delegate(*this, FUNC(a400_state::disable_cart))); + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xa000, 0xbfff, read8sm_delegate(*this, FUNC(a400_state::special_read_a000)), write8sm_delegate(*this, FUNC(a400_state::special_write_a000))); + m_maincpu->space(AS_PROGRAM).install_write_handler(0xd500, 0xd50f, write8sm_delegate(*this, FUNC(a400_state::disable_cart))); break; case A800_SPARTADOS: - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xa000, 0xbfff, read8_delegate(*this, FUNC(a400_state::special_read_a000)), write8_delegate(*this, FUNC(a400_state::special_write_a000))); - m_maincpu->space(AS_PROGRAM).install_write_handler(0xd5e0, 0xd5ef, write8_delegate(*this, FUNC(a400_state::disable_cart))); + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xa000, 0xbfff, read8sm_delegate(*this, FUNC(a400_state::special_read_a000)), write8sm_delegate(*this, FUNC(a400_state::special_write_a000))); + m_maincpu->space(AS_PROGRAM).install_write_handler(0xd5e0, 0xd5ef, write8sm_delegate(*this, FUNC(a400_state::disable_cart))); break; case A800_BLIZZARD: - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x8000, 0xbfff, read8_delegate(*this, FUNC(a400_state::special_read_8000)), write8_delegate(*this, FUNC(a400_state::special_write_8000))); - m_maincpu->space(AS_PROGRAM).install_write_handler(0xd500, 0xd5ff, write8_delegate(*this, FUNC(a400_state::disable_cart))); + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x8000, 0xbfff, read8sm_delegate(*this, FUNC(a400_state::special_read_8000)), write8sm_delegate(*this, FUNC(a400_state::special_write_8000))); + m_maincpu->space(AS_PROGRAM).install_write_handler(0xd500, 0xd5ff, write8sm_delegate(*this, FUNC(a400_state::disable_cart))); break; case A800_MICROCALC: // this can also disable ROM when reading in 0xd500-0xd5ff - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xa000, 0xbfff, read8_delegate(*this, FUNC(a400_state::special_read_a000)), write8_delegate(*this, FUNC(a400_state::special_write_a000))); - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xd500, 0xd5ff, read8_delegate(*this, FUNC(a400_state::read_d5xx)), write8_delegate(*this, FUNC(a400_state::disable_cart))); + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xa000, 0xbfff, read8sm_delegate(*this, FUNC(a400_state::special_read_a000)), write8sm_delegate(*this, FUNC(a400_state::special_write_a000))); + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xd500, 0xd5ff, read8sm_delegate(*this, FUNC(a400_state::read_d5xx)), write8sm_delegate(*this, FUNC(a400_state::disable_cart))); break; case A800_TELELINK2: - m_maincpu->space(AS_PROGRAM).install_read_handler(0x8000, 0xbfff, read8_delegate(*slot, FUNC(a800_cart_slot_device::read_80xx))); - m_maincpu->space(AS_PROGRAM).install_write_handler(0x9000, 0x90ff, write8_delegate(*slot, FUNC(a800_cart_slot_device::write_80xx))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x8000, 0xbfff, read8sm_delegate(*slot, FUNC(a800_cart_slot_device::read_80xx))); + m_maincpu->space(AS_PROGRAM).install_write_handler(0x9000, 0x90ff, write8sm_delegate(*slot, FUNC(a800_cart_slot_device::write_80xx))); m_maincpu->space(AS_PROGRAM).unmap_write(0xa000, 0xbfff); - m_maincpu->space(AS_PROGRAM).install_read_handler(0xd501, 0xd501, read8_delegate(*slot, FUNC(a800_cart_slot_device::read_d5xx))); - m_maincpu->space(AS_PROGRAM).install_write_handler(0xd502, 0xd502, write8_delegate(*slot, FUNC(a800_cart_slot_device::write_d5xx))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0xd501, 0xd501, read8sm_delegate(*slot, FUNC(a800_cart_slot_device::read_d5xx))); + m_maincpu->space(AS_PROGRAM).install_write_handler(0xd502, 0xd502, write8sm_delegate(*slot, FUNC(a800_cart_slot_device::write_d5xx))); break; case A800_XEGS: - m_maincpu->space(AS_PROGRAM).install_read_handler(0x8000, 0xbfff, read8_delegate(*slot, FUNC(a800_cart_slot_device::read_80xx))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x8000, 0xbfff, read8sm_delegate(*slot, FUNC(a800_cart_slot_device::read_80xx))); m_maincpu->space(AS_PROGRAM).unmap_write(0x8000, 0xbfff); - m_maincpu->space(AS_PROGRAM).install_write_handler(0xd500, 0xd5ff, write8_delegate(*slot, FUNC(a800_cart_slot_device::write_d5xx))); + m_maincpu->space(AS_PROGRAM).install_write_handler(0xd500, 0xd5ff, write8sm_delegate(*slot, FUNC(a800_cart_slot_device::write_d5xx))); break; case A5200_4K: case A5200_8K: case A5200_16K: case A5200_32K: case A5200_16K_2CHIPS: - m_maincpu->space(AS_PROGRAM).install_read_handler(0x4000, 0xbfff, read8_delegate(*slot, FUNC(a800_cart_slot_device::read_80xx))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x4000, 0xbfff, read8sm_delegate(*slot, FUNC(a800_cart_slot_device::read_80xx))); m_maincpu->space(AS_PROGRAM).unmap_write(0x4000, 0xbfff); break; case A5200_BBSB: - m_maincpu->space(AS_PROGRAM).install_read_handler(0x4000, 0xbfff, read8_delegate(*slot, FUNC(a800_cart_slot_device::read_80xx))); - m_maincpu->space(AS_PROGRAM).install_write_handler(0x4000, 0x5fff, write8_delegate(*slot, FUNC(a800_cart_slot_device::write_80xx))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x4000, 0xbfff, read8sm_delegate(*slot, FUNC(a800_cart_slot_device::read_80xx))); + m_maincpu->space(AS_PROGRAM).install_write_handler(0x4000, 0x5fff, write8sm_delegate(*slot, FUNC(a800_cart_slot_device::write_80xx))); m_maincpu->space(AS_PROGRAM).unmap_write(0x6000, 0xbfff); break; } diff --git a/src/mame/drivers/channelf.cpp b/src/mame/drivers/channelf.cpp index 09979a0782c..361f07323b8 100644 --- a/src/mame/drivers/channelf.cpp +++ b/src/mame/drivers/channelf.cpp @@ -168,18 +168,18 @@ void channelf_state::machine_start() switch (m_cart->get_type()) { case CF_MAZE: - m_maincpu->space(AS_IO).install_readwrite_handler(0x24, 0x25, read8_delegate(*m_cart, FUNC(channelf_cart_slot_device::read_ram)), write8_delegate(*m_cart, FUNC(channelf_cart_slot_device::write_ram))); + m_maincpu->space(AS_IO).install_readwrite_handler(0x24, 0x25, read8sm_delegate(*m_cart, FUNC(channelf_cart_slot_device::read_ram)), write8sm_delegate(*m_cart, FUNC(channelf_cart_slot_device::write_ram))); break; case CF_HANGMAN: - m_maincpu->space(AS_IO).install_readwrite_handler(0x20, 0x21, read8_delegate(*m_cart, FUNC(channelf_cart_slot_device::read_ram)), write8_delegate(*m_cart, FUNC(channelf_cart_slot_device::write_ram))); + m_maincpu->space(AS_IO).install_readwrite_handler(0x20, 0x21, read8sm_delegate(*m_cart, FUNC(channelf_cart_slot_device::read_ram)), write8sm_delegate(*m_cart, FUNC(channelf_cart_slot_device::write_ram))); break; case CF_CHESS: - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x2800, 0x2fff, read8_delegate(*m_cart, FUNC(channelf_cart_slot_device::read_ram)), write8_delegate(*m_cart, FUNC(channelf_cart_slot_device::write_ram))); + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x2800, 0x2fff, read8sm_delegate(*m_cart, FUNC(channelf_cart_slot_device::read_ram)), write8sm_delegate(*m_cart, FUNC(channelf_cart_slot_device::write_ram))); break; case CF_MULTI: case CF_MULTI_OLD: - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x2800, 0x2fff, read8_delegate(*m_cart, FUNC(channelf_cart_slot_device::read_ram)), write8_delegate(*m_cart, FUNC(channelf_cart_slot_device::write_ram))); - m_maincpu->space(AS_PROGRAM).install_write_handler(0x3000, 0x3fff, write8_delegate(*m_cart, FUNC(channelf_cart_slot_device::write_bank))); + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x2800, 0x2fff, read8sm_delegate(*m_cart, FUNC(channelf_cart_slot_device::read_ram)), write8sm_delegate(*m_cart, FUNC(channelf_cart_slot_device::write_ram))); + m_maincpu->space(AS_PROGRAM).install_write_handler(0x3000, 0x3fff, write8smo_delegate(*m_cart, FUNC(channelf_cart_slot_device::write_bank))); break; } diff --git a/src/mame/drivers/crvision.cpp b/src/mame/drivers/crvision.cpp index a04a3e28829..966e5ca6a94 100644 --- a/src/mame/drivers/crvision.cpp +++ b/src/mame/drivers/crvision.cpp @@ -694,8 +694,8 @@ void crvision_state::machine_start() if (m_cart->exists()) { - m_maincpu->space(AS_PROGRAM).install_read_handler(0x4000, 0x7fff, read8_delegate(*m_cart, FUNC(crvision_cart_slot_device::read_rom40))); - m_maincpu->space(AS_PROGRAM).install_read_handler(0x8000, 0xbfff, read8_delegate(*m_cart, FUNC(crvision_cart_slot_device::read_rom80))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x4000, 0x7fff, read8sm_delegate(*m_cart, FUNC(crvision_cart_slot_device::read_rom40))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x8000, 0xbfff, read8sm_delegate(*m_cart, FUNC(crvision_cart_slot_device::read_rom80))); } } diff --git a/src/mame/drivers/gamate.cpp b/src/mame/drivers/gamate.cpp index 3e2bc074f89..99757a68833 100644 --- a/src/mame/drivers/gamate.cpp +++ b/src/mame/drivers/gamate.cpp @@ -38,15 +38,15 @@ public: void init_gamate(); private: - DECLARE_READ8_MEMBER(card_available_check); - DECLARE_READ8_MEMBER(card_available_set); - DECLARE_WRITE8_MEMBER(card_reset); + uint8_t card_available_check(); + uint8_t card_available_set(); + void card_reset(uint8_t data); - DECLARE_READ8_MEMBER(gamate_nmi_r); - DECLARE_WRITE8_MEMBER(sound_w); - DECLARE_READ8_MEMBER(sound_r); - DECLARE_WRITE8_MEMBER(write_cart); - DECLARE_READ8_MEMBER(read_cart); + uint8_t gamate_nmi_r(); + void sound_w(offs_t offset, uint8_t data); + uint8_t sound_r(offs_t offset); + void write_cart(offs_t offset, uint8_t data); + uint8_t read_cart(offs_t offset); TIMER_CALLBACK_MEMBER(gamate_timer); TIMER_CALLBACK_MEMBER(gamate_timer2); @@ -69,51 +69,52 @@ private: }; /* todo: what are these really, do they go to the cartridge slot? */ -READ8_MEMBER( gamate_state::card_available_check ) +uint8_t gamate_state::card_available_check() { // bits 0 and 1 checked return m_card_available ? 3: 1; } -WRITE8_MEMBER( gamate_state::card_reset ) +void gamate_state::card_reset(uint8_t data) { // might reset the card / protection? } -READ8_MEMBER( gamate_state::card_available_set ) +uint8_t gamate_state::card_available_set() { - m_card_available = 1; + if (!machine().side_effects_disabled()) + m_card_available = 1; return 0; } // serial connection -READ8_MEMBER( gamate_state::gamate_nmi_r ) +uint8_t gamate_state::gamate_nmi_r() { uint8_t data=0; logerror("nmi/4800 read\n"); return data; } -READ8_MEMBER(gamate_state::sound_r) +uint8_t gamate_state::sound_r(offs_t offset) { m_ay->address_w(offset); return m_ay->data_r(); } -WRITE8_MEMBER(gamate_state::sound_w) +void gamate_state::sound_w(offs_t offset, uint8_t data) { m_ay->address_w(offset); m_ay->data_w(data); } -WRITE8_MEMBER(gamate_state::write_cart) +void gamate_state::write_cart(offs_t offset, uint8_t data) { - m_cartslot->write_cart(space, offset, data); + m_cartslot->write_cart(offset, data); } -READ8_MEMBER(gamate_state::read_cart) +uint8_t gamate_state::read_cart(offs_t offset) { - return m_cartslot->read_cart(space, offset); + return m_cartslot->read_cart(offset); } void gamate_state::gamate_mem(address_map &map) diff --git a/src/mame/drivers/m5.cpp b/src/mame/drivers/m5.cpp index f48110198a2..4555c4e5dc9 100644 --- a/src/mame/drivers/m5.cpp +++ b/src/mame/drivers/m5.cpp @@ -519,7 +519,7 @@ WRITE8_MEMBER( m5_state::mem64KBI_w ) //out 0x6c //if AUTOSTART is on don't load any ROM cart if (m_cart && (m_DIPS->read() & 2) != 2) { - program.install_read_handler(0x2000, 0x6fff, read8_delegate(*m_cart, FUNC(m5_cart_slot_device::read_rom))); //m_cart pointer to rom cart + program.install_read_handler(0x2000, 0x6fff, read8sm_delegate(*m_cart, FUNC(m5_cart_slot_device::read_rom))); program.unmap_write(0x2000, 0x3fff); } else @@ -680,7 +680,7 @@ WRITE8_MEMBER( m5_state::mem64KRX_w ) //out 0x7f //if KRX ROM is paged out page in cart ROM if any if (m_cart && BIT(m_ram_mode, 1) == 0 ) { - program.install_read_handler(0x2000, 0x6fff, read8_delegate(*m_cart, FUNC(m5_cart_slot_device::read_rom))); + program.install_read_handler(0x2000, 0x6fff, read8sm_delegate(*m_cart, FUNC(m5_cart_slot_device::read_rom))); program.unmap_write(0x2000, 0x6fff); } @@ -1281,10 +1281,10 @@ void m5_state::machine_reset() case EM_5: program.install_rom(0x0000, 0x1fff, memregion(Z80_TAG)->base()); program.unmap_write(0x0000, 0x1fff); - program.install_readwrite_handler(0x8000, 0xffff, read8_delegate(*m_cart_ram, FUNC(m5_cart_slot_device::read_ram)), write8_delegate(*m_cart_ram, FUNC(m5_cart_slot_device::write_ram))); + program.install_readwrite_handler(0x8000, 0xffff, read8sm_delegate(*m_cart_ram, FUNC(m5_cart_slot_device::read_ram)), write8sm_delegate(*m_cart_ram, FUNC(m5_cart_slot_device::write_ram))); if (m_cart) { - program.install_read_handler(0x2000, 0x6fff, read8_delegate(*m_cart, FUNC(m5_cart_slot_device::read_rom))); + program.install_read_handler(0x2000, 0x6fff, read8sm_delegate(*m_cart, FUNC(m5_cart_slot_device::read_rom))); program.unmap_write(0x2000, 0x6fff); } break; @@ -1296,7 +1296,7 @@ void m5_state::machine_reset() //if AUTOSTART is on then page out cart and start tape loading if (m_cart && ((m_DIPS->read() & 2) != 2)) { - program.install_read_handler(0x2000, 0x3fff, read8_delegate(*m_cart, FUNC(m5_cart_slot_device::read_rom))); + program.install_read_handler(0x2000, 0x3fff, read8sm_delegate(*m_cart, FUNC(m5_cart_slot_device::read_rom))); program.unmap_write(0x2000, 0x3fff); } else @@ -1342,7 +1342,7 @@ void m5_state::machine_reset() { program.install_rom(0x0000, 0x1fff, memregion(Z80_TAG)->base()); program.unmap_write(0x0000, 0x1fff); - program.install_read_handler(0x2000, 0x6fff, read8_delegate(*m_cart, FUNC(m5_cart_slot_device::read_rom))); + program.install_read_handler(0x2000, 0x6fff, read8sm_delegate(*m_cart, FUNC(m5_cart_slot_device::read_rom))); program.unmap_write(0x2000, 0x6fff); } m_ram_mode=0; @@ -1381,7 +1381,7 @@ void brno_state::machine_reset() if (m_cart) { - program.install_read_handler(0x2000, 0x6fff, read8_delegate(*m_cart, FUNC(m5_cart_slot_device::read_rom))); + program.install_read_handler(0x2000, 0x6fff, read8sm_delegate(*m_cart, FUNC(m5_cart_slot_device::read_rom))); program.unmap_write(0x2000, 0x6fff); } diff --git a/src/mame/drivers/odyssey2.cpp b/src/mame/drivers/odyssey2.cpp index 8a4cbe3bd52..ad083128ee2 100644 --- a/src/mame/drivers/odyssey2.cpp +++ b/src/mame/drivers/odyssey2.cpp @@ -82,8 +82,8 @@ protected: required_ioport_array<6> m_keyboard; required_ioport_array<2> m_joysticks; - DECLARE_READ8_MEMBER(io_read); - DECLARE_WRITE8_MEMBER(io_write); + uint8_t io_read(offs_t offset); + void io_write(offs_t offset, uint8_t data); uint8_t bus_read(); void bus_write(uint8_t data); uint8_t p1_read(); @@ -112,8 +112,8 @@ private: virtual void machine_start() override; virtual void machine_reset() override; void p2_write(uint8_t data); - DECLARE_READ8_MEMBER(io_read); - DECLARE_WRITE8_MEMBER(io_write); + uint8_t io_read(offs_t offset); + void io_write(offs_t offset, uint8_t data); void i8243_p4_w(uint8_t data); void i8243_p5_w(uint8_t data); void i8243_p6_w(uint8_t data); @@ -342,7 +342,7 @@ void g7400_state::machine_reset() /****** External RAM ******************************/ -READ8_MEMBER(odyssey2_state::io_read) +uint8_t odyssey2_state::io_read(offs_t offset) { if ((m_p1 & (P1_VDC_COPY_MODE_ENABLE | P1_VDC_ENABLE)) == 0) { @@ -357,7 +357,7 @@ READ8_MEMBER(odyssey2_state::io_read) } -WRITE8_MEMBER(odyssey2_state::io_write) +void odyssey2_state::io_write(offs_t offset, uint8_t data) { if ((m_p1 & (P1_EXT_RAM_ENABLE | P1_VDC_COPY_MODE_ENABLE)) == 0x00) { @@ -365,7 +365,7 @@ WRITE8_MEMBER(odyssey2_state::io_write) if (offset & 0x80) { logerror("voice write %02X, data = %02X (p1 = %02X)\n", offset, data, m_p1); - m_cart->io_write(space, offset, data); + m_cart->io_write(offset, data); } } else if (!(m_p1 & P1_VDC_ENABLE)) @@ -375,7 +375,7 @@ WRITE8_MEMBER(odyssey2_state::io_write) } -READ8_MEMBER(g7400_state::io_read) +uint8_t g7400_state::io_read(offs_t offset) { if ((m_p1 & (P1_VDC_COPY_MODE_ENABLE | P1_VDC_ENABLE)) == 0) { @@ -394,7 +394,7 @@ READ8_MEMBER(g7400_state::io_read) } -WRITE8_MEMBER(g7400_state::io_write) +void g7400_state::io_write(offs_t offset, uint8_t data) { if ((m_p1 & (P1_EXT_RAM_ENABLE | P1_VDC_COPY_MODE_ENABLE)) == 0x00) { @@ -402,7 +402,7 @@ WRITE8_MEMBER(g7400_state::io_write) if (offset & 0x80) { logerror("voice write %02X, data = %02X (p1 = %02X)\n", offset, data, m_p1); - m_cart->io_write(space, offset, data); + m_cart->io_write(offset, data); } } else if (!(m_p1 & P1_VDC_ENABLE)) diff --git a/src/mame/drivers/tvc.cpp b/src/mame/drivers/tvc.cpp index 6c6630423a7..aabe03f2a9b 100644 --- a/src/mame/drivers/tvc.cpp +++ b/src/mame/drivers/tvc.cpp @@ -90,25 +90,25 @@ private: uint8_t m_centronics_ff; void set_mem_page(uint8_t data); - DECLARE_WRITE8_MEMBER(bank_w); - DECLARE_WRITE8_MEMBER(vram_bank_w); - DECLARE_WRITE8_MEMBER(palette_w); - DECLARE_WRITE8_MEMBER(keyboard_w); - DECLARE_READ8_MEMBER(keyboard_r); - DECLARE_READ8_MEMBER(int_state_r); - DECLARE_WRITE8_MEMBER(flipflop_w); - DECLARE_WRITE8_MEMBER(border_color_w); - DECLARE_WRITE8_MEMBER(sound_w); - DECLARE_WRITE8_MEMBER(cassette_w); - DECLARE_READ8_MEMBER(_5b_r); + void bank_w(uint8_t data); + void vram_bank_w(uint8_t data); + void palette_w(offs_t offset, uint8_t data); + void keyboard_w(uint8_t data); + uint8_t keyboard_r(); + uint8_t int_state_r(); + void flipflop_w(uint8_t data); + void border_color_w(uint8_t data); + void sound_w(offs_t offset, uint8_t data); + void cassette_w(uint8_t data); + uint8_t _5b_r(); DECLARE_WRITE_LINE_MEMBER(int_ff_set); DECLARE_WRITE_LINE_MEMBER(centronics_ack); // expansions - DECLARE_WRITE8_MEMBER(expansion_w); - DECLARE_READ8_MEMBER(expansion_r); - DECLARE_READ8_MEMBER(exp_id_r); - DECLARE_WRITE8_MEMBER(expint_ack_w); + void expansion_w(offs_t offset, uint8_t data); + uint8_t expansion_r(offs_t offset); + uint8_t exp_id_r(); + void expint_ack_w(offs_t offset, uint8_t data); DECLARE_QUICKLOAD_LOAD_MEMBER(quickload_cb); @@ -218,31 +218,31 @@ void tvc_state::set_mem_page(uint8_t data) case 0xc0 : // External ROM selected TVC_INSTALL_ROM_BANK(3, "bank4", 0xc000, 0xffff); membank("bank4")->set_base(m_ext->base()); - space.install_readwrite_handler(0xc000, 0xdfff, read8_delegate(*this, FUNC(tvc_state::expansion_r)), write8_delegate(*this, FUNC(tvc_state::expansion_w)), 0); + space.install_readwrite_handler(0xc000, 0xdfff, read8sm_delegate(*this, FUNC(tvc_state::expansion_r)), write8sm_delegate(*this, FUNC(tvc_state::expansion_w)), 0); m_bank_type[3] = -1; break; } } -WRITE8_MEMBER(tvc_state::expansion_w) +void tvc_state::expansion_w(offs_t offset, uint8_t data) { - m_expansions[m_active_slot & 3]->write(space, offset, data); + m_expansions[m_active_slot & 3]->write(offset, data); } -READ8_MEMBER(tvc_state::expansion_r) +uint8_t tvc_state::expansion_r(offs_t offset) { - return m_expansions[m_active_slot & 3]->read(space, offset); + return m_expansions[m_active_slot & 3]->read(offset); } -WRITE8_MEMBER(tvc_state::bank_w) +void tvc_state::bank_w(uint8_t data) { m_bank = data; set_mem_page(data); } -WRITE8_MEMBER(tvc_state::vram_bank_w) +void tvc_state::vram_bank_w(uint8_t data) { // TVC 64+ only if (m_vram->bytes() > 0x4000) @@ -256,7 +256,7 @@ WRITE8_MEMBER(tvc_state::vram_bank_w) } } -WRITE8_MEMBER(tvc_state::palette_w) +void tvc_state::palette_w(offs_t offset, uint8_t data) { // 0 I 0 G | 0 R 0 B // 0 0 0 0 | I G R B @@ -265,7 +265,7 @@ WRITE8_MEMBER(tvc_state::palette_w) m_col[offset] = i; } -WRITE8_MEMBER(tvc_state::keyboard_w) +void tvc_state::keyboard_w(uint8_t data) { // bit 6-7 - expansion select // bit 0-3 - keyboard scan @@ -274,12 +274,12 @@ WRITE8_MEMBER(tvc_state::keyboard_w) m_active_slot = (data>>6) & 0x03; } -READ8_MEMBER(tvc_state::keyboard_r) +uint8_t tvc_state::keyboard_r() { return m_keyboard[m_keyline & 0x0f]->read(); } -READ8_MEMBER(tvc_state::int_state_r) +uint8_t tvc_state::int_state_r() { /* x--- ---- centronics ACK flipflop @@ -297,32 +297,32 @@ READ8_MEMBER(tvc_state::int_state_r) return 0x40 | (m_int_flipflop << 4) | (level > 0.01 ? 0x20 : 0x00) | (m_centronics_ff << 7) | (expint & 0x0f); } -WRITE8_MEMBER(tvc_state::flipflop_w) +void tvc_state::flipflop_w(uint8_t data) { // every write here clears the vblank flipflop m_int_flipflop = 1; m_maincpu->set_input_line(0, CLEAR_LINE); } -READ8_MEMBER(tvc_state::exp_id_r) +uint8_t tvc_state::exp_id_r() { // expansion slots ID return (m_expansions[0]->id_r()<<0) | (m_expansions[1]->id_r()<<2) | (m_expansions[2]->id_r()<<4) | (m_expansions[3]->id_r()<<6); } -WRITE8_MEMBER(tvc_state::expint_ack_w) +void tvc_state::expint_ack_w(offs_t offset, uint8_t data) { m_expansions[offset & 3]->int_ack(); } -WRITE8_MEMBER(tvc_state::border_color_w) +void tvc_state::border_color_w(uint8_t data) { // x-x- x-x- border color (I G R B) } -WRITE8_MEMBER(tvc_state::sound_w) +void tvc_state::sound_w(offs_t offset, uint8_t data) { switch(offset) { @@ -346,13 +346,14 @@ WRITE8_MEMBER(tvc_state::sound_w) m_sound->write(offset, data); } -READ8_MEMBER(tvc_state::_5b_r) +uint8_t tvc_state::_5b_r() { - m_sound->reset_divider(); + if (!machine().side_effects_disabled()) + m_sound->reset_divider(); return 0xff; } -WRITE8_MEMBER(tvc_state::cassette_w) +void tvc_state::cassette_w(uint8_t data) { // writig here cause the toggle of the cassette flipflop m_cassette_ff = !m_cassette_ff; diff --git a/src/mame/drivers/z88.cpp b/src/mame/drivers/z88.cpp index 8ea8d8ab527..82df4b006d3 100644 --- a/src/mame/drivers/z88.cpp +++ b/src/mame/drivers/z88.cpp @@ -45,16 +45,16 @@ explains why the extra checks are done */ // cartridges read -READ8_MEMBER(z88_state::bank0_cart_r) { return m_carts[m_bank[0].slot]->read(space, (m_bank[0].page<<14) + offset); } -READ8_MEMBER(z88_state::bank1_cart_r) { return m_carts[m_bank[1].slot]->read(space, (m_bank[1].page<<14) + offset); } -READ8_MEMBER(z88_state::bank2_cart_r) { return m_carts[m_bank[2].slot]->read(space, (m_bank[2].page<<14) + offset); } -READ8_MEMBER(z88_state::bank3_cart_r) { return m_carts[m_bank[3].slot]->read(space, (m_bank[3].page<<14) + offset); } +uint8_t z88_state::bank0_cart_r(offs_t offset) { return m_carts[m_bank[0].slot]->read((m_bank[0].page<<14) + offset); } +uint8_t z88_state::bank1_cart_r(offs_t offset) { return m_carts[m_bank[1].slot]->read((m_bank[1].page<<14) + offset); } +uint8_t z88_state::bank2_cart_r(offs_t offset) { return m_carts[m_bank[2].slot]->read((m_bank[2].page<<14) + offset); } +uint8_t z88_state::bank3_cart_r(offs_t offset) { return m_carts[m_bank[3].slot]->read((m_bank[3].page<<14) + offset); } // cartridges write -WRITE8_MEMBER(z88_state::bank0_cart_w) { m_carts[m_bank[0].slot]->write(space, (m_bank[0].page<<14) + offset, data); } -WRITE8_MEMBER(z88_state::bank1_cart_w) { m_carts[m_bank[1].slot]->write(space, (m_bank[1].page<<14) + offset, data); } -WRITE8_MEMBER(z88_state::bank2_cart_w) { m_carts[m_bank[2].slot]->write(space, (m_bank[2].page<<14) + offset, data); } -WRITE8_MEMBER(z88_state::bank3_cart_w) { m_carts[m_bank[3].slot]->write(space, (m_bank[3].page<<14) + offset, data); } +void z88_state::bank0_cart_w(offs_t offset, uint8_t data) { m_carts[m_bank[0].slot]->write((m_bank[0].page<<14) + offset, data); } +void z88_state::bank1_cart_w(offs_t offset, uint8_t data) { m_carts[m_bank[1].slot]->write((m_bank[1].page<<14) + offset, data); } +void z88_state::bank2_cart_w(offs_t offset, uint8_t data) { m_carts[m_bank[2].slot]->write((m_bank[2].page<<14) + offset, data); } +void z88_state::bank3_cart_w(offs_t offset, uint8_t data) { m_carts[m_bank[3].slot]->write((m_bank[3].page<<14) + offset, data); } UPD65031_MEMORY_UPDATE(z88_state::bankswitch_update) @@ -107,16 +107,16 @@ UPD65031_MEMORY_UPDATE(z88_state::bankswitch_update) switch (bank) { case 0: - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x0000, 0x3fff, read8_delegate(*this, FUNC(z88_state::bank0_cart_r)), write8_delegate(*this, FUNC(z88_state::bank0_cart_w))); + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x0000, 0x3fff, read8sm_delegate(*this, FUNC(z88_state::bank0_cart_r)), write8sm_delegate(*this, FUNC(z88_state::bank0_cart_w))); break; case 1: - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x4000, 0x7fff, read8_delegate(*this, FUNC(z88_state::bank1_cart_r)), write8_delegate(*this, FUNC(z88_state::bank1_cart_w))); + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x4000, 0x7fff, read8sm_delegate(*this, FUNC(z88_state::bank1_cart_r)), write8sm_delegate(*this, FUNC(z88_state::bank1_cart_w))); break; case 2: - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x8000, 0xbfff, read8_delegate(*this, FUNC(z88_state::bank2_cart_r)), write8_delegate(*this, FUNC(z88_state::bank2_cart_w))); + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x8000, 0xbfff, read8sm_delegate(*this, FUNC(z88_state::bank2_cart_r)), write8sm_delegate(*this, FUNC(z88_state::bank2_cart_w))); break; case 3: - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xc000, 0xffff, read8_delegate(*this, FUNC(z88_state::bank3_cart_r)), write8_delegate(*this, FUNC(z88_state::bank3_cart_w))); + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0xc000, 0xffff, read8sm_delegate(*this, FUNC(z88_state::bank3_cart_r)), write8sm_delegate(*this, FUNC(z88_state::bank3_cart_w))); break; } diff --git a/src/mame/includes/abc80.h b/src/mame/includes/abc80.h index 2e4f0e1fe90..cf57826b4df 100644 --- a/src/mame/includes/abc80.h +++ b/src/mame/includes/abc80.h @@ -109,7 +109,7 @@ public: required_memory_region m_vsync_prom; required_memory_region m_line_prom; required_memory_region m_attr_prom; - optional_shared_ptr m_video_ram; + optional_shared_ptr m_video_ram; enum { @@ -133,22 +133,22 @@ public: virtual void machine_start() override; virtual void video_start() override; - uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); + u32 screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect); void draw_scanline(bitmap_rgb32 &bitmap, int y); - DECLARE_READ8_MEMBER( read ); - DECLARE_WRITE8_MEMBER( write ); + u8 read(offs_t offset); + void write(offs_t offset, u8 data); DECLARE_WRITE_LINE_MEMBER( vco_voltage_w ); - uint8_t pio_pa_r(); - uint8_t pio_pb_r(); - void pio_pb_w(uint8_t data); + u8 pio_pa_r(); + u8 pio_pb_r(); + void pio_pb_w(u8 data); DECLARE_WRITE_LINE_MEMBER( keydown_w ); void kbd_w(u8 data); - DECLARE_WRITE8_MEMBER( csg_w ); + void csg_w(u8 data); DECLARE_QUICKLOAD_LOAD_MEMBER(quickload_cb); @@ -167,7 +167,7 @@ public: // video state bitmap_rgb32 m_bitmap; - uint8_t m_latch; + u8 m_latch; int m_blink; int m_c; int m_r; diff --git a/src/mame/includes/abc80x.h b/src/mame/includes/abc80x.h index f04b70a5a39..c73ac3de8c6 100644 --- a/src/mame/includes/abc80x.h +++ b/src/mame/includes/abc80x.h @@ -116,12 +116,12 @@ public: void cassette_output_tick(int state); - DECLARE_READ8_MEMBER( read ); - DECLARE_WRITE8_MEMBER( write ); - virtual DECLARE_READ8_MEMBER( m1_r ); - DECLARE_READ8_MEMBER( pling_r ); - DECLARE_WRITE8_MEMBER( hrs_w ); - DECLARE_WRITE8_MEMBER( hrc_w ); + uint8_t read(offs_t offset); + void write(offs_t offset, uint8_t data); + virtual uint8_t m1_r(offs_t offset); + uint8_t pling_r(); + void hrs_w(uint8_t data); + void hrc_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER( ctc_z0_w ); DECLARE_WRITE_LINE_MEMBER( ctc_z1_w ); DECLARE_WRITE_LINE_MEMBER( sio_txdb_w ); @@ -240,8 +240,8 @@ public: virtual void machine_reset() override; virtual void video_start() override; - DECLARE_READ8_MEMBER( read ); - DECLARE_WRITE8_MEMBER( write ); + uint8_t read(offs_t offset); + void write(offs_t offset, uint8_t data); DECLARE_WRITE_LINE_MEMBER( lrs_w ); DECLARE_WRITE_LINE_MEMBER( mux80_40_w ); DECLARE_WRITE_LINE_MEMBER( vs_w ); @@ -296,20 +296,20 @@ public: void read_pal_p4(offs_t offset, bool m1l, bool xml, offs_t &m, bool &romd, bool &ramd, bool &hre, bool &vr); void hr_update(bitmap_rgb32 &bitmap, const rectangle &cliprect); - DECLARE_READ8_MEMBER( read ); - DECLARE_WRITE8_MEMBER( write ); - DECLARE_READ8_MEMBER( m1_r ) override; - DECLARE_READ8_MEMBER( mai_r ); - DECLARE_WRITE8_MEMBER( mao_w ); - DECLARE_WRITE8_MEMBER( hrs_w ); - DECLARE_WRITE8_MEMBER( hrc_w ); - DECLARE_READ8_MEMBER( charram_r ); - DECLARE_WRITE8_MEMBER( charram_w ); - DECLARE_READ8_MEMBER( ami_r ); - DECLARE_WRITE8_MEMBER( amo_w ); - DECLARE_READ8_MEMBER( cli_r ); - DECLARE_WRITE8_MEMBER( sso_w ); - DECLARE_READ8_MEMBER( sti_r ); + uint8_t read(offs_t offset); + void write(offs_t offset, uint8_t data); + uint8_t m1_r(offs_t offset) override; + uint8_t mai_r(offs_t offset); + void mao_w(offs_t offset, uint8_t data); + void hrs_w(uint8_t data); + void hrc_w(offs_t offset, uint8_t data); + uint8_t charram_r(offs_t offset); + void charram_w(offs_t offset, uint8_t data); + uint8_t ami_r(); + void amo_w(uint8_t data); + uint8_t cli_r(offs_t offset); + void sso_w(uint8_t data); + uint8_t sti_r(); void sto_w(uint8_t data); DECLARE_WRITE_LINE_MEMBER( hs_w ); DECLARE_WRITE_LINE_MEMBER( vs_w ); diff --git a/src/mame/includes/xavix.h b/src/mame/includes/xavix.h index caf76b916c0..9a81c267a50 100644 --- a/src/mame/includes/xavix.h +++ b/src/mame/includes/xavix.h @@ -781,7 +781,7 @@ protected: { if (m_cartslot->has_cart()) { - return m_cartslot->read_cart(*m_cpuspace, offset); + return m_cartslot->read_cart(offset); } else { @@ -805,7 +805,7 @@ protected: { if (m_cartslot->has_cart()) { - return m_cartslot->read_cart(*m_cpuspace, offset); + return m_cartslot->read_cart(offset); } else { @@ -827,7 +827,7 @@ protected: if (offset < 3) { if (m_cartslot->has_cart()) - m_cartslot->write_bus_control(space,offset,data,mem_mask); + m_cartslot->write_bus_control(offset,data); } }; @@ -836,7 +836,7 @@ protected: if (m_cartslot->has_cart() && m_cartslot->is_read_access_not_rom()) { logerror("%s: read from external bus %06x (SEEPROM READ?)\n", machine().describe_context(), offset); - return m_cartslot->read_extra(*m_cpuspace, offset); + return m_cartslot->read_extra(offset); } else { @@ -848,7 +848,7 @@ protected: { if (m_cartslot->has_cart()) { - return m_cartslot->read_cart(*m_cpuspace, offset); + return m_cartslot->read_cart(offset); } else { @@ -862,13 +862,13 @@ protected: if (m_cartslot->has_cart() && m_cartslot->is_write_access_not_rom()) { logerror("%s: write to external bus %06x %02x (SEEPROM WRITE?)\n", machine().describe_context(), offset, data); - return m_cartslot->write_extra(*m_cpuspace, offset, data); + return m_cartslot->write_extra(offset, data); } else { if (m_cartslot->has_cart()) { - return m_cartslot->write_cart(*m_cpuspace, offset, data); + return m_cartslot->write_cart(offset, data); } else { @@ -891,7 +891,7 @@ protected: { if (m_cartslot->has_cart()) { - return m_cartslot->read_cart(*m_cpuspace, offset); + return m_cartslot->read_cart(offset); } else { @@ -911,7 +911,7 @@ protected: { if (m_cartslot->has_cart()) { - return m_cartslot->read_cart(*m_cpuspace, offset); + return m_cartslot->read_cart(offset); } else { diff --git a/src/mame/includes/z88.h b/src/mame/includes/z88.h index ade59a27a67..22b22db1a7e 100644 --- a/src/mame/includes/z88.h +++ b/src/mame/includes/z88.h @@ -72,14 +72,14 @@ private: UPD65031_SCREEN_UPDATE(lcd_update); // cartridges read/write - DECLARE_READ8_MEMBER(bank0_cart_r); - DECLARE_READ8_MEMBER(bank1_cart_r); - DECLARE_READ8_MEMBER(bank2_cart_r); - DECLARE_READ8_MEMBER(bank3_cart_r); - DECLARE_WRITE8_MEMBER(bank0_cart_w); - DECLARE_WRITE8_MEMBER(bank1_cart_w); - DECLARE_WRITE8_MEMBER(bank2_cart_w); - DECLARE_WRITE8_MEMBER(bank3_cart_w); + uint8_t bank0_cart_r(offs_t offset); + uint8_t bank1_cart_r(offs_t offset); + uint8_t bank2_cart_r(offs_t offset); + uint8_t bank3_cart_r(offs_t offset); + void bank0_cart_w(offs_t offset, uint8_t data); + void bank1_cart_w(offs_t offset, uint8_t data); + void bank2_cart_w(offs_t offset, uint8_t data); + void bank3_cart_w(offs_t offset, uint8_t data); // defined in video/z88.c inline void plot_pixel(bitmap_ind16 &bitmap, int x, int y, uint16_t color); diff --git a/src/mame/machine/vectrex.cpp b/src/mame/machine/vectrex.cpp index 4f0646c783d..e314e488ed8 100644 --- a/src/mame/machine/vectrex.cpp +++ b/src/mame/machine/vectrex.cpp @@ -328,9 +328,9 @@ void vectrex_state::machine_start() { // install cart accesses if (m_cart->get_type() == VECTREX_SRAM) - m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x0000, 0x7fff, read8_delegate(*m_cart, FUNC(vectrex_cart_slot_device::read_rom)), write8_delegate(*m_cart, FUNC(vectrex_cart_slot_device::write_ram))); + m_maincpu->space(AS_PROGRAM).install_readwrite_handler(0x0000, 0x7fff, read8sm_delegate(*m_cart, FUNC(vectrex_cart_slot_device::read_rom)), write8sm_delegate(*m_cart, FUNC(vectrex_cart_slot_device::write_ram))); else - m_maincpu->space(AS_PROGRAM).install_read_handler(0x0000, 0x7fff, read8_delegate(*m_cart, FUNC(vectrex_cart_slot_device::read_rom))); + m_maincpu->space(AS_PROGRAM).install_read_handler(0x0000, 0x7fff, read8sm_delegate(*m_cart, FUNC(vectrex_cart_slot_device::read_rom))); // setup 3d imager and refresh timer diff --git a/src/mame/video/abc800.cpp b/src/mame/video/abc800.cpp index a14ca763e3c..386ba12581c 100644 --- a/src/mame/video/abc800.cpp +++ b/src/mame/video/abc800.cpp @@ -26,7 +26,7 @@ // hrs_w - high resolution scanline write //------------------------------------------------- -WRITE8_MEMBER( abc800_state::hrs_w ) +void abc800_state::hrs_w(uint8_t data) { m_hrs = data; } @@ -36,7 +36,7 @@ WRITE8_MEMBER( abc800_state::hrs_w ) // hrc_w - high resolution color write //------------------------------------------------- -WRITE8_MEMBER( abc800_state::hrc_w ) +void abc800_state::hrc_w(uint8_t data) { m_fgctl = data; } diff --git a/src/mame/video/abc806.cpp b/src/mame/video/abc806.cpp index c8627bc47bc..f9a8b7209f8 100644 --- a/src/mame/video/abc806.cpp +++ b/src/mame/video/abc806.cpp @@ -23,7 +23,7 @@ // hrs_w - high resolution memory banking //------------------------------------------------- -WRITE8_MEMBER( abc806_state::hrs_w ) +void abc806_state::hrs_w(uint8_t data) { /* @@ -50,7 +50,7 @@ WRITE8_MEMBER( abc806_state::hrs_w ) // hrc_w - high resolution color write //------------------------------------------------- -WRITE8_MEMBER( abc806_state::hrc_w ) +void abc806_state::hrc_w(offs_t offset, uint8_t data) { int reg = (offset >> 8) & 0x0f; @@ -62,9 +62,10 @@ WRITE8_MEMBER( abc806_state::hrc_w ) // charram_r - character RAM read //------------------------------------------------- -READ8_MEMBER( abc806_state::charram_r ) +uint8_t abc806_state::charram_r(offs_t offset) { - m_attr_data = m_attr_ram[offset]; + if (!machine().side_effects_disabled()) + m_attr_data = m_attr_ram[offset]; return m_char_ram[offset]; } @@ -74,9 +75,10 @@ READ8_MEMBER( abc806_state::charram_r ) // charram_w - character RAM write //------------------------------------------------- -WRITE8_MEMBER( abc806_state::charram_w ) +void abc806_state::charram_w(offs_t offset, uint8_t data) { - m_attr_ram[offset] = m_attr_data; + if (!machine().side_effects_disabled()) + m_attr_ram[offset] = m_attr_data; m_char_ram[offset] = data; } @@ -86,7 +88,7 @@ WRITE8_MEMBER( abc806_state::charram_w ) // ami_r - attribute memory read //------------------------------------------------- -READ8_MEMBER( abc806_state::ami_r ) +uint8_t abc806_state::ami_r() { return m_attr_data; } @@ -96,7 +98,7 @@ READ8_MEMBER( abc806_state::ami_r ) // amo_w - attribute memory write //------------------------------------------------- -WRITE8_MEMBER( abc806_state::amo_w ) +void abc806_state::amo_w(uint8_t data) { m_attr_data = data; } @@ -106,7 +108,7 @@ WRITE8_MEMBER( abc806_state::amo_w ) // cli_r - palette PROM read //------------------------------------------------- -READ8_MEMBER( abc806_state::cli_r ) +uint8_t abc806_state::cli_r(offs_t offset) { /* @@ -138,7 +140,7 @@ READ8_MEMBER( abc806_state::cli_r ) // sti_r - protection device read //------------------------------------------------- -READ8_MEMBER( abc806_state::sti_r ) +uint8_t abc806_state::sti_r() { /* @@ -209,7 +211,7 @@ void abc806_state::sto_w(uint8_t data) // sso_w - sync offset write //------------------------------------------------- -WRITE8_MEMBER( abc806_state::sso_w ) +void abc806_state::sso_w(uint8_t data) { m_sync = data & 0x3f; } -- cgit v1.2.3