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/saturn | |
parent | e96ed3b0ebd5920e8aff2914a6ff28b435210717 (diff) |
finally retired the READ8/16/32/64 and WRITE8/16/32/64 macros (nw)
Diffstat (limited to 'src/devices/bus/saturn')
-rw-r--r-- | src/devices/bus/saturn/bram.cpp | 4 | ||||
-rw-r--r-- | src/devices/bus/saturn/bram.h | 4 | ||||
-rw-r--r-- | src/devices/bus/saturn/dram.cpp | 8 | ||||
-rw-r--r-- | src/devices/bus/saturn/dram.h | 8 | ||||
-rw-r--r-- | src/devices/bus/saturn/rom.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/saturn/rom.h | 2 | ||||
-rw-r--r-- | src/devices/bus/saturn/sat_slot.cpp | 28 | ||||
-rw-r--r-- | src/devices/bus/saturn/sat_slot.h | 28 |
8 files changed, 42 insertions, 42 deletions
diff --git a/src/devices/bus/saturn/bram.cpp b/src/devices/bus/saturn/bram.cpp index cdcc7ad4376..4fac71dcd83 100644 --- a/src/devices/bus/saturn/bram.cpp +++ b/src/devices/bus/saturn/bram.cpp @@ -81,7 +81,7 @@ void saturn_bram_device::nvram_default() // Battery RAM: single chip -READ32_MEMBER(saturn_bram_device::read_ext_bram) +uint32_t saturn_bram_device::read_ext_bram(offs_t offset) { if (offset < m_ext_bram.size()/2) return (m_ext_bram[offset * 2] << 16) | m_ext_bram[offset * 2 + 1]; @@ -92,7 +92,7 @@ READ32_MEMBER(saturn_bram_device::read_ext_bram) } } -WRITE32_MEMBER(saturn_bram_device::write_ext_bram) +void saturn_bram_device::write_ext_bram(offs_t offset, uint32_t data, uint32_t mem_mask) { if (offset < m_ext_bram.size()/2) { diff --git a/src/devices/bus/saturn/bram.h b/src/devices/bus/saturn/bram.h index a295bc78333..71ff5f0ace9 100644 --- a/src/devices/bus/saturn/bram.h +++ b/src/devices/bus/saturn/bram.h @@ -14,8 +14,8 @@ class saturn_bram_device : public device_t, { public: // reading and writing - virtual DECLARE_READ32_MEMBER(read_ext_bram) override; - virtual DECLARE_WRITE32_MEMBER(write_ext_bram) override; + virtual uint32_t read_ext_bram(offs_t offset) override; + virtual void write_ext_bram(offs_t offset, uint32_t data, uint32_t mem_mask = ~0) override; protected: // construction/destruction diff --git a/src/devices/bus/saturn/dram.cpp b/src/devices/bus/saturn/dram.cpp index 6d574dc28e3..c0380752aea 100644 --- a/src/devices/bus/saturn/dram.cpp +++ b/src/devices/bus/saturn/dram.cpp @@ -55,7 +55,7 @@ void saturn_dram_device::device_reset() // RAM: two DRAM chips are present in the cart, thus accesses only go up to m_size/2! -READ32_MEMBER(saturn_dram_device::read_ext_dram0) +uint32_t saturn_dram_device::read_ext_dram0(offs_t offset) { if (offset < (0x400000/2)/4) return m_ext_dram0[offset % m_ext_dram0.size()]; @@ -66,7 +66,7 @@ READ32_MEMBER(saturn_dram_device::read_ext_dram0) } } -READ32_MEMBER(saturn_dram_device::read_ext_dram1) +uint32_t saturn_dram_device::read_ext_dram1(offs_t offset) { if (offset < (0x400000/2)/4) return m_ext_dram1[offset % m_ext_dram1.size()]; @@ -77,7 +77,7 @@ READ32_MEMBER(saturn_dram_device::read_ext_dram1) } } -WRITE32_MEMBER(saturn_dram_device::write_ext_dram0) +void saturn_dram_device::write_ext_dram0(offs_t offset, uint32_t data, uint32_t mem_mask) { if (offset < (0x400000/2)/4) COMBINE_DATA(&m_ext_dram0[offset % m_ext_dram0.size()]); @@ -85,7 +85,7 @@ WRITE32_MEMBER(saturn_dram_device::write_ext_dram0) popmessage("DRAM0 write beyond its boundary! offs: %X data: %X\n", offset, data); } -WRITE32_MEMBER(saturn_dram_device::write_ext_dram1) +void saturn_dram_device::write_ext_dram1(offs_t offset, uint32_t data, uint32_t mem_mask) { if (offset < (0x400000/2)/4) COMBINE_DATA(&m_ext_dram1[offset % m_ext_dram1.size()]); diff --git a/src/devices/bus/saturn/dram.h b/src/devices/bus/saturn/dram.h index 1bef596993a..847c90a9955 100644 --- a/src/devices/bus/saturn/dram.h +++ b/src/devices/bus/saturn/dram.h @@ -13,10 +13,10 @@ class saturn_dram_device : public device_t, { public: // reading and writing - virtual DECLARE_READ32_MEMBER(read_ext_dram0) override; - virtual DECLARE_READ32_MEMBER(read_ext_dram1) override; - virtual DECLARE_WRITE32_MEMBER(write_ext_dram0) override; - virtual DECLARE_WRITE32_MEMBER(write_ext_dram1) override; + virtual uint32_t read_ext_dram0(offs_t offset) override; + virtual uint32_t read_ext_dram1(offs_t offset) override; + virtual void write_ext_dram0(offs_t offset, uint32_t data, uint32_t mem_mask = ~0) override; + virtual void write_ext_dram1(offs_t offset, uint32_t data, uint32_t mem_mask = ~0) override; protected: // construction/destruction diff --git a/src/devices/bus/saturn/rom.cpp b/src/devices/bus/saturn/rom.cpp index 1421018c298..5853a7b4bdb 100644 --- a/src/devices/bus/saturn/rom.cpp +++ b/src/devices/bus/saturn/rom.cpp @@ -47,7 +47,7 @@ void saturn_rom_device::device_reset() mapper specific handlers -------------------------------------------------*/ -READ32_MEMBER(saturn_rom_device::read_rom) +uint32_t saturn_rom_device::read_rom(offs_t offset) { return m_rom[offset & (m_rom_size/4 - 1)]; } diff --git a/src/devices/bus/saturn/rom.h b/src/devices/bus/saturn/rom.h index 0fc8f2ecbea..0706a74a420 100644 --- a/src/devices/bus/saturn/rom.h +++ b/src/devices/bus/saturn/rom.h @@ -15,7 +15,7 @@ public: saturn_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; + virtual uint32_t read_rom(offs_t offset) override; protected: saturn_rom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, int cart_type); diff --git a/src/devices/bus/saturn/sat_slot.cpp b/src/devices/bus/saturn/sat_slot.cpp index a7357681958..955e3478f3e 100644 --- a/src/devices/bus/saturn/sat_slot.cpp +++ b/src/devices/bus/saturn/sat_slot.cpp @@ -219,34 +219,34 @@ int sat_cart_slot_device::get_cart_type() read -------------------------------------------------*/ -READ32_MEMBER(sat_cart_slot_device::read_rom) +uint32_t sat_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(sat_cart_slot_device::read_ext_dram0) +uint32_t sat_cart_slot_device::read_ext_dram0(offs_t offset) { if (m_cart) - return m_cart->read_ext_dram0(space, offset, mem_mask); + return m_cart->read_ext_dram0(offset); else return 0xffffffff; } -READ32_MEMBER(sat_cart_slot_device::read_ext_dram1) +uint32_t sat_cart_slot_device::read_ext_dram1(offs_t offset) { if (m_cart) - return m_cart->read_ext_dram1(space, offset, mem_mask); + return m_cart->read_ext_dram1(offset); else return 0xffffffff; } -READ32_MEMBER(sat_cart_slot_device::read_ext_bram) +uint32_t sat_cart_slot_device::read_ext_bram(offs_t offset) { if (m_cart) - return m_cart->read_ext_bram(space, offset, mem_mask); + return m_cart->read_ext_bram(offset); else return 0xffffffff; } @@ -255,20 +255,20 @@ READ32_MEMBER(sat_cart_slot_device::read_ext_bram) write -------------------------------------------------*/ -WRITE32_MEMBER(sat_cart_slot_device::write_ext_dram0) +void sat_cart_slot_device::write_ext_dram0(offs_t offset, uint32_t data, uint32_t mem_mask) { if (m_cart) - m_cart->write_ext_dram0(space, offset, data, mem_mask); + m_cart->write_ext_dram0(offset, data, mem_mask); } -WRITE32_MEMBER(sat_cart_slot_device::write_ext_dram1) +void sat_cart_slot_device::write_ext_dram1(offs_t offset, uint32_t data, uint32_t mem_mask) { if (m_cart) - m_cart->write_ext_dram1(space, offset, data, mem_mask); + m_cart->write_ext_dram1(offset, data, mem_mask); } -WRITE32_MEMBER(sat_cart_slot_device::write_ext_bram) +void sat_cart_slot_device::write_ext_bram(offs_t offset, uint32_t data, uint32_t mem_mask) { if (m_cart) - m_cart->write_ext_bram(space, offset, data, mem_mask); + m_cart->write_ext_bram(offset, data, mem_mask); } diff --git a/src/devices/bus/saturn/sat_slot.h b/src/devices/bus/saturn/sat_slot.h index dca26d7e8ae..9193cc2aa20 100644 --- a/src/devices/bus/saturn/sat_slot.h +++ b/src/devices/bus/saturn/sat_slot.h @@ -19,15 +19,15 @@ public: virtual ~device_sat_cart_interface(); // reading from ROM - virtual DECLARE_READ32_MEMBER(read_rom) { return 0xffffffff; } + virtual uint32_t read_rom(offs_t offset) { return 0xffffffff; } // reading and writing to Extended DRAM chips - virtual DECLARE_READ32_MEMBER(read_ext_dram0) { return 0xffffffff; } - virtual DECLARE_WRITE32_MEMBER(write_ext_dram0) { } - virtual DECLARE_READ32_MEMBER(read_ext_dram1) { return 0xffffffff; } - virtual DECLARE_WRITE32_MEMBER(write_ext_dram1) { } + virtual uint32_t read_ext_dram0(offs_t offset) { return 0xffffffff; } + virtual void write_ext_dram0(offs_t offset, uint32_t data, uint32_t mem_mask = ~0) { } + virtual uint32_t read_ext_dram1(offs_t offset) { return 0xffffffff; } + virtual void write_ext_dram1(offs_t offset, uint32_t data, uint32_t mem_mask = ~0) { } // reading and writing to Extended BRAM chip - virtual DECLARE_READ32_MEMBER(read_ext_bram) { return 0xffffffff; } - virtual DECLARE_WRITE32_MEMBER(write_ext_bram) { } + virtual uint32_t read_ext_bram(offs_t offset) { return 0xffffffff; } + virtual void write_ext_bram(offs_t offset, uint32_t data, uint32_t mem_mask = ~0) { } int get_cart_type() const { return m_cart_type; } @@ -98,13 +98,13 @@ public: int get_cart_type(); // reading and writing - virtual DECLARE_READ32_MEMBER(read_rom); - virtual DECLARE_READ32_MEMBER(read_ext_dram0); - virtual DECLARE_WRITE32_MEMBER(write_ext_dram0); - virtual DECLARE_READ32_MEMBER(read_ext_dram1); - virtual DECLARE_WRITE32_MEMBER(write_ext_dram1); - virtual DECLARE_READ32_MEMBER(read_ext_bram); - virtual DECLARE_WRITE32_MEMBER(write_ext_bram); + virtual uint32_t read_rom(offs_t offset); + virtual uint32_t read_ext_dram0(offs_t offset); + virtual void write_ext_dram0(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + virtual uint32_t read_ext_dram1(offs_t offset); + virtual void write_ext_dram1(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); + virtual uint32_t read_ext_bram(offs_t offset); + virtual void write_ext_bram(offs_t offset, uint32_t data, uint32_t mem_mask = ~0); protected: // device-level overrides |