diff options
author | AJR <ajrhacker@users.noreply.github.com> | 2020-05-31 13:50:26 -0400 |
---|---|---|
committer | AJR <ajrhacker@users.noreply.github.com> | 2020-05-31 13:50:26 -0400 |
commit | b68afeeac40f6cbc629f0f1bda1c12c4bebacddb (patch) | |
tree | e0b3098be5d4ffa5c4ca2aa6cd83cc80018f3b04 /src/devices/bus | |
parent | b2991c51fe744bf898445ae2f52eee35b2feabe8 (diff) |
sg1000.cpp, sms.cpp & associated buses: Simplify handler signatures (nw)
Diffstat (limited to 'src/devices/bus')
-rw-r--r-- | src/devices/bus/sega8/ccatch.cpp | 6 | ||||
-rw-r--r-- | src/devices/bus/sega8/ccatch.h | 6 | ||||
-rw-r--r-- | src/devices/bus/sega8/mgear.h | 6 | ||||
-rw-r--r-- | src/devices/bus/sega8/rom.cpp | 108 | ||||
-rw-r--r-- | src/devices/bus/sega8/rom.h | 130 | ||||
-rw-r--r-- | src/devices/bus/sega8/sega8_slot.cpp | 28 | ||||
-rw-r--r-- | src/devices/bus/sega8/sega8_slot.h | 28 | ||||
-rw-r--r-- | src/devices/bus/sg1000_exp/fm_unit.cpp | 4 | ||||
-rw-r--r-- | src/devices/bus/sg1000_exp/fm_unit.h | 4 | ||||
-rw-r--r-- | src/devices/bus/sg1000_exp/sg1000exp.cpp | 8 | ||||
-rw-r--r-- | src/devices/bus/sg1000_exp/sg1000exp.h | 8 | ||||
-rw-r--r-- | src/devices/bus/sg1000_exp/sk1100.cpp | 8 | ||||
-rw-r--r-- | src/devices/bus/sg1000_exp/sk1100.h | 4 | ||||
-rw-r--r-- | src/devices/bus/sms_exp/gender.cpp | 20 | ||||
-rw-r--r-- | src/devices/bus/sms_exp/gender.h | 10 | ||||
-rw-r--r-- | src/devices/bus/sms_exp/smsexp.h | 20 |
16 files changed, 199 insertions, 199 deletions
diff --git a/src/devices/bus/sega8/ccatch.cpp b/src/devices/bus/sega8/ccatch.cpp index 1180e7a793b..baf7fc52151 100644 --- a/src/devices/bus/sega8/ccatch.cpp +++ b/src/devices/bus/sega8/ccatch.cpp @@ -33,15 +33,15 @@ sega8_cardcatch_device::sega8_cardcatch_device(const machine_config &mconfig, co mapper specific handlers -------------------------------------------------*/ -READ8_MEMBER(sega8_cardcatch_device::read_cart) +uint8_t sega8_cardcatch_device::read_cart(offs_t offset) { if (offset < 0x8000) - return m_card->read_cart(space, offset); + return m_card->read_cart(offset); return 0xff; } -WRITE8_MEMBER(sega8_cardcatch_device::write_cart) +void sega8_cardcatch_device::write_cart(offs_t offset, uint8_t data) { // this should never happen, because there is no RAM on cards if (offset < 0x8000) diff --git a/src/devices/bus/sega8/ccatch.h b/src/devices/bus/sega8/ccatch.h index 72d69d32dbd..ab00942904f 100644 --- a/src/devices/bus/sega8/ccatch.h +++ b/src/devices/bus/sega8/ccatch.h @@ -17,9 +17,9 @@ public: sega8_cardcatch_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 DECLARE_WRITE8_MEMBER(write_mapper) override {} + virtual uint8_t read_cart(offs_t offset) override; + virtual void write_cart(offs_t offset, uint8_t data) override; + virtual void write_mapper(offs_t offset, uint8_t data) override {} protected: virtual void device_add_mconfig(machine_config &config) override; diff --git a/src/devices/bus/sega8/mgear.h b/src/devices/bus/sega8/mgear.h index 465ae3d5693..3e8e5f64fc9 100644 --- a/src/devices/bus/sega8/mgear.h +++ b/src/devices/bus/sega8/mgear.h @@ -18,9 +18,9 @@ public: sega8_mgear_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_cart) override { return m_subslot->read_cart(space, offset); } - virtual DECLARE_WRITE8_MEMBER(write_cart) override { m_subslot->write_cart(space, offset, data); } - virtual DECLARE_WRITE8_MEMBER(write_mapper) override { m_subslot->write_mapper(space, offset, data); } + virtual uint8_t read_cart(offs_t offset) override { return m_subslot->read_cart(offset); } + virtual void write_cart(offs_t offset, uint8_t data) override { m_subslot->write_cart(offset, data); } + virtual void write_mapper(offs_t offset, uint8_t data) override { m_subslot->write_mapper(offset, data); } virtual int get_lphaser_xoffs() override { return m_subslot->get_lphaser_xoffs(); } protected: diff --git a/src/devices/bus/sega8/rom.cpp b/src/devices/bus/sega8/rom.cpp index 1f039361a12..edcbc910740 100644 --- a/src/devices/bus/sega8/rom.cpp +++ b/src/devices/bus/sega8/rom.cpp @@ -383,7 +383,7 @@ void sega8_korean_device::late_bank_setup() -------------------------------------------------*/ -READ8_MEMBER(sega8_rom_device::read_cart) +uint8_t sega8_rom_device::read_cart(offs_t offset) { int bank = offset / 0x4000; @@ -396,7 +396,7 @@ READ8_MEMBER(sega8_rom_device::read_cart) return m_rom[m_rom_bank_base[bank] * 0x4000 + (offset & 0x3fff)]; } -WRITE8_MEMBER(sega8_rom_device::write_cart) +void sega8_rom_device::write_cart(offs_t offset, uint8_t data) { int bank = offset / 0x4000; @@ -404,7 +404,7 @@ WRITE8_MEMBER(sega8_rom_device::write_cart) m_ram[(m_ram_base * 0x4000 + (offset & 0x3fff)) % m_ram.size()] = data; } -WRITE8_MEMBER(sega8_rom_device::write_mapper) +void sega8_rom_device::write_mapper(offs_t offset, uint8_t data) { switch (offset) { @@ -439,7 +439,7 @@ WRITE8_MEMBER(sega8_rom_device::write_mapper) -------------------------------------------------*/ -READ8_MEMBER(sega8_othello_device::read_cart) +uint8_t sega8_othello_device::read_cart(offs_t offset) { // 8K of RAM sits in 0x8000-0x9fff if (offset >= 0x8000 && offset < 0xa000) @@ -448,7 +448,7 @@ READ8_MEMBER(sega8_othello_device::read_cart) return m_rom[offset % m_rom_size]; } -WRITE8_MEMBER(sega8_othello_device::write_cart) +void sega8_othello_device::write_cart(offs_t offset, uint8_t data) { // 2K of RAM sits in 0x8000-0x9fff if (offset >= 0x8000 && offset < 0xa000) @@ -463,7 +463,7 @@ WRITE8_MEMBER(sega8_othello_device::write_cart) -------------------------------------------------*/ -READ8_MEMBER(sega8_castle_device::read_cart) +uint8_t sega8_castle_device::read_cart(offs_t offset) { // 8K of RAM sits in 0x8000-0x9fff if (offset >= 0x8000 && offset < 0xa000) @@ -472,7 +472,7 @@ READ8_MEMBER(sega8_castle_device::read_cart) return m_rom[offset % m_rom_size]; } -WRITE8_MEMBER(sega8_castle_device::write_cart) +void sega8_castle_device::write_cart(offs_t offset, uint8_t data) { // 8K of RAM sits in 0x8000-0x9fff if (offset >= 0x8000 && offset < 0xa000) @@ -487,7 +487,7 @@ WRITE8_MEMBER(sega8_castle_device::write_cart) -------------------------------------------------*/ -READ8_MEMBER(sega8_basic_l3_device::read_cart) +uint8_t sega8_basic_l3_device::read_cart(offs_t offset) { // 8K of RAM sits in 0x8000-0x9fff if (offset >= 0x8000) @@ -496,19 +496,19 @@ READ8_MEMBER(sega8_basic_l3_device::read_cart) return m_rom[offset % m_rom_size]; } -WRITE8_MEMBER(sega8_basic_l3_device::write_cart) +void sega8_basic_l3_device::write_cart(offs_t offset, uint8_t data) { // 8K of RAM sits in 0x8000-0x9fff if (offset >= 0x8000) m_ram[offset & 0x3fff] = data; } -READ8_MEMBER(sega8_basic_l3_device::read_ram) +uint8_t sega8_basic_l3_device::read_ram(offs_t offset) { return m_ram[0x4000 + (offset & 0x3fff)]; } -WRITE8_MEMBER(sega8_basic_l3_device::write_ram) +void sega8_basic_l3_device::write_ram(offs_t offset, uint8_t data) { m_ram[0x4000 + (offset & 0x3fff)] = data; } @@ -521,7 +521,7 @@ WRITE8_MEMBER(sega8_basic_l3_device::write_ram) -------------------------------------------------*/ -READ8_MEMBER(sega8_music_editor_device::read_cart) +uint8_t sega8_music_editor_device::read_cart(offs_t offset) { // 8K of RAM sits in 0x8000-0x9fff if (offset >= 0x8000 && offset < 0xa000) @@ -530,21 +530,21 @@ READ8_MEMBER(sega8_music_editor_device::read_cart) return m_rom[offset % m_rom_size]; } -WRITE8_MEMBER(sega8_music_editor_device::write_cart) +void sega8_music_editor_device::write_cart(offs_t offset, uint8_t data) { // 8K of RAM sits in 0x8000-0x9fff if (offset >= 0x8000 && offset < 0xa000) m_ram[offset & 0x1fff] = data; } -READ8_MEMBER(sega8_music_editor_device::read_ram) +uint8_t sega8_music_editor_device::read_ram(offs_t offset) { // 2K more of RAM sits in 0xc000-0xc3ff (and mirrored up to 0xffff) // or should it simply go to the 2K of SC3000 RAM??? return m_ram[0x2000 + (offset & 0x7ff)]; } -WRITE8_MEMBER(sega8_music_editor_device::write_ram) +void sega8_music_editor_device::write_ram(offs_t offset, uint8_t data) { // 2K more of RAM sits in 0xc000-0xc3ff (and mirrored up to 0xffff) // or should it simply go to the 2K of SC3000 RAM??? @@ -576,7 +576,7 @@ WRITE8_MEMBER(sega8_music_editor_device::write_ram) */ -READ8_MEMBER(sega8_terebi_device::read_cart) +uint8_t sega8_terebi_device::read_cart(offs_t offset) { int bank = offset / 0x4000; @@ -588,7 +588,7 @@ READ8_MEMBER(sega8_terebi_device::read_cart) return m_rom[m_rom_bank_base[bank] * 0x4000 + (offset & 0x3fff)]; } -WRITE8_MEMBER(sega8_terebi_device::write_cart) +void sega8_terebi_device::write_cart(offs_t offset, uint8_t data) { switch (offset) { @@ -640,7 +640,7 @@ ioport_constructor sega8_terebi_device::device_input_ports() const -------------------------------------------------*/ // TYPE A -READ8_MEMBER(sega8_dahjee_typea_device::read_cart) +uint8_t sega8_dahjee_typea_device::read_cart(offs_t offset) { // 8K of RAM sits in 0x2000-0x3fff if (offset >= 0x2000 && offset < 0x4000) @@ -649,21 +649,21 @@ READ8_MEMBER(sega8_dahjee_typea_device::read_cart) return m_rom[offset % m_rom_size]; } -WRITE8_MEMBER(sega8_dahjee_typea_device::write_cart) +void sega8_dahjee_typea_device::write_cart(offs_t offset, uint8_t data) { // 8K of RAM sits in 0x2000-0x3fff if (offset >= 0x2000 && offset < 0x4000) m_ram[offset & 0x1fff] = data; } -READ8_MEMBER(sega8_dahjee_typea_device::read_ram) +uint8_t sega8_dahjee_typea_device::read_ram(offs_t offset) { // 1K more of RAM sits in 0xc000-0xc3ff (and mirrored up to 0xffff // or should it simply go to the 1K of SG1000 RAM??? return m_ram[0x2000 + (offset & 0x3ff)]; } -WRITE8_MEMBER(sega8_dahjee_typea_device::write_ram) +void sega8_dahjee_typea_device::write_ram(offs_t offset, uint8_t data) { // 1K more of RAM sits in 0xc000-0xc3ff (and mirrored up to 0xffff // or should it simply go to the 1K of SG1000 RAM??? @@ -672,18 +672,18 @@ WRITE8_MEMBER(sega8_dahjee_typea_device::write_ram) // TYPE B -READ8_MEMBER(sega8_dahjee_typeb_device::read_cart) +uint8_t sega8_dahjee_typeb_device::read_cart(offs_t offset) { return m_rom[offset % m_rom_size]; } -READ8_MEMBER(sega8_dahjee_typeb_device::read_ram) +uint8_t sega8_dahjee_typeb_device::read_ram(offs_t offset) { // 8K more of RAM sits in 0xc000-0xffff return m_ram[offset & 0x1fff]; } -WRITE8_MEMBER(sega8_dahjee_typeb_device::write_ram) +void sega8_dahjee_typeb_device::write_ram(offs_t offset, uint8_t data) { // 8K more of RAM sits in 0xc000-0xffff m_ram[offset & 0x1fff] = data; @@ -700,7 +700,7 @@ WRITE8_MEMBER(sega8_dahjee_typeb_device::write_ram) -------------------------------------------------*/ -READ8_MEMBER(sega8_eeprom_device::read_cart) +uint8_t sega8_eeprom_device::read_cart(offs_t offset) { int bank = offset / 0x4000; @@ -717,7 +717,7 @@ READ8_MEMBER(sega8_eeprom_device::read_cart) return m_rom[m_rom_bank_base[bank] * 0x4000 + (offset & 0x3fff)]; } -WRITE8_MEMBER(sega8_eeprom_device::write_cart) +void sega8_eeprom_device::write_cart(offs_t offset, uint8_t data) { if (offset == 0x8000 && m_93c46_enabled) { @@ -728,7 +728,7 @@ WRITE8_MEMBER(sega8_eeprom_device::write_cart) } } -WRITE8_MEMBER(sega8_eeprom_device::write_mapper) +void sega8_eeprom_device::write_mapper(offs_t offset, uint8_t data) { switch (offset) { @@ -764,7 +764,7 @@ void sega8_eeprom_device::device_add_mconfig(machine_config &config) -------------------------------------------------*/ -READ8_MEMBER(sega8_codemasters_device::read_cart) +uint8_t sega8_codemasters_device::read_cart(offs_t offset) { int bank = offset / 0x2000; @@ -774,7 +774,7 @@ READ8_MEMBER(sega8_codemasters_device::read_cart) return m_rom[m_rom_bank_base[bank/2] * 0x4000 + (offset & 0x3fff)]; } -WRITE8_MEMBER(sega8_codemasters_device::write_cart) +void sega8_codemasters_device::write_cart(offs_t offset, uint8_t data) { int bank = offset / 0x2000; @@ -811,7 +811,7 @@ WRITE8_MEMBER(sega8_codemasters_device::write_cart) -------------------------------------------------*/ -READ8_MEMBER(sega8_4pak_device::read_cart) +uint8_t sega8_4pak_device::read_cart(offs_t offset) { int bank = offset / 0x4000; @@ -819,7 +819,7 @@ READ8_MEMBER(sega8_4pak_device::read_cart) } -WRITE8_MEMBER(sega8_4pak_device::write_cart) +void sega8_4pak_device::write_cart(offs_t offset, uint8_t data) { switch (offset) { @@ -846,7 +846,7 @@ WRITE8_MEMBER(sega8_4pak_device::write_cart) -------------------------------------------------*/ -READ8_MEMBER(sega8_zemina_device::read_cart) +uint8_t sega8_zemina_device::read_cart(offs_t offset) { int bank = offset / 0x2000; @@ -856,7 +856,7 @@ READ8_MEMBER(sega8_zemina_device::read_cart) return m_rom[m_rom_bank_base[bank] * 0x2000 + (offset & 0x1fff)]; } -WRITE8_MEMBER(sega8_zemina_device::write_cart) +void sega8_zemina_device::write_cart(offs_t offset, uint8_t data) { int bank = offset / 0x2000; @@ -902,7 +902,7 @@ WRITE8_MEMBER(sega8_zemina_device::write_cart) -------------------------------------------------*/ -READ8_MEMBER(sega8_janggun_device::read_cart) +uint8_t sega8_janggun_device::read_cart(offs_t offset) { int bank = offset / 0x2000; @@ -913,7 +913,7 @@ READ8_MEMBER(sega8_janggun_device::read_cart) } -WRITE8_MEMBER(sega8_janggun_device::write_cart) +void sega8_janggun_device::write_cart(offs_t offset, uint8_t data) { switch (offset) { @@ -932,7 +932,7 @@ WRITE8_MEMBER(sega8_janggun_device::write_cart) } } -WRITE8_MEMBER(sega8_janggun_device::write_mapper) +void sega8_janggun_device::write_mapper(offs_t offset, uint8_t data) { switch (offset) { @@ -956,7 +956,7 @@ WRITE8_MEMBER(sega8_janggun_device::write_mapper) -------------------------------------------------*/ -READ8_MEMBER(sega8_hicom_device::read_cart) +uint8_t sega8_hicom_device::read_cart(offs_t offset) { if (offset >= 0x8000) return m_rom[offset & 0x3fff]; @@ -964,7 +964,7 @@ READ8_MEMBER(sega8_hicom_device::read_cart) return m_rom[(m_rom_bank_base * 0x8000) + offset]; } -WRITE8_MEMBER(sega8_hicom_device::write_mapper) +void sega8_hicom_device::write_mapper(offs_t offset, uint8_t data) { if (offset == 0x03) m_rom_bank_base = data % (m_rom_page_count << 1); @@ -977,7 +977,7 @@ WRITE8_MEMBER(sega8_hicom_device::write_mapper) -------------------------------------------------*/ -WRITE8_MEMBER(sega8_korean_device::write_cart) +void sega8_korean_device::write_cart(offs_t offset, uint8_t data) { int bank = offset / 0x4000; @@ -1012,7 +1012,7 @@ void sega8_seojin_device::device_reset() } -READ8_MEMBER(sega8_seojin_device::read_cart) +uint8_t sega8_seojin_device::read_cart(offs_t offset) { int bank = offset / 0x4000; @@ -1024,11 +1024,11 @@ READ8_MEMBER(sega8_seojin_device::read_cart) return m_rom[bank_to_use * 0x4000 + (offset & 0x3fff)]^m_readxor; } -WRITE8_MEMBER(sega8_seojin_device::write_cart) +void sega8_seojin_device::write_cart(offs_t offset, uint8_t data) { } -WRITE8_MEMBER(sega8_seojin_device::write_mapper) +void sega8_seojin_device::write_mapper(offs_t offset, uint8_t data) { switch (offset) { @@ -1045,7 +1045,7 @@ WRITE8_MEMBER(sega8_seojin_device::write_mapper) // it might not have RAM inside, but the only way to get 0xfff0 to fall through to the cart with the current hook-up // is by saying there is. -WRITE8_MEMBER(sega8_seojin_device::write_ram) +void sega8_seojin_device::write_ram(offs_t offset, uint8_t data) { m_ram[offset & 0x3fff] = data; @@ -1055,7 +1055,7 @@ WRITE8_MEMBER(sega8_seojin_device::write_ram) } } -READ8_MEMBER(sega8_seojin_device::read_ram) +uint8_t sega8_seojin_device::read_ram(offs_t offset) { return m_ram[offset & 0x3fff]; } @@ -1066,7 +1066,7 @@ READ8_MEMBER(sega8_seojin_device::read_ram) -------------------------------------------------*/ -READ8_MEMBER(sega8_multicart_device::read_cart) +uint8_t sega8_multicart_device::read_cart(offs_t offset) { // 16K of RAM sits in 0x8000-0xbfff if (offset >= 0x8000) @@ -1075,24 +1075,24 @@ READ8_MEMBER(sega8_multicart_device::read_cart) return m_rom[(offset & 0x7fff) | (m_block << 15) % m_rom_size]; } -WRITE8_MEMBER(sega8_multicart_device::write_cart) +void sega8_multicart_device::write_cart(offs_t offset, uint8_t data) { // 16K of RAM sits in 0x8000-0xbfff if (offset >= 0x8000) m_ram[offset & 0x3fff] = data; } -READ8_MEMBER(sega8_multicart_device::read_ram) +uint8_t sega8_multicart_device::read_ram(offs_t offset) { return m_ram[0x4000 + (offset & 0x3fff)]; } -WRITE8_MEMBER(sega8_multicart_device::write_ram) +void sega8_multicart_device::write_ram(offs_t offset, uint8_t data) { m_ram[0x4000 + (offset & 0x3fff)] = data; } -WRITE8_MEMBER(sega8_multicart_device::write_io) +void sega8_multicart_device::write_io(offs_t offset, uint8_t data) { if ((offset & 0xe0) == 0xe0) m_block = (data & 0x80) ? ((data & 0x1f) | ((data & 0x40) ? 0x20 : 0x00)) : 0x3f; @@ -1104,7 +1104,7 @@ WRITE8_MEMBER(sega8_multicart_device::write_io) -------------------------------------------------*/ -READ8_MEMBER(sega8_megacart_device::read_cart) +uint8_t sega8_megacart_device::read_cart(offs_t offset) { // 16K of RAM sits in 0x8000-0xbfff if (offset >= 0x8000) @@ -1113,24 +1113,24 @@ READ8_MEMBER(sega8_megacart_device::read_cart) return m_rom[(offset & 0x7fff) | (m_block << 15) % m_rom_size]; } -WRITE8_MEMBER(sega8_megacart_device::write_cart) +void sega8_megacart_device::write_cart(offs_t offset, uint8_t data) { // 16K of RAM sits in 0x8000-0xbfff if (offset >= 0x8000) m_ram[offset & 0x3fff] = data; } -READ8_MEMBER(sega8_megacart_device::read_ram) +uint8_t sega8_megacart_device::read_ram(offs_t offset) { return m_ram[0x4000 + (offset & 0x3fff)]; } -WRITE8_MEMBER(sega8_megacart_device::write_ram) +void sega8_megacart_device::write_ram(offs_t offset, uint8_t data) { m_ram[0x4000 + (offset & 0x3fff)] = data; } -WRITE8_MEMBER(sega8_megacart_device::write_io) +void sega8_megacart_device::write_io(offs_t offset, uint8_t data) { if ((offset & 0xe0) == 0xe0) m_block = (data & 0x1f) | (data & 0xc0) >> 1; diff --git a/src/devices/bus/sega8/rom.h b/src/devices/bus/sega8/rom.h index 4f9dc80d967..de4272a4253 100644 --- a/src/devices/bus/sega8/rom.h +++ b/src/devices/bus/sega8/rom.h @@ -20,9 +20,9 @@ public: virtual void late_bank_setup() override; // reading and writing - virtual DECLARE_READ8_MEMBER(read_cart) override; - virtual DECLARE_WRITE8_MEMBER(write_cart) override; - virtual DECLARE_WRITE8_MEMBER(write_mapper) override; + virtual uint8_t read_cart(offs_t offset) override; + virtual void write_cart(offs_t offset, uint8_t data) override; + virtual void write_mapper(offs_t offset, uint8_t data) override; protected: sega8_rom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -48,9 +48,9 @@ public: sega8_othello_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 DECLARE_WRITE8_MEMBER(write_mapper) override { } + virtual uint8_t read_cart(offs_t offset) override; + virtual void write_cart(offs_t offset, uint8_t data) override; + virtual void write_mapper(offs_t offset, uint8_t data) override { } }; @@ -63,9 +63,9 @@ public: sega8_castle_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 DECLARE_WRITE8_MEMBER(write_mapper) override { } + virtual uint8_t read_cart(offs_t offset) override; + virtual void write_cart(offs_t offset, uint8_t data) override; + virtual void write_mapper(offs_t offset, uint8_t data) override { } }; @@ -78,13 +78,13 @@ public: sega8_basic_l3_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 DECLARE_WRITE8_MEMBER(write_mapper) override { } + virtual uint8_t read_cart(offs_t offset) override; + virtual void write_cart(offs_t offset, uint8_t data) override; + virtual void write_mapper(offs_t offset, uint8_t data) override { } // has internal RAM which overwrites the system one! - 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; }; @@ -97,13 +97,13 @@ public: sega8_music_editor_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 DECLARE_WRITE8_MEMBER(write_mapper) override { } + virtual uint8_t read_cart(offs_t offset) override; + virtual void write_cart(offs_t offset, uint8_t data) override; + virtual void write_mapper(offs_t offset, uint8_t data) override { } // has internal RAM which overwrites the system one! - 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; }; @@ -123,9 +123,9 @@ public: required_ioport m_tvdraw_pen; // reading and writing - virtual DECLARE_READ8_MEMBER(read_cart) override; - virtual DECLARE_WRITE8_MEMBER(write_cart) override; - virtual DECLARE_WRITE8_MEMBER(write_mapper) override { } + virtual uint8_t read_cart(offs_t offset) override; + virtual void write_cart(offs_t offset, uint8_t data) override; + virtual void write_mapper(offs_t offset, uint8_t data) override { } protected: virtual void device_start() override; @@ -144,13 +144,13 @@ public: sega8_dahjee_typea_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 DECLARE_WRITE8_MEMBER(write_mapper) override { } + virtual uint8_t read_cart(offs_t offset) override; + virtual void write_cart(offs_t offset, uint8_t data) override; + virtual void write_mapper(offs_t offset, uint8_t data) override { } // has internal RAM which overwrites the system one! - 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; }; @@ -163,13 +163,13 @@ public: sega8_dahjee_typeb_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 DECLARE_WRITE8_MEMBER(write_mapper) override { } + virtual uint8_t read_cart(offs_t offset) override; + virtual void write_cart(offs_t offset, uint8_t data) override { } + virtual void write_mapper(offs_t offset, uint8_t data) override { } // has internal RAM which overwrites the system one! - 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; }; @@ -187,9 +187,9 @@ public: virtual void late_bank_setup() override; // reading and writing - virtual DECLARE_READ8_MEMBER(read_cart) override; - virtual DECLARE_WRITE8_MEMBER(write_cart) override; - virtual DECLARE_WRITE8_MEMBER(write_mapper) override; + virtual uint8_t read_cart(offs_t offset) override; + virtual void write_cart(offs_t offset, uint8_t data) override; + virtual void write_mapper(offs_t offset, uint8_t data) override; protected: virtual void device_start() override; @@ -218,8 +218,8 @@ public: virtual void late_bank_setup() override; // 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; // no mapper write for this! protected: @@ -242,8 +242,8 @@ public: sega8_4pak_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 @@ -267,8 +267,8 @@ public: virtual void late_bank_setup() override; // 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; // no mapper write for this! protected: @@ -308,9 +308,9 @@ public: virtual void late_bank_setup() override; // reading and writing - virtual DECLARE_READ8_MEMBER(read_cart) override; - virtual DECLARE_WRITE8_MEMBER(write_cart) override; - virtual DECLARE_WRITE8_MEMBER(write_mapper) override; + virtual uint8_t read_cart(offs_t offset) override; + virtual void write_cart(offs_t offset, uint8_t data) override; + virtual void write_mapper(offs_t offset, uint8_t data) override; protected: // device-level overrides @@ -331,9 +331,9 @@ public: virtual void late_bank_setup() override; // reading and writing - virtual DECLARE_READ8_MEMBER(read_cart) override; - virtual DECLARE_WRITE8_MEMBER(write_cart) override {} - virtual DECLARE_WRITE8_MEMBER(write_mapper) override; + virtual uint8_t read_cart(offs_t offset) override; + virtual void write_cart(offs_t offset, uint8_t data) override {} + virtual void write_mapper(offs_t offset, uint8_t data) override; protected: // device-level overrides @@ -354,8 +354,8 @@ public: virtual void late_bank_setup() override; // reading and writing - virtual DECLARE_WRITE8_MEMBER(write_cart) override; - virtual DECLARE_WRITE8_MEMBER(write_mapper) override {} + virtual void write_cart(offs_t offset, uint8_t data) override; + virtual void write_mapper(offs_t offset, uint8_t data) override {} }; @@ -368,7 +368,7 @@ public: sega8_korean_nb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_WRITE8_MEMBER(write_mapper) override {} + virtual void write_mapper(offs_t offset, uint8_t data) override {} }; @@ -381,11 +381,11 @@ public: sega8_seojin_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 DECLARE_WRITE8_MEMBER(write_mapper) override; - virtual DECLARE_READ8_MEMBER(read_ram) override; - virtual DECLARE_WRITE8_MEMBER(write_ram) override; + virtual uint8_t read_cart(offs_t offset) override; + virtual void write_cart(offs_t offset, uint8_t data) override; + virtual void write_mapper(offs_t offset, uint8_t data) 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 @@ -406,13 +406,13 @@ public: sega8_multicart_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 DECLARE_WRITE8_MEMBER(write_io) override; + virtual uint8_t read_cart(offs_t offset) override; + virtual void write_cart(offs_t offset, uint8_t data) override; + virtual void write_io(offs_t offset, uint8_t data) override; // has internal RAM which overwrites the system one! - 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 @@ -433,13 +433,13 @@ public: sega8_megacart_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 DECLARE_WRITE8_MEMBER(write_io) override; + virtual uint8_t read_cart(offs_t offset) override; + virtual void write_cart(offs_t offset, uint8_t data) override; + virtual void write_io(offs_t offset, uint8_t data) override; // has internal RAM which overwrites the system one! - 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/sega8/sega8_slot.cpp b/src/devices/bus/sega8/sega8_slot.cpp index caf1e6bb9d0..b60debfb961 100644 --- a/src/devices/bus/sega8/sega8_slot.cpp +++ b/src/devices/bus/sega8/sega8_slot.cpp @@ -685,26 +685,26 @@ std::string sega8_cart_slot_device::get_default_card_software(get_default_card_s read -------------------------------------------------*/ -READ8_MEMBER(sega8_cart_slot_device::read_cart) +uint8_t sega8_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; } -READ8_MEMBER(sega8_cart_slot_device::read_ram) +uint8_t sega8_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; } -READ8_MEMBER(sega8_cart_slot_device::read_io) +uint8_t sega8_cart_slot_device::read_io(offs_t offset) { if (m_cart) - return m_cart->read_io(space, offset); + return m_cart->read_io(offset); else return 0xff; } @@ -714,28 +714,28 @@ READ8_MEMBER(sega8_cart_slot_device::read_io) write -------------------------------------------------*/ -WRITE8_MEMBER(sega8_cart_slot_device::write_mapper) +void sega8_cart_slot_device::write_mapper(offs_t offset, uint8_t data) { if (m_cart) - m_cart->write_mapper(space, offset, data); + m_cart->write_mapper(offset, data); } -WRITE8_MEMBER(sega8_cart_slot_device::write_cart) +void sega8_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); } -WRITE8_MEMBER(sega8_cart_slot_device::write_ram) +void sega8_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); } -WRITE8_MEMBER(sega8_cart_slot_device::write_io) +void sega8_cart_slot_device::write_io(offs_t offset, uint8_t data) { if (m_cart) - m_cart->write_io(space, offset, data); + m_cart->write_io(offset, data); } diff --git a/src/devices/bus/sega8/sega8_slot.h b/src/devices/bus/sega8/sega8_slot.h index 5226b175d2a..9cca56c3ccf 100644 --- a/src/devices/bus/sega8/sega8_slot.h +++ b/src/devices/bus/sega8/sega8_slot.h @@ -51,16 +51,16 @@ public: virtual ~device_sega8_cart_interface(); // reading and writing - virtual DECLARE_READ8_MEMBER(read_cart) { return 0xff; } - virtual DECLARE_WRITE8_MEMBER(write_cart) { } - virtual DECLARE_WRITE8_MEMBER(write_mapper) { } + virtual uint8_t read_cart(offs_t offset) { return 0xff; } + virtual void write_cart(offs_t offset, uint8_t data) { } + virtual void write_mapper(offs_t offset, uint8_t data) { } virtual int get_lphaser_xoffs() { return m_lphaser_xoffs; } // a few carts (for SG1000) acts as a RAM expansion, taking control of the system RAM in 0xc000-0xffff - virtual DECLARE_READ8_MEMBER(read_ram) { return 0xff; } - virtual DECLARE_WRITE8_MEMBER(write_ram) { } + virtual uint8_t read_ram(offs_t offset) { return 0xff; } + virtual void write_ram(offs_t offset, uint8_t data) { } // the SC3000 has I/OR, I/OW lines connected - virtual DECLARE_READ8_MEMBER(read_io) { return 0xff; } - virtual DECLARE_WRITE8_MEMBER(write_io) { } + virtual uint8_t read_io(offs_t offset) { return 0xff; } + virtual void write_io(offs_t offset, uint8_t data) { } void rom_alloc(uint32_t size, const char *tag); void ram_alloc(uint32_t size); @@ -143,13 +143,13 @@ 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 DECLARE_WRITE8_MEMBER(write_mapper); - virtual DECLARE_READ8_MEMBER(read_ram); - virtual DECLARE_WRITE8_MEMBER(write_ram); - virtual DECLARE_READ8_MEMBER(read_io); - virtual DECLARE_WRITE8_MEMBER(write_io); + uint8_t read_cart(offs_t offset); + void write_cart(offs_t offset, uint8_t data); + void write_mapper(offs_t offset, uint8_t data); + uint8_t read_ram(offs_t offset); + void write_ram(offs_t offset, uint8_t data); + uint8_t read_io(offs_t offset); + void write_io(offs_t offset, uint8_t data); int get_lphaser_xoffs() { return m_cart ? m_cart->get_lphaser_xoffs() : -1; } int get_sms_mode() { return m_cart->get_sms_mode(); } diff --git a/src/devices/bus/sg1000_exp/fm_unit.cpp b/src/devices/bus/sg1000_exp/fm_unit.cpp index a7bdc4bcc5d..339b41254b2 100644 --- a/src/devices/bus/sg1000_exp/fm_unit.cpp +++ b/src/devices/bus/sg1000_exp/fm_unit.cpp @@ -102,7 +102,7 @@ void sega_fm_unit_device::device_reset() // peripheral_r - fm unit read //------------------------------------------------- -READ8_MEMBER(sega_fm_unit_device::peripheral_r) +uint8_t sega_fm_unit_device::peripheral_r(offs_t offset) { // the value previously written to the control port is returned on all // active read offsets. @@ -118,7 +118,7 @@ READ8_MEMBER(sega_fm_unit_device::peripheral_r) // peripheral_w - fm unit write //------------------------------------------------- -WRITE8_MEMBER(sega_fm_unit_device::peripheral_w) +void sega_fm_unit_device::peripheral_w(offs_t offset, uint8_t data) { switch (offset) { diff --git a/src/devices/bus/sg1000_exp/fm_unit.h b/src/devices/bus/sg1000_exp/fm_unit.h index cb1ddd072db..fd82eb3ec7e 100644 --- a/src/devices/bus/sg1000_exp/fm_unit.h +++ b/src/devices/bus/sg1000_exp/fm_unit.h @@ -38,8 +38,8 @@ protected: virtual void device_add_mconfig(machine_config &config) override; // device_sg1000_expansion_slot_interface overrides - virtual DECLARE_READ8_MEMBER(peripheral_r) override; - virtual DECLARE_WRITE8_MEMBER(peripheral_w) override; + virtual uint8_t peripheral_r(offs_t offset) override; + virtual void peripheral_w(offs_t offset, uint8_t data) override; virtual bool is_readable(uint8_t offset) override; virtual bool is_writeable(uint8_t offset) override; void set_audio_control(uint8_t data); diff --git a/src/devices/bus/sg1000_exp/sg1000exp.cpp b/src/devices/bus/sg1000_exp/sg1000exp.cpp index f245586d88a..ad568d7cb27 100644 --- a/src/devices/bus/sg1000_exp/sg1000exp.cpp +++ b/src/devices/bus/sg1000_exp/sg1000exp.cpp @@ -86,18 +86,18 @@ void sg1000_expansion_slot_device::device_start() // has only 3 address lines (A0, A1, A2). -READ8_MEMBER(sg1000_expansion_slot_device::read) +uint8_t sg1000_expansion_slot_device::read(offs_t offset) { uint8_t data = 0xff; if (m_device) - data = m_device->peripheral_r(space, offset & 0x07); + data = m_device->peripheral_r(offset & 0x07); return data; } -WRITE8_MEMBER(sg1000_expansion_slot_device::write) +void sg1000_expansion_slot_device::write(offs_t offset, uint8_t data) { if (m_device) - m_device->peripheral_w(space, offset & 0x07, data); + m_device->peripheral_w(offset & 0x07, data); } diff --git a/src/devices/bus/sg1000_exp/sg1000exp.h b/src/devices/bus/sg1000_exp/sg1000exp.h index aab9f766656..d297e255d97 100644 --- a/src/devices/bus/sg1000_exp/sg1000exp.h +++ b/src/devices/bus/sg1000_exp/sg1000exp.h @@ -40,8 +40,8 @@ public: sg1000_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); virtual ~sg1000_expansion_slot_device(); - DECLARE_READ8_MEMBER(read); - DECLARE_WRITE8_MEMBER(write); + uint8_t read(offs_t offset); + void write(offs_t offset, uint8_t data); bool is_readable(uint8_t offset); bool is_writeable(uint8_t offset); @@ -63,8 +63,8 @@ public: // construction/destruction virtual ~device_sg1000_expansion_slot_interface(); - virtual DECLARE_READ8_MEMBER(peripheral_r) { return 0xff; } - virtual DECLARE_WRITE8_MEMBER(peripheral_w) { } + virtual uint8_t peripheral_r(offs_t offset) { return 0xff; } + virtual void peripheral_w(offs_t offset, uint8_t data) { } virtual bool is_readable(uint8_t offset) { return true; } virtual bool is_writeable(uint8_t offset) { return true; } diff --git a/src/devices/bus/sg1000_exp/sk1100.cpp b/src/devices/bus/sg1000_exp/sk1100.cpp index c02b86d5994..e9165c971f5 100644 --- a/src/devices/bus/sg1000_exp/sk1100.cpp +++ b/src/devices/bus/sg1000_exp/sk1100.cpp @@ -187,8 +187,8 @@ sega_sk1100_device::sega_sk1100_device(const machine_config &mconfig, const char m_cassette(*this, "cassette"), m_ppi(*this, UPD9255_0_TAG), m_printer_port(*this, "printer"), - m_pa(*this, {"PA0", "PA1", "PA2", "PA3", "PA4", "PA5", "PA6", "PA7"}), - m_pb(*this, {"PB0", "PB1", "PB2", "PB3", "PB4", "PB5", "PB6", "PB7"}), + m_pa(*this, "PA%u", 0U), + m_pb(*this, "PB%u", 0U), m_keylatch(0) { } @@ -209,7 +209,7 @@ void sega_sk1100_device::device_start() // peripheral_r - keyboard read //------------------------------------------------- -READ8_MEMBER(sega_sk1100_device::peripheral_r) +uint8_t sega_sk1100_device::peripheral_r(offs_t offset) { return m_ppi->read(offset & 0x03); } @@ -219,7 +219,7 @@ READ8_MEMBER(sega_sk1100_device::peripheral_r) // peripheral_w - keyboard write //------------------------------------------------- -WRITE8_MEMBER(sega_sk1100_device::peripheral_w) +void sega_sk1100_device::peripheral_w(offs_t offset, uint8_t data) { m_ppi->write(offset & 0x03, data); } diff --git a/src/devices/bus/sg1000_exp/sk1100.h b/src/devices/bus/sg1000_exp/sk1100.h index 0fa78b06af7..f2e94920e22 100644 --- a/src/devices/bus/sg1000_exp/sk1100.h +++ b/src/devices/bus/sg1000_exp/sk1100.h @@ -44,8 +44,8 @@ protected: virtual void device_add_mconfig(machine_config &config) override; // device_sg1000_expansion_slot_interface overrides - virtual DECLARE_READ8_MEMBER(peripheral_r) override; - virtual DECLARE_WRITE8_MEMBER(peripheral_w) override; + virtual uint8_t peripheral_r(offs_t offset) override; + virtual void peripheral_w(offs_t offset, uint8_t data) override; virtual bool is_readable(uint8_t offset) override; private: diff --git a/src/devices/bus/sms_exp/gender.cpp b/src/devices/bus/sms_exp/gender.cpp index 227aae8a1da..87bb97ea7a2 100644 --- a/src/devices/bus/sms_exp/gender.cpp +++ b/src/devices/bus/sms_exp/gender.cpp @@ -56,14 +56,14 @@ void sms_gender_adapter_device::device_start() // read //------------------------------------------------- -READ8_MEMBER(sms_gender_adapter_device::read) +uint8_t sms_gender_adapter_device::read(offs_t offset) { - return m_subslot->read_cart(space, offset); + return m_subslot->read_cart(offset); } -READ8_MEMBER(sms_gender_adapter_device::read_ram) +uint8_t sms_gender_adapter_device::read_ram(offs_t offset) { - return m_subslot->read_ram(space, offset); + return m_subslot->read_ram(offset); } int sms_gender_adapter_device::get_lphaser_xoffs() @@ -76,19 +76,19 @@ int sms_gender_adapter_device::get_lphaser_xoffs() // write //------------------------------------------------- -WRITE8_MEMBER(sms_gender_adapter_device::write_mapper) +void sms_gender_adapter_device::write_mapper(offs_t offset, uint8_t data) { - m_subslot->write_mapper(space, offset, data); + m_subslot->write_mapper(offset, data); } -WRITE8_MEMBER(sms_gender_adapter_device::write) +void sms_gender_adapter_device::write(offs_t offset, uint8_t data) { - m_subslot->write_cart(space, offset, data); + m_subslot->write_cart(offset, data); } -WRITE8_MEMBER(sms_gender_adapter_device::write_ram) +void sms_gender_adapter_device::write_ram(offs_t offset, uint8_t data) { - m_subslot->write_ram(space, offset, data); + m_subslot->write_ram(offset, data); } //------------------------------------------------- diff --git a/src/devices/bus/sms_exp/gender.h b/src/devices/bus/sms_exp/gender.h index 5bc93cbad5c..7620d5c5cec 100644 --- a/src/devices/bus/sms_exp/gender.h +++ b/src/devices/bus/sms_exp/gender.h @@ -31,11 +31,11 @@ public: sms_gender_adapter_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // device_sms_expansion_slot_interface overrides - virtual DECLARE_READ8_MEMBER(read) override; - virtual DECLARE_WRITE8_MEMBER(write) override; - virtual DECLARE_WRITE8_MEMBER(write_mapper) override; - virtual DECLARE_READ8_MEMBER(read_ram) override; - virtual DECLARE_WRITE8_MEMBER(write_ram) override; + virtual uint8_t read(offs_t offset) override; + virtual void write(offs_t offset, uint8_t data) override; + virtual void write_mapper(offs_t offset, uint8_t data) override; + virtual uint8_t read_ram(offs_t offset) override; + virtual void write_ram(offs_t offset, uint8_t data) override; virtual int get_lphaser_xoffs() override; diff --git a/src/devices/bus/sms_exp/smsexp.h b/src/devices/bus/sms_exp/smsexp.h index 1169bf3f58a..1fb6a709468 100644 --- a/src/devices/bus/sms_exp/smsexp.h +++ b/src/devices/bus/sms_exp/smsexp.h @@ -29,11 +29,11 @@ public: virtual ~device_sms_expansion_slot_interface(); // reading and writing - virtual DECLARE_READ8_MEMBER(read) { return 0xff; } - virtual DECLARE_WRITE8_MEMBER(write) { } - virtual DECLARE_WRITE8_MEMBER(write_mapper) { } - virtual DECLARE_READ8_MEMBER(read_ram) { return 0xff; } - virtual DECLARE_WRITE8_MEMBER(write_ram) { } + virtual uint8_t read(offs_t offset) { return 0xff; } + virtual void write(offs_t offset, uint8_t data) { } + virtual void write_mapper(offs_t offset, uint8_t data) { } + virtual uint8_t read_ram(offs_t offset) { return 0xff; } + virtual void write_ram(offs_t offset, uint8_t data) { } virtual int get_lphaser_xoffs() { return 0; } @@ -61,11 +61,11 @@ public: virtual ~sms_expansion_slot_device(); // reading and writing - DECLARE_READ8_MEMBER(read) { return m_device ? m_device->read(space, offset, mem_mask) : 0xff; } - DECLARE_WRITE8_MEMBER(write) { if (m_device) m_device->write(space, offset, data, mem_mask); } - DECLARE_WRITE8_MEMBER(write_mapper) { if (m_device) m_device->write_mapper(space, offset, data, mem_mask); } - DECLARE_READ8_MEMBER(read_ram) { return m_device ? m_device->read_ram(space, offset, mem_mask) : 0xff; } - DECLARE_WRITE8_MEMBER(write_ram) { if (m_device) m_device->write_ram(space, offset, data, mem_mask); } + uint8_t read(offs_t offset) { return m_device ? m_device->read(offset) : 0xff; } + void write(offs_t offset, uint8_t data) { if (m_device) m_device->write(offset, data); } + void write_mapper(offs_t offset, uint8_t data) { if (m_device) m_device->write_mapper(offset, data); } + uint8_t read_ram(offs_t offset) { return m_device ? m_device->read_ram(offset) : 0xff; } + void write_ram(offs_t offset, uint8_t data) { if (m_device) m_device->write_ram(offset, data); } int get_lphaser_xoffs() { return m_device ? m_device->get_lphaser_xoffs() : 0; } |