diff options
Diffstat (limited to 'src/devices/bus/pce')
-rw-r--r-- | src/devices/bus/pce/pce_rom.cpp | 18 | ||||
-rw-r--r-- | src/devices/bus/pce/pce_rom.h | 18 | ||||
-rw-r--r-- | src/devices/bus/pce/pce_slot.cpp | 8 | ||||
-rw-r--r-- | src/devices/bus/pce/pce_slot.h | 8 |
4 files changed, 26 insertions, 26 deletions
diff --git a/src/devices/bus/pce/pce_rom.cpp b/src/devices/bus/pce/pce_rom.cpp index cb4070d14a1..4522e850426 100644 --- a/src/devices/bus/pce/pce_rom.cpp +++ b/src/devices/bus/pce/pce_rom.cpp @@ -125,14 +125,14 @@ void pce_tennokoe_device::nvram_write(emu_file &file) mapper specific handlers -------------------------------------------------*/ -READ8_MEMBER(pce_rom_device::read_cart) +uint8_t pce_rom_device::read_cart(offs_t offset) { int bank = offset / 0x20000; return m_rom[rom_bank_map[bank] * 0x20000 + (offset & 0x1ffff)]; } -READ8_MEMBER(pce_cdsys3_device::read_cart) +uint8_t pce_cdsys3_device::read_cart(offs_t offset) { int bank = offset / 0x20000; if (!m_ram.empty() && offset >= 0xd0000) @@ -141,14 +141,14 @@ READ8_MEMBER(pce_cdsys3_device::read_cart) return m_rom[rom_bank_map[bank] * 0x20000 + (offset & 0x1ffff)]; } -WRITE8_MEMBER(pce_cdsys3_device::write_cart) +void pce_cdsys3_device::write_cart(offs_t offset, uint8_t data) { if (!m_ram.empty() && offset >= 0xd0000) m_ram[offset - 0xd0000] = data; } -READ8_MEMBER(pce_populous_device::read_cart) +uint8_t pce_populous_device::read_cart(offs_t offset) { int bank = offset / 0x20000; if (!m_ram.empty() && offset >= 0x80000 && offset < 0x88000) @@ -157,14 +157,14 @@ READ8_MEMBER(pce_populous_device::read_cart) return m_rom[rom_bank_map[bank] * 0x20000 + (offset & 0x1ffff)]; } -WRITE8_MEMBER(pce_populous_device::write_cart) +void pce_populous_device::write_cart(offs_t offset, uint8_t data) { if (!m_ram.empty() && offset >= 0x80000 && offset < 0x88000) m_ram[offset & 0x7fff] = data; } -READ8_MEMBER(pce_sf2_device::read_cart) +uint8_t pce_sf2_device::read_cart(offs_t offset) { if (offset < 0x80000) return m_rom[offset]; @@ -172,13 +172,13 @@ READ8_MEMBER(pce_sf2_device::read_cart) return m_rom[0x80000 + m_bank_base * 0x80000 + (offset & 0x7ffff)]; } -WRITE8_MEMBER(pce_sf2_device::write_cart) +void pce_sf2_device::write_cart(offs_t offset, uint8_t data) { if (offset >= 0x1ff0 && offset < 0x1ff4) m_bank_base = offset & 3; } -READ8_MEMBER(pce_tennokoe_device::read_cart) +uint8_t pce_tennokoe_device::read_cart(offs_t offset) { switch((offset & 0xf0000) >> 16) { @@ -202,7 +202,7 @@ READ8_MEMBER(pce_tennokoe_device::read_cart) return 0xff; } -WRITE8_MEMBER(pce_tennokoe_device::write_cart) +void pce_tennokoe_device::write_cart(offs_t offset, uint8_t data) { switch((offset & 0xf0000) >> 16) { diff --git a/src/devices/bus/pce/pce_rom.h b/src/devices/bus/pce/pce_rom.h index 7521e764d03..8d77b94e0e9 100644 --- a/src/devices/bus/pce/pce_rom.h +++ b/src/devices/bus/pce/pce_rom.h @@ -19,7 +19,7 @@ public: pce_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_cart) override; + virtual uint8_t read_cart(offs_t offset) override; protected: pce_rom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); @@ -38,8 +38,8 @@ public: pce_cdsys3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_cart) override; - virtual DECLARE_WRITE8_MEMBER(write_cart) override; + virtual uint8_t read_cart(offs_t offset) override; + virtual void write_cart(offs_t offset, uint8_t data) override; }; @@ -52,8 +52,8 @@ public: pce_populous_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_cart) override; - virtual DECLARE_WRITE8_MEMBER(write_cart) override; + virtual uint8_t read_cart(offs_t offset) override; + virtual void write_cart(offs_t offset, uint8_t data) override; }; @@ -66,8 +66,8 @@ public: pce_sf2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_cart) override; - virtual DECLARE_WRITE8_MEMBER(write_cart) override; + virtual uint8_t read_cart(offs_t offset) override; + virtual void write_cart(offs_t offset, uint8_t data) override; protected: // device-level overrides @@ -88,8 +88,8 @@ public: pce_tennokoe_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // reading and writing - virtual DECLARE_READ8_MEMBER(read_cart) override; - virtual DECLARE_WRITE8_MEMBER(write_cart) override; + virtual uint8_t read_cart(offs_t offset) override; + virtual void write_cart(offs_t offset, uint8_t data) override; protected: // device-level overrides diff --git a/src/devices/bus/pce/pce_slot.cpp b/src/devices/bus/pce/pce_slot.cpp index 70ab09e23c1..4a9dd78bd98 100644 --- a/src/devices/bus/pce/pce_slot.cpp +++ b/src/devices/bus/pce/pce_slot.cpp @@ -344,10 +344,10 @@ std::string pce_cart_slot_device::get_default_card_software(get_default_card_sof read -------------------------------------------------*/ -READ8_MEMBER(pce_cart_slot_device::read_cart) +uint8_t pce_cart_slot_device::read_cart(offs_t offset) { if (m_cart) - return m_cart->read_cart(space, offset); + return m_cart->read_cart(offset); else return 0xff; } @@ -356,8 +356,8 @@ READ8_MEMBER(pce_cart_slot_device::read_cart) write -------------------------------------------------*/ -WRITE8_MEMBER(pce_cart_slot_device::write_cart) +void pce_cart_slot_device::write_cart(offs_t offset, uint8_t data) { if (m_cart) - m_cart->write_cart(space, offset, data); + m_cart->write_cart(offset, data); } diff --git a/src/devices/bus/pce/pce_slot.h b/src/devices/bus/pce/pce_slot.h index cabff4f47e3..79934087a0e 100644 --- a/src/devices/bus/pce/pce_slot.h +++ b/src/devices/bus/pce/pce_slot.h @@ -34,8 +34,8 @@ public: virtual ~device_pce_cart_interface(); // reading and writing - virtual DECLARE_READ8_MEMBER(read_cart) { return 0xff; } - virtual DECLARE_WRITE8_MEMBER(write_cart) {}; + virtual uint8_t read_cart(offs_t offset) { return 0xff; } + virtual void write_cart(offs_t offset, uint8_t data) {}; void rom_alloc(uint32_t size, const char *tag); void ram_alloc(uint32_t size); @@ -102,8 +102,8 @@ public: void set_intf(const char * interface) { m_interface = interface; } // reading and writing - virtual DECLARE_READ8_MEMBER(read_cart); - virtual DECLARE_WRITE8_MEMBER(write_cart); + uint8_t read_cart(offs_t offset); + void write_cart(offs_t offset, uint8_t data); protected: // device-level overrides |