diff options
author | 2020-06-18 20:13:33 +0200 | |
---|---|---|
committer | 2020-06-18 20:13:33 +0200 | |
commit | 57cf17dc52bcd4571a68576dd6597ddf9fae41a8 (patch) | |
tree | 9fef8bce07d80de37886a6dc44c340da05517388 /src/devices/bus/gba | |
parent | e96ed3b0ebd5920e8aff2914a6ff28b435210717 (diff) |
finally retired the READ8/16/32/64 and WRITE8/16/32/64 macros (nw)
Diffstat (limited to 'src/devices/bus/gba')
-rw-r--r-- | src/devices/bus/gba/gba_slot.cpp | 20 | ||||
-rw-r--r-- | src/devices/bus/gba/gba_slot.h | 32 | ||||
-rw-r--r-- | src/devices/bus/gba/rom.cpp | 30 | ||||
-rw-r--r-- | src/devices/bus/gba/rom.h | 32 |
4 files changed, 57 insertions, 57 deletions
diff --git a/src/devices/bus/gba/gba_slot.cpp b/src/devices/bus/gba/gba_slot.cpp index 4510800c8e7..629557768ed 100644 --- a/src/devices/bus/gba/gba_slot.cpp +++ b/src/devices/bus/gba/gba_slot.cpp @@ -901,26 +901,26 @@ std::string gba_cart_slot_device::get_default_card_software(get_default_card_sof read -------------------------------------------------*/ -READ32_MEMBER(gba_cart_slot_device::read_rom) +uint32_t gba_cart_slot_device::read_rom(offs_t offset) { if (m_cart) - return m_cart->read_rom(space, offset, mem_mask); + return m_cart->read_rom(offset); else return 0xffffffff; } -READ32_MEMBER(gba_cart_slot_device::read_ram) +uint32_t gba_cart_slot_device::read_ram(offs_t offset, uint32_t mem_mask) { if (m_cart) - return m_cart->read_ram(space, offset, mem_mask); + return m_cart->read_ram(offset, mem_mask); else return 0xffffffff; } -READ32_MEMBER(gba_cart_slot_device::read_gpio) +uint32_t gba_cart_slot_device::read_gpio(offs_t offset, uint32_t mem_mask) { if (m_cart) - return m_cart->read_gpio(space, offset, mem_mask); + return m_cart->read_gpio(offset, mem_mask); else return 0xffffffff; } @@ -930,14 +930,14 @@ READ32_MEMBER(gba_cart_slot_device::read_gpio) write -------------------------------------------------*/ -WRITE32_MEMBER(gba_cart_slot_device::write_ram) +void gba_cart_slot_device::write_ram(offs_t offset, uint32_t data, uint32_t mem_mask) { if (m_cart) - m_cart->write_ram(space, offset, data, mem_mask); + m_cart->write_ram(offset, data, mem_mask); } -WRITE32_MEMBER(gba_cart_slot_device::write_gpio) +void gba_cart_slot_device::write_gpio(offs_t offset, uint32_t data, uint32_t mem_mask) { if (m_cart) - m_cart->write_gpio(space, offset, data, mem_mask); + m_cart->write_gpio(offset, data, mem_mask); } diff --git a/src/devices/bus/gba/gba_slot.h b/src/devices/bus/gba/gba_slot.h index 8395028cdfb..32e935af71c 100644 --- a/src/devices/bus/gba/gba_slot.h +++ b/src/devices/bus/gba/gba_slot.h @@ -43,14 +43,14 @@ public: virtual ~device_gba_cart_interface(); // reading and writing - virtual DECLARE_READ32_MEMBER(read_rom) { return 0xffffffff; } - virtual DECLARE_READ32_MEMBER(read_ram) { return 0xffffffff; } - virtual DECLARE_READ32_MEMBER(read_gpio) { return 0; } - virtual DECLARE_READ32_MEMBER(read_tilt) { return 0xffffffff; } - virtual DECLARE_WRITE32_MEMBER(write_ram) { } - virtual DECLARE_WRITE32_MEMBER(write_gpio) { } - virtual DECLARE_WRITE32_MEMBER(write_tilt) { } - virtual DECLARE_WRITE32_MEMBER(write_mapper) { } + virtual uint32_t read_rom(offs_t offset) { return 0xffffffff; } + virtual uint32_t read_ram(offs_t offset, uint32_t mem_mask = ~0) { return 0xffffffff; } + virtual uint32_t read_gpio(offs_t offset, uint32_t mem_mask = ~0) { return 0; } + virtual uint32_t read_tilt(offs_t offset, uint32_t mem_mask = ~0) { return 0xffffffff; } + virtual void write_ram(offs_t offset, uint32_t data, uint32_t mem_mask = ~0) { } + virtual void write_gpio(offs_t offset, uint32_t data, uint32_t mem_mask = ~0) { } + virtual void write_tilt(offs_t offset, uint32_t data) { } + virtual void write_mapper(offs_t offset, uint32_t data) { } void rom_alloc(uint32_t size, const char *tag); void nvram_alloc(uint32_t size); @@ -120,14 +120,14 @@ public: uint32_t get_rom_size() { if (m_cart) return m_cart->get_rom_size(); return 0; } // reading and writing - virtual DECLARE_READ32_MEMBER(read_rom); - virtual DECLARE_READ32_MEMBER(read_ram); - virtual DECLARE_READ32_MEMBER(read_gpio); - virtual DECLARE_READ32_MEMBER(read_tilt) { if (m_cart) return m_cart->read_tilt(space, offset, mem_mask); else return 0xffffffff; } - virtual DECLARE_WRITE32_MEMBER(write_ram); - virtual DECLARE_WRITE32_MEMBER(write_gpio); - virtual DECLARE_WRITE32_MEMBER(write_tilt) { if (m_cart) m_cart->write_tilt(space, offset, data, mem_mask); } - virtual DECLARE_WRITE32_MEMBER(write_mapper) { if (m_cart) m_cart->write_mapper(space, offset, data, mem_mask); } + virtual uint32_t read_rom(offs_t offset); + virtual uint32_t read_ram(offs_t offset, uint32_t mem_mask = ~0); + virtual uint32_t read_gpio(offs_t offset, uint32_t mem_mask = ~0); + virtual uint32_t read_tilt(offs_t offset, uint32_t mem_mask = ~0) { if (m_cart) return m_cart->read_tilt(offset); else return 0xffffffff; } + virtual void write_ram(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + virtual void write_gpio(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + virtual void write_tilt(offs_t offset, uint32_t data) { if (m_cart) m_cart->write_tilt(offset, data); } + virtual void write_mapper(offs_t offset, uint32_t data) { if (m_cart) m_cart->write_mapper(offset, data); } protected: // device-level overrides diff --git a/src/devices/bus/gba/rom.cpp b/src/devices/bus/gba/rom.cpp index 91fb6648ebf..378ed1d03cf 100644 --- a/src/devices/bus/gba/rom.cpp +++ b/src/devices/bus/gba/rom.cpp @@ -286,7 +286,7 @@ void gba_rom_3dmatrix_device::device_reset() cart types. -------------------------------------------------*/ -READ32_MEMBER(gba_rom_device::read_gpio) +uint32_t gba_rom_device::read_gpio(offs_t offset, uint32_t mem_mask) { if (!m_gpio_write_only) { @@ -313,7 +313,7 @@ READ32_MEMBER(gba_rom_device::read_gpio) return m_rom[offset + 0xc4/4]; } -WRITE32_MEMBER(gba_rom_device::write_gpio) +void gba_rom_device::write_gpio(offs_t offset, uint32_t data, uint32_t mem_mask) { switch (offset) { @@ -346,7 +346,7 @@ WRITE32_MEMBER(gba_rom_device::write_gpio) Carts with SRAM -------------------------------------------------*/ -READ32_MEMBER(gba_rom_sram_device::read_ram) +uint32_t gba_rom_sram_device::read_ram(offs_t offset, uint32_t mem_mask) { if (!m_nvram.empty() && offset < m_nvram.size()) return m_nvram[offset]; @@ -354,7 +354,7 @@ READ32_MEMBER(gba_rom_sram_device::read_ram) return 0xffffffff; } -WRITE32_MEMBER(gba_rom_sram_device::write_ram) +void gba_rom_sram_device::write_ram(offs_t offset, uint32_t data, uint32_t mem_mask) { if (!m_nvram.empty() && offset < m_nvram.size()) COMBINE_DATA(&m_nvram[offset]); @@ -425,7 +425,7 @@ void gba_rom_flash_device::device_add_mconfig(machine_config &config) } -READ32_MEMBER(gba_rom_flash_device::read_ram) +uint32_t gba_rom_flash_device::read_ram(offs_t offset, uint32_t mem_mask) { uint32_t rv = 0; @@ -443,7 +443,7 @@ READ32_MEMBER(gba_rom_flash_device::read_ram) return rv; } -WRITE32_MEMBER(gba_rom_flash_device::write_ram) +void gba_rom_flash_device::write_ram(offs_t offset, uint32_t data, uint32_t mem_mask) { offset &= m_flash_mask; @@ -472,7 +472,7 @@ void gba_rom_flash1m_device::device_add_mconfig(machine_config &config) } -READ32_MEMBER(gba_rom_flash1m_device::read_ram) +uint32_t gba_rom_flash1m_device::read_ram(offs_t offset, uint32_t mem_mask) { uint32_t rv = 0; @@ -490,7 +490,7 @@ READ32_MEMBER(gba_rom_flash1m_device::read_ram) return rv; } -WRITE32_MEMBER(gba_rom_flash1m_device::write_ram) +void gba_rom_flash1m_device::write_ram(offs_t offset, uint32_t data, uint32_t mem_mask) { offset &= m_flash_mask; @@ -541,7 +541,7 @@ void gba_rom_flash1m_rtc_device::gpio_dev_write(uint16_t data, int gpio_dirs) Carts with EEPROM -------------------------------------------------*/ -READ32_MEMBER(gba_rom_eeprom_device::read_ram) +uint32_t gba_rom_eeprom_device::read_ram(offs_t offset, uint32_t mem_mask) { // Larger games have smaller access to EERPOM content if (m_rom_size > (16 * 1024 * 1024) && offset < 0xffff00/4) @@ -550,7 +550,7 @@ READ32_MEMBER(gba_rom_eeprom_device::read_ram) return m_eeprom->read(); } -WRITE32_MEMBER(gba_rom_eeprom_device::write_ram) +void gba_rom_eeprom_device::write_ram(offs_t offset, uint32_t data, uint32_t mem_mask) { // Larger games have smaller access to EEPROM content if (m_rom_size > (16 * 1024 * 1024) && offset < 0xffff00/4) @@ -562,7 +562,7 @@ WRITE32_MEMBER(gba_rom_eeprom_device::write_ram) m_eeprom->write(data); } -READ32_MEMBER(gba_rom_eeprom64_device::read_ram) +uint32_t gba_rom_eeprom64_device::read_ram(offs_t offset, uint32_t mem_mask) { // Larger games have smaller access to EERPOM content if (m_rom_size > (16 * 1024 * 1024) && offset < 0xffff00/4) @@ -571,7 +571,7 @@ READ32_MEMBER(gba_rom_eeprom64_device::read_ram) return m_eeprom->read(); } -WRITE32_MEMBER(gba_rom_eeprom64_device::write_ram) +void gba_rom_eeprom64_device::write_ram(offs_t offset, uint32_t data, uint32_t mem_mask) { // Larger games have smaller access to EEPROM content if (m_rom_size > (16 * 1024 * 1024) && offset < 0xffff00/4) @@ -614,7 +614,7 @@ ioport_constructor gba_rom_yoshiug_device::device_input_ports() const } -READ32_MEMBER(gba_rom_yoshiug_device::read_tilt) +uint32_t gba_rom_yoshiug_device::read_tilt(offs_t offset, uint32_t mem_mask) { switch (offset) { @@ -640,7 +640,7 @@ READ32_MEMBER(gba_rom_yoshiug_device::read_tilt) return 0xffffffff; } -WRITE32_MEMBER(gba_rom_yoshiug_device::write_tilt) +void gba_rom_yoshiug_device::write_tilt(offs_t offset, uint32_t data) { switch (offset) { @@ -743,7 +743,7 @@ void gba_rom_boktai_device::gpio_dev_write(uint16_t data, int gpio_dirs) the cart "range" is accessible...) -------------------------------------------------*/ -WRITE32_MEMBER(gba_rom_3dmatrix_device::write_mapper) +void gba_rom_3dmatrix_device::write_mapper(offs_t offset, uint32_t data) { //printf("mapper write 0x%.8X - 0x%X\n", offset, data); fflush(stdout); switch (offset & 3) diff --git a/src/devices/bus/gba/rom.h b/src/devices/bus/gba/rom.h index 30e3c08ce9d..3a1ac4005a1 100644 --- a/src/devices/bus/gba/rom.h +++ b/src/devices/bus/gba/rom.h @@ -91,10 +91,10 @@ public: gba_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ32_MEMBER(read_rom) override { return m_rom[offset]; } + virtual uint32_t read_rom(offs_t offset) override { return m_rom[offset]; } - virtual DECLARE_READ32_MEMBER(read_gpio) override; - virtual DECLARE_WRITE32_MEMBER(write_gpio) override; + virtual uint32_t read_gpio(offs_t offset, uint32_t mem_mask = ~0) override; + virtual void write_gpio(offs_t offset, uint32_t data, uint32_t mem_mask = ~0) override; virtual uint16_t gpio_dev_read(int gpio_dirs) { return 0; } virtual void gpio_dev_write(uint16_t data, int gpio_dirs) { } @@ -121,8 +121,8 @@ public: gba_rom_sram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ32_MEMBER(read_ram) override; - virtual DECLARE_WRITE32_MEMBER(write_ram) override; + virtual uint32_t read_ram(offs_t offset, uint32_t mem_mask = ~0) override; + virtual void write_ram(offs_t offset, uint32_t data, uint32_t mem_mask = ~0) override; protected: gba_rom_sram_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -183,8 +183,8 @@ public: gba_rom_flash_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ32_MEMBER(read_ram) override; - virtual DECLARE_WRITE32_MEMBER(write_ram) override; + virtual uint32_t read_ram(offs_t offset, uint32_t mem_mask = ~0) override; + virtual void write_ram(offs_t offset, uint32_t data, uint32_t mem_mask = ~0) override; protected: gba_rom_flash_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -229,8 +229,8 @@ public: gba_rom_flash1m_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ32_MEMBER(read_ram) override; - virtual DECLARE_WRITE32_MEMBER(write_ram) override; + virtual uint32_t read_ram(offs_t offset, uint32_t mem_mask = ~0) override; + virtual void write_ram(offs_t offset, uint32_t data, uint32_t mem_mask = ~0) override; protected: gba_rom_flash1m_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -275,8 +275,8 @@ public: gba_rom_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ32_MEMBER(read_ram) override; - virtual DECLARE_WRITE32_MEMBER(write_ram) override; + virtual uint32_t read_ram(offs_t offset, uint32_t mem_mask = ~0) override; + virtual void write_ram(offs_t offset, uint32_t data, uint32_t mem_mask = ~0) override; protected: gba_rom_eeprom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -301,8 +301,8 @@ public: virtual ioport_constructor device_input_ports() const override; // reading and writing - virtual DECLARE_READ32_MEMBER(read_tilt) override; - virtual DECLARE_WRITE32_MEMBER(write_tilt) override; + virtual uint32_t read_tilt(offs_t offset, uint32_t mem_mask = ~0) override; + virtual void write_tilt(offs_t offset, uint32_t data) override; protected: virtual void device_start() override; @@ -325,8 +325,8 @@ public: gba_rom_eeprom64_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ32_MEMBER(read_ram) override; - virtual DECLARE_WRITE32_MEMBER(write_ram) override; + virtual uint32_t read_ram(offs_t offset, uint32_t mem_mask = ~0) override; + virtual void write_ram(offs_t offset, uint32_t data, uint32_t mem_mask = ~0) override; protected: gba_rom_eeprom64_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -372,7 +372,7 @@ public: gba_rom_3dmatrix_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_WRITE32_MEMBER(write_mapper) override; + virtual void write_mapper(offs_t offset, uint32_t data) override; protected: // device-level overrides |