diff options
Diffstat (limited to 'src/devices/bus/wswan')
-rw-r--r-- | src/devices/bus/wswan/rom.cpp | 26 | ||||
-rw-r--r-- | src/devices/bus/wswan/rom.h | 20 | ||||
-rw-r--r-- | src/devices/bus/wswan/slot.cpp | 28 | ||||
-rw-r--r-- | src/devices/bus/wswan/slot.h | 28 |
4 files changed, 51 insertions, 51 deletions
diff --git a/src/devices/bus/wswan/rom.cpp b/src/devices/bus/wswan/rom.cpp index 4ba57a44fe4..c4c991212b6 100644 --- a/src/devices/bus/wswan/rom.cpp +++ b/src/devices/bus/wswan/rom.cpp @@ -205,26 +205,26 @@ void ws_rom_device::device_timer(emu_timer &timer, device_timer_id id, int param mapper specific handlers -------------------------------------------------*/ -READ8_MEMBER(ws_rom_device::read_rom20) +uint8_t ws_rom_device::read_rom20(offs_t offset) { return m_rom[offset + m_base20]; } -READ8_MEMBER(ws_rom_device::read_rom30) +uint8_t ws_rom_device::read_rom30(offs_t offset) { return m_rom[offset + m_base30]; } -READ8_MEMBER(ws_rom_device::read_rom40) +uint8_t ws_rom_device::read_rom40(offs_t offset) { // we still need to mask in some cases, e.g. when game is 512K return m_rom[(offset + m_base40) & (m_rom_size - 1)]; } -READ8_MEMBER(ws_rom_device::read_io) +uint8_t ws_rom_device::read_io(offs_t offset) { uint8_t value = m_io_regs[offset]; @@ -254,7 +254,7 @@ READ8_MEMBER(ws_rom_device::read_io) return value; } -WRITE8_MEMBER(ws_rom_device::write_io) +void ws_rom_device::write_io(offs_t offset, uint8_t data) { switch (offset) { @@ -344,30 +344,30 @@ WRITE8_MEMBER(ws_rom_device::write_io) m_io_regs[offset] = data; } -READ8_MEMBER(ws_rom_sram_device::read_ram) +uint8_t ws_rom_sram_device::read_ram(offs_t offset) { return m_nvram[m_nvram_base + offset]; } -WRITE8_MEMBER(ws_rom_sram_device::write_ram) +void ws_rom_sram_device::write_ram(offs_t offset, uint8_t data) { m_nvram[m_nvram_base + offset] = data; } -WRITE8_MEMBER(ws_rom_sram_device::write_io) +void ws_rom_sram_device::write_io(offs_t offset, uint8_t data) { switch (offset) { case 0x01: // SRAM bank to select m_nvram_base = (data * 0x10000) & (m_nvram.size() - 1); default: - ws_rom_device::write_io(space, offset, data); + ws_rom_device::write_io(offset, data); break; } } -READ8_MEMBER(ws_rom_eeprom_device::read_io) +uint8_t ws_rom_eeprom_device::read_io(offs_t offset) { uint8_t value = m_io_regs[offset]; @@ -381,14 +381,14 @@ READ8_MEMBER(ws_rom_eeprom_device::read_io) // EEPROM reads, taken from regs break; default: - value = ws_rom_device::read_io(space, offset); + value = ws_rom_device::read_io(offset); break; } return value; } -WRITE8_MEMBER(ws_rom_eeprom_device::write_io) +void ws_rom_eeprom_device::write_io(offs_t offset, uint8_t data) { switch (offset) { @@ -530,7 +530,7 @@ WRITE8_MEMBER(ws_rom_eeprom_device::write_io) break; default: - ws_rom_device::write_io(space, offset, data); + ws_rom_device::write_io(offset, data); break; } diff --git a/src/devices/bus/wswan/rom.h b/src/devices/bus/wswan/rom.h index ae420667c8f..916562ab6e2 100644 --- a/src/devices/bus/wswan/rom.h +++ b/src/devices/bus/wswan/rom.h @@ -16,11 +16,11 @@ public: ws_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom20) override; - virtual DECLARE_READ8_MEMBER(read_rom30) override; - virtual DECLARE_READ8_MEMBER(read_rom40) override; - virtual DECLARE_READ8_MEMBER(read_io) override; - virtual DECLARE_WRITE8_MEMBER(write_io) override; + virtual uint8_t read_rom20(offs_t offset) override; + virtual uint8_t read_rom30(offs_t offset) override; + virtual uint8_t read_rom40(offs_t offset) override; + virtual uint8_t read_io(offs_t offset) override; + virtual void write_io(offs_t offset, uint8_t data) override; protected: static constexpr device_timer_id TIMER_RTC = 0; @@ -59,9 +59,9 @@ public: ws_rom_sram_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 DECLARE_WRITE8_MEMBER(write_io) override; + virtual uint8_t read_ram(offs_t offset) override; + virtual void write_ram(offs_t offset, uint8_t data) override; + virtual void write_io(offs_t offset, uint8_t data) override; protected: // device-level overrides @@ -82,8 +82,8 @@ public: ws_rom_eeprom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_io) override; - virtual DECLARE_WRITE8_MEMBER(write_io) override; + virtual uint8_t read_io(offs_t offset) override; + virtual void write_io(offs_t offset, uint8_t data) override; protected: // device-level overrides diff --git a/src/devices/bus/wswan/slot.cpp b/src/devices/bus/wswan/slot.cpp index 45df7c195bf..731c0967e1e 100644 --- a/src/devices/bus/wswan/slot.cpp +++ b/src/devices/bus/wswan/slot.cpp @@ -312,10 +312,10 @@ std::string ws_cart_slot_device::get_default_card_software(get_default_card_soft read_rom20 -------------------------------------------------*/ -READ8_MEMBER(ws_cart_slot_device::read_rom20) +uint8_t ws_cart_slot_device::read_rom20(offs_t offset) { if (m_cart) - return m_cart->read_rom20(space, offset); + return m_cart->read_rom20(offset); else return 0xff; } @@ -324,10 +324,10 @@ READ8_MEMBER(ws_cart_slot_device::read_rom20) read_rom30 -------------------------------------------------*/ -READ8_MEMBER(ws_cart_slot_device::read_rom30) +uint8_t ws_cart_slot_device::read_rom30(offs_t offset) { if (m_cart) - return m_cart->read_rom30(space, offset); + return m_cart->read_rom30(offset); else return 0xff; } @@ -336,10 +336,10 @@ READ8_MEMBER(ws_cart_slot_device::read_rom30) read_rom40 -------------------------------------------------*/ -READ8_MEMBER(ws_cart_slot_device::read_rom40) +uint8_t ws_cart_slot_device::read_rom40(offs_t offset) { if (m_cart) - return m_cart->read_rom40(space, offset); + return m_cart->read_rom40(offset); else return 0xff; } @@ -348,10 +348,10 @@ READ8_MEMBER(ws_cart_slot_device::read_rom40) read_ram -------------------------------------------------*/ -READ8_MEMBER(ws_cart_slot_device::read_ram) +uint8_t ws_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; } @@ -360,20 +360,20 @@ READ8_MEMBER(ws_cart_slot_device::read_ram) write_ram -------------------------------------------------*/ -WRITE8_MEMBER(ws_cart_slot_device::write_ram) +void ws_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); } /*------------------------------------------------- read_io -------------------------------------------------*/ -READ8_MEMBER(ws_cart_slot_device::read_io) +uint8_t ws_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; } @@ -382,10 +382,10 @@ READ8_MEMBER(ws_cart_slot_device::read_io) write_io -------------------------------------------------*/ -WRITE8_MEMBER(ws_cart_slot_device::write_io) +void ws_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/wswan/slot.h b/src/devices/bus/wswan/slot.h index 1992d858553..219a4bb3fe8 100644 --- a/src/devices/bus/wswan/slot.h +++ b/src/devices/bus/wswan/slot.h @@ -31,13 +31,13 @@ public: virtual ~device_ws_cart_interface(); // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom20) { return 0xff; } - virtual DECLARE_READ8_MEMBER(read_rom30) { return 0xff; } - virtual DECLARE_READ8_MEMBER(read_rom40) { return 0xff; } - virtual DECLARE_READ8_MEMBER(read_ram) { return 0xff; } - virtual DECLARE_WRITE8_MEMBER(write_ram) {} - virtual DECLARE_READ8_MEMBER(read_io) { return 0xff; } - virtual DECLARE_WRITE8_MEMBER(write_io) { } + virtual uint8_t read_rom20(offs_t offset) { return 0xff; } + virtual uint8_t read_rom30(offs_t offset) { return 0xff; } + virtual uint8_t read_rom40(offs_t offset) { return 0xff; } + virtual uint8_t read_ram(offs_t offset) { return 0xff; } + virtual void write_ram(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) { } void rom_alloc(uint32_t size, const char *tag); void nvram_alloc(uint32_t size); @@ -109,13 +109,13 @@ public: virtual std::string get_default_card_software(get_default_card_software_hook &hook) const override; // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom20); - virtual DECLARE_READ8_MEMBER(read_rom30); - virtual DECLARE_READ8_MEMBER(read_rom40); - virtual DECLARE_READ8_MEMBER(read_ram); - virtual DECLARE_WRITE8_MEMBER(write_ram); - virtual DECLARE_READ8_MEMBER(read_io); - virtual DECLARE_WRITE8_MEMBER(write_io); + virtual uint8_t read_rom20(offs_t offset); + virtual uint8_t read_rom30(offs_t offset); + virtual uint8_t read_rom40(offs_t offset); + virtual uint8_t read_ram(offs_t offset); + virtual void write_ram(offs_t offset, uint8_t data); + virtual uint8_t read_io(offs_t offset); + virtual void write_io(offs_t offset, uint8_t data); protected: // device-level overrides |