diff options
Diffstat (limited to 'src/devices/bus/plus4/exp.h')
-rw-r--r-- | src/devices/bus/plus4/exp.h | 46 |
1 files changed, 16 insertions, 30 deletions
diff --git a/src/devices/bus/plus4/exp.h b/src/devices/bus/plus4/exp.h index 369480281b3..8dbd43106cf 100644 --- a/src/devices/bus/plus4/exp.h +++ b/src/devices/bus/plus4/exp.h @@ -39,14 +39,7 @@ #pragma once -#include "softlist_dev.h" - - -//************************************************************************** -// CONSTANTS -//************************************************************************** - -#define PLUS4_EXPANSION_SLOT_TAG "exp" +#include "imagedev/cartrom.h" //************************************************************************** @@ -59,7 +52,7 @@ class device_plus4_expansion_card_interface; class plus4_expansion_slot_device : public device_t, public device_single_card_slot_interface<device_plus4_expansion_card_interface>, - public device_image_interface + public device_cartrom_image_interface { public: // construction/destruction @@ -86,29 +79,22 @@ public: // cartridge interface uint8_t dma_cd_r(offs_t offset) { return m_read_dma_cd(offset); } void dma_cd_w(offs_t offset, uint8_t data) { m_write_dma_cd(offset, data); } - DECLARE_WRITE_LINE_MEMBER( irq_w ) { m_write_irq(state); } - DECLARE_WRITE_LINE_MEMBER( aec_w ) { m_write_aec(state); } + void irq_w(int state) { m_write_irq(state); } + void aec_w(int state) { m_write_aec(state); } int phi2() { return clock(); } protected: - // device-level overrides + // device_t implementation 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(); } - - 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 "plus4_cart"; } virtual const char *file_extensions() const noexcept override { return "rom,bin"; } - // slot interface overrides + // device_slot_interface implementation virtual std::string get_default_card_software(get_default_card_software_hook &hook) const override; devcb_write_line m_write_irq; @@ -137,15 +123,15 @@ public: protected: device_plus4_expansion_card_interface(const machine_config &mconfig, device_t &device); - optional_shared_ptr<uint8_t> m_c1l; - optional_shared_ptr<uint8_t> m_c1h; - optional_shared_ptr<uint8_t> m_c2l; - optional_shared_ptr<uint8_t> m_c2h; + std::unique_ptr<uint8_t[]> m_c1l; + std::unique_ptr<uint8_t[]> m_c1h; + std::unique_ptr<uint8_t[]> m_c2l; + std::unique_ptr<uint8_t[]> m_c2h; - size_t m_c1l_mask; - size_t m_c1h_mask; - size_t m_c2l_mask; - size_t m_c2h_mask; + size_t m_c1l_size; + size_t m_c1h_size; + size_t m_c2l_size; + size_t m_c2h_size; plus4_expansion_slot_device *m_slot; }; |