From 97b67170277437131adf6ed4d60139c172529e4f Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Tue, 26 Mar 2019 11:13:37 +1100 Subject: (nw) Clean up the mess on master MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This effectively reverts b380514764cf857469bae61c11143a19f79a74c5 and c24473ddff715ecec2e258a6eb38960cf8c8e98e, restoring the state at 598cd5227223c3b04ca31f0dbc1981256d9ea3ff. Before pushing, please check that what you're about to push is sane. Check your local commit log and ensure there isn't anything out-of-place before pushing to mainline. When things like this happen, it wastes everyone's time. I really don't need this in a week when real work™ is busting my balls and I'm behind where I want to be with preparing for MAME release. --- src/devices/bus/generic/ram.cpp | 8 ++++---- src/devices/bus/generic/ram.h | 8 ++++---- src/devices/bus/generic/rom.cpp | 16 ++++++++-------- src/devices/bus/generic/rom.h | 16 ++++++++-------- src/devices/bus/generic/slot.cpp | 20 ++++++++++---------- src/devices/bus/generic/slot.h | 20 ++++++++++---------- 6 files changed, 44 insertions(+), 44 deletions(-) (limited to 'src/devices/bus/generic') diff --git a/src/devices/bus/generic/ram.cpp b/src/devices/bus/generic/ram.cpp index 601db4d0470..1c9a63d7306 100644 --- a/src/devices/bus/generic/ram.cpp +++ b/src/devices/bus/generic/ram.cpp @@ -97,7 +97,7 @@ void generic_ram_linear_device::device_start() mapper specific handlers -------------------------------------------------*/ -READ8_MEMBER(generic_ram_plain_device::read_ram) +uint8_t generic_ram_plain_device::read_ram(offs_t offset) { if (offset < m_ram.size()) return m_ram[offset]; @@ -105,19 +105,19 @@ READ8_MEMBER(generic_ram_plain_device::read_ram) return 0xff; } -WRITE8_MEMBER(generic_ram_plain_device::write_ram) +void generic_ram_plain_device::write_ram(offs_t offset, uint8_t data) { if (offset < m_ram.size()) m_ram[offset] = data; } -READ8_MEMBER(generic_ram_linear_device::read_ram) +uint8_t generic_ram_linear_device::read_ram(offs_t offset) { return m_ram[offset % m_ram.size()]; } -WRITE8_MEMBER(generic_ram_linear_device::write_ram) +void generic_ram_linear_device::write_ram(offs_t offset, uint8_t data) { m_ram[offset % m_ram.size()] = data; } diff --git a/src/devices/bus/generic/ram.h b/src/devices/bus/generic/ram.h index aa8323ba8af..5cd8c8092b0 100644 --- a/src/devices/bus/generic/ram.h +++ b/src/devices/bus/generic/ram.h @@ -14,8 +14,8 @@ class generic_ram_plain_device : public device_t, public device_generic_cart_int { public: // 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: // construction/destruction @@ -35,8 +35,8 @@ class generic_ram_linear_device : public device_t, public device_generic_cart_in { public: // 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: // construction/destruction diff --git a/src/devices/bus/generic/rom.cpp b/src/devices/bus/generic/rom.cpp index 3a63b1f90dc..e52854d5b64 100644 --- a/src/devices/bus/generic/rom.cpp +++ b/src/devices/bus/generic/rom.cpp @@ -61,7 +61,7 @@ generic_romram_plain_device::generic_romram_plain_device(const machine_config &m mapper specific handlers -------------------------------------------------*/ -READ8_MEMBER(generic_rom_plain_device::read_rom) +uint8_t generic_rom_plain_device::read_rom(offs_t offset) { if (offset < m_rom_size) return m_rom[offset]; @@ -69,7 +69,7 @@ READ8_MEMBER(generic_rom_plain_device::read_rom) return 0xff; } -READ16_MEMBER(generic_rom_plain_device::read16_rom) +uint16_t generic_rom_plain_device::read16_rom(offs_t offset, uint16_t mem_mask) { uint16_t *ROM = (uint16_t *)m_rom; if (offset < m_rom_size/2) @@ -78,7 +78,7 @@ READ16_MEMBER(generic_rom_plain_device::read16_rom) return 0xffff; } -READ32_MEMBER(generic_rom_plain_device::read32_rom) +uint32_t generic_rom_plain_device::read32_rom(offs_t offset, uint32_t mem_mask) { uint32_t *ROM = (uint32_t *)m_rom; if (offset < m_rom_size/4) @@ -88,25 +88,25 @@ READ32_MEMBER(generic_rom_plain_device::read32_rom) } -READ8_MEMBER(generic_rom_linear_device::read_rom) +uint8_t generic_rom_linear_device::read_rom(offs_t offset) { return m_rom[offset % m_rom_size]; } -READ16_MEMBER(generic_rom_linear_device::read16_rom) +uint16_t generic_rom_linear_device::read16_rom(offs_t offset, uint16_t mem_mask) { uint16_t *ROM = (uint16_t *)m_rom; return ROM[offset % (m_rom_size/2)]; } -READ32_MEMBER(generic_rom_linear_device::read32_rom) +uint32_t generic_rom_linear_device::read32_rom(offs_t offset, uint32_t mem_mask) { uint32_t *ROM = (uint32_t *)m_rom; return ROM[offset % (m_rom_size/4)]; } -READ8_MEMBER(generic_romram_plain_device::read_ram) +uint8_t generic_romram_plain_device::read_ram(offs_t offset) { if (offset < m_ram.size()) return m_ram[offset]; @@ -114,7 +114,7 @@ READ8_MEMBER(generic_romram_plain_device::read_ram) return 0xff; } -WRITE8_MEMBER(generic_romram_plain_device::write_ram) +void generic_romram_plain_device::write_ram(offs_t offset, uint8_t data) { if (offset < m_ram.size()) m_ram[offset] = data; diff --git a/src/devices/bus/generic/rom.h b/src/devices/bus/generic/rom.h index 2fc1011c25b..6c5df5d4bf4 100644 --- a/src/devices/bus/generic/rom.h +++ b/src/devices/bus/generic/rom.h @@ -30,9 +30,9 @@ public: generic_rom_plain_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_READ16_MEMBER(read16_rom) override; - virtual DECLARE_READ32_MEMBER(read32_rom) override; + virtual uint8_t read_rom(offs_t offset) override; + virtual uint16_t read16_rom(offs_t offset, uint16_t mem_mask) override; + virtual uint32_t read32_rom(offs_t offset, uint32_t mem_mask) override; protected: generic_rom_plain_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -48,8 +48,8 @@ public: generic_romram_plain_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; }; @@ -62,9 +62,9 @@ public: generic_rom_linear_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_READ16_MEMBER(read16_rom) override; - virtual DECLARE_READ32_MEMBER(read32_rom) override; + virtual uint8_t read_rom(offs_t offset) override; + virtual uint16_t read16_rom(offs_t offset, uint16_t mem_mask) override; + virtual uint32_t read32_rom(offs_t offset, uint32_t mem_mask) override; }; diff --git a/src/devices/bus/generic/slot.cpp b/src/devices/bus/generic/slot.cpp index 8e7e3a4cdab..557e1d8dcef 100644 --- a/src/devices/bus/generic/slot.cpp +++ b/src/devices/bus/generic/slot.cpp @@ -216,10 +216,10 @@ void generic_slot_device::common_load_rom(uint8_t *ROM, uint32_t len, const char read_rom -------------------------------------------------*/ -READ8_MEMBER(generic_slot_device::read_rom) +uint8_t generic_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; } @@ -228,10 +228,10 @@ READ8_MEMBER(generic_slot_device::read_rom) read16_rom -------------------------------------------------*/ -READ16_MEMBER(generic_slot_device::read16_rom) +uint16_t generic_slot_device::read16_rom(offs_t offset, uint16_t mem_mask) { if (m_cart) - return m_cart->read16_rom(space, offset, mem_mask); + return m_cart->read16_rom(offset, mem_mask); else return 0xffff; } @@ -240,10 +240,10 @@ READ16_MEMBER(generic_slot_device::read16_rom) read32_rom -------------------------------------------------*/ -READ32_MEMBER(generic_slot_device::read32_rom) +uint32_t generic_slot_device::read32_rom(offs_t offset, uint32_t mem_mask) { if (m_cart) - return m_cart->read32_rom(space, offset, mem_mask); + return m_cart->read32_rom(offset, mem_mask); else return 0xffffffff; } @@ -252,10 +252,10 @@ READ32_MEMBER(generic_slot_device::read32_rom) read_ram -------------------------------------------------*/ -READ8_MEMBER(generic_slot_device::read_ram) +uint8_t generic_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; } @@ -264,8 +264,8 @@ READ8_MEMBER(generic_slot_device::read_ram) write_ram -------------------------------------------------*/ -WRITE8_MEMBER(generic_slot_device::write_ram) +void generic_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/generic/slot.h b/src/devices/bus/generic/slot.h index d0c0d84a053..3fac098afb7 100644 --- a/src/devices/bus/generic/slot.h +++ b/src/devices/bus/generic/slot.h @@ -22,12 +22,12 @@ public: virtual ~device_generic_cart_interface(); // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom) { return 0xff; } - virtual DECLARE_READ16_MEMBER(read16_rom) { return 0xffff; } - virtual DECLARE_READ32_MEMBER(read32_rom) { return 0xffffffff; } + virtual uint8_t read_rom(offs_t offset) { return 0xff; } + virtual uint16_t read16_rom(offs_t offset, uint16_t mem_mask) { return 0xffff; } + virtual uint32_t read32_rom(offs_t offset, uint32_t mem_mask) { return 0xffffffff; } - 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) {} virtual void rom_alloc(size_t size, int width, endianness_t end, const char *tag); virtual void ram_alloc(uint32_t size); @@ -138,12 +138,12 @@ public: virtual std::string get_default_card_software(get_default_card_software_hook &hook) const override; // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom); - virtual DECLARE_READ16_MEMBER(read16_rom); - virtual DECLARE_READ32_MEMBER(read32_rom); + virtual uint8_t read_rom(offs_t offset); + virtual uint16_t read16_rom(offs_t offset, uint16_t mem_mask = 0xffff); + virtual uint32_t read32_rom(offs_t offset, uint32_t mem_mask = 0xffffffff); - virtual DECLARE_READ8_MEMBER(read_ram); - virtual DECLARE_WRITE8_MEMBER(write_ram); + virtual uint8_t read_ram(offs_t offset); + virtual void write_ram(offs_t offset, uint8_t data); virtual void rom_alloc(size_t size, int width, endianness_t end) { if (m_cart) m_cart->rom_alloc(size, width, end, tag()); } virtual void ram_alloc(uint32_t size) { if (m_cart) m_cart->ram_alloc(size); } -- cgit v1.2.3-70-g09d2