diff options
Diffstat (limited to 'src/devices/bus/nes/aladdin.h')
-rw-r--r-- | src/devices/bus/nes/aladdin.h | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/src/devices/bus/nes/aladdin.h b/src/devices/bus/nes/aladdin.h index 102abe68172..06203ea1a6d 100644 --- a/src/devices/bus/nes/aladdin.h +++ b/src/devices/bus/nes/aladdin.h @@ -6,7 +6,7 @@ #pragma once #include "nxrom.h" -#include "softlist_dev.h" +#include "imagedev/cartrom.h" //---------------------------------- @@ -44,7 +44,7 @@ protected: class nes_aladdin_device; class nes_aladdin_slot_device : public device_t, - public device_image_interface, + public device_cartrom_image_interface, public device_single_card_slot_interface<aladdin_cart_interface> { friend class nes_aladdin_device; @@ -63,32 +63,24 @@ public: nes_aladdin_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); virtual ~nes_aladdin_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 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 "ade_cart"; } virtual const char *file_extensions() const noexcept override { return "nes,bin"; } - // slot interface overrides + // device_slot_interface implementation virtual std::string get_default_card_software(get_default_card_software_hook &hook) const override; uint8_t read(offs_t offset); void write_prg(uint32_t offset, uint8_t data) { if (m_cart) m_cart->write_prg(offset, 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(); } - - aladdin_cart_interface* m_cart; + aladdin_cart_interface *m_cart; }; // device type definition @@ -168,9 +160,8 @@ public: virtual void pcb_reset() override; protected: - // device-level overrides + // device_t implementation virtual void device_start() override; - virtual void device_add_mconfig(machine_config &config) override; required_device<nes_aladdin_slot_device> m_subslot; |