diff options
author | 2020-05-21 22:38:18 -0400 | |
---|---|---|
committer | 2020-05-21 22:38:18 -0400 | |
commit | f95267bf5e215e0f140407fecaf7c16c7da90f81 (patch) | |
tree | 4b2da8dca374c2e247ca84a841af34d09648fb65 /src/devices/bus/astrocde | |
parent | 363485b628f370714ea065fcbd2484d7e0510c1e (diff) |
Various buses and associated drivers: Simplify handler signatures (nw)
Diffstat (limited to 'src/devices/bus/astrocde')
-rw-r--r-- | src/devices/bus/astrocde/exp.cpp | 16 | ||||
-rw-r--r-- | src/devices/bus/astrocde/exp.h | 16 | ||||
-rw-r--r-- | src/devices/bus/astrocde/ram.cpp | 20 | ||||
-rw-r--r-- | src/devices/bus/astrocde/ram.h | 20 | ||||
-rw-r--r-- | src/devices/bus/astrocde/rom.cpp | 8 | ||||
-rw-r--r-- | src/devices/bus/astrocde/rom.h | 8 | ||||
-rw-r--r-- | src/devices/bus/astrocde/slot.cpp | 4 | ||||
-rw-r--r-- | src/devices/bus/astrocde/slot.h | 4 |
8 files changed, 48 insertions, 48 deletions
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 |