diff options
Diffstat (limited to 'src/devices/bus/mc10/mc10_cart.h')
-rw-r--r-- | src/devices/bus/mc10/mc10_cart.h | 35 |
1 files changed, 13 insertions, 22 deletions
diff --git a/src/devices/bus/mc10/mc10_cart.h b/src/devices/bus/mc10/mc10_cart.h index eba93284325..16e946e1e3e 100644 --- a/src/devices/bus/mc10/mc10_cart.h +++ b/src/devices/bus/mc10/mc10_cart.h @@ -13,7 +13,7 @@ #pragma once -#include "softlist_dev.h" +#include "imagedev/cartrom.h" /*************************************************************************** TYPE DEFINITIONS @@ -25,10 +25,9 @@ class device_mc10cart_interface; class mc10cart_slot_device final : public device_t, public device_single_card_slot_interface<device_mc10cart_interface>, - public device_image_interface + public device_cartrom_image_interface { public: - // construction/destruction template <typename T> mc10cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock, T &&opts, const char *dflt) @@ -47,21 +46,11 @@ public: auto nmi_callback() { return m_nmi_callback.bind(); } // address map manipulations - address_space &memspace() const { return *m_memspace; }; - - // device-level overrides - virtual void device_start() override; - - // image-level overrides - virtual image_init_result call_load() override; - virtual const software_list_loader &get_software_list_loader() const override { return rom_software_list_loader::instance(); } + address_space &memspace() const { return *m_memspace; } - virtual iodevice_t image_type() const noexcept override { return IO_CARTSLOT; } + // device_image_interface implementation + virtual std::pair<std::error_condition, std::string> call_load() override; - 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 "mc10_cart"; } virtual const char *file_extensions() const noexcept override { return "mcc,rom"; } @@ -70,16 +59,18 @@ public: void set_nmi_line(int state); devcb_write_line m_nmi_callback; - // slot interface overrides + // device_slot_interface implementation virtual std::string get_default_card_software(get_default_card_software_hook &hook) const override; -private: +protected: + // device_t implementation + virtual void device_start() override; + required_address_space m_memspace; + +private: // cartridge device_mc10cart_interface *m_cart; - -protected: - required_address_space m_memspace; }; // device type definition @@ -92,7 +83,7 @@ public: virtual ~device_mc10cart_interface(); virtual int max_rom_length() const; - virtual image_init_result load(); + virtual std::pair<std::error_condition, std::string> load(); protected: void raise_cart_nmi() { m_owning_slot->set_nmi_line(ASSERT_LINE); } |