diff options
Diffstat (limited to 'src/devices/bus/m5/slot.h')
-rw-r--r-- | src/devices/bus/m5/slot.h | 34 |
1 files changed, 13 insertions, 21 deletions
diff --git a/src/devices/bus/m5/slot.h b/src/devices/bus/m5/slot.h index 105bc7c71d2..afd727eed60 100644 --- a/src/devices/bus/m5/slot.h +++ b/src/devices/bus/m5/slot.h @@ -5,7 +5,7 @@ #pragma once -#include "softlist_dev.h" +#include "imagedev/cartrom.h" /*************************************************************************** @@ -35,9 +35,9 @@ public: virtual ~device_m5_cart_interface(); // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom) { return 0xff; } - virtual DECLARE_READ8_MEMBER(read_ram) { return 0xff; } - virtual DECLARE_WRITE8_MEMBER(write_ram) {} + virtual uint8_t read_rom(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) {} void rom_alloc(uint32_t size, const char *tag); void ram_alloc(uint32_t size); @@ -61,7 +61,7 @@ protected: // ======================> m5_cart_slot_device class m5_cart_slot_device : public device_t, - public device_image_interface, + public device_cartrom_image_interface, public device_single_card_slot_interface<device_m5_cart_interface> { public: @@ -79,20 +79,15 @@ public: m5_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); virtual ~m5_cart_slot_device(); - // image-level overrides - virtual image_init_result call_load() override; + // device_image_interface implementation + virtual std::pair<std::error_condition, std::string> call_load() override; virtual void call_unload() override { } - virtual iodevice_t image_type() const noexcept override { return IO_CARTSLOT; } - virtual bool is_readable() const noexcept override { return true; } - virtual bool is_writeable() const noexcept override { return false; } - virtual bool is_creatable() const noexcept override { return false; } - virtual bool must_be_loaded() const noexcept override { return false; } virtual bool is_reset_on_load() const noexcept override { return true; } virtual const char *image_interface() const noexcept override { return "m5_cart"; } virtual const char *file_extensions() const noexcept override { return "bin,rom"; } - // slot interface overrides + // device_slot_interface implementation virtual std::string get_default_card_software(get_default_card_software_hook &hook) const override; int get_type() { return m_type; } @@ -100,19 +95,16 @@ public: void save_ram() { if (m_cart && m_cart->get_ram_size()) m_cart->save_ram(); } // reading and writing - virtual DECLARE_READ8_MEMBER(read_rom); - virtual DECLARE_READ8_MEMBER(read_ram); - virtual DECLARE_WRITE8_MEMBER(write_ram); + uint8_t read_rom(offs_t offset); + uint8_t read_ram(offs_t offset); + void write_ram(offs_t offset, uint8_t data); protected: - // device-level overrides + // device_t implementation virtual void device_start() override; - // device_image_interface implementation - virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); } - int m_type; - device_m5_cart_interface* m_cart; + device_m5_cart_interface *m_cart; }; |