diff options
Diffstat (limited to 'src/devices/bus/wswan/slot.h')
-rw-r--r-- | src/devices/bus/wswan/slot.h | 88 |
1 files changed, 36 insertions, 52 deletions
diff --git a/src/devices/bus/wswan/slot.h b/src/devices/bus/wswan/slot.h index 85bda911c89..6c84f093450 100644 --- a/src/devices/bus/wswan/slot.h +++ b/src/devices/bus/wswan/slot.h @@ -66,7 +66,7 @@ #pragma once -#include "softlist_dev.h" +#include "imagedev/cartrom.h" /*************************************************************************** @@ -79,7 +79,8 @@ enum { WS_STD = 0, WS_SRAM, - WS_EEPROM + WS_EEPROM, + WWITCH }; @@ -92,49 +93,48 @@ public: virtual ~device_ws_cart_interface(); // reading and writing - virtual uint8_t read_rom20(offs_t offset) { return 0xff; } - virtual uint8_t read_rom30(offs_t offset) { return 0xff; } - virtual uint8_t read_rom40(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) {} - virtual uint8_t read_io(offs_t offset) { return 0xff; } - virtual void write_io(offs_t offset, uint8_t data) { } - - void rom_alloc(uint32_t size, const char *tag); - void nvram_alloc(uint32_t size); - uint8_t* get_rom_base() { return m_rom; } + virtual u16 read_rom20(offs_t offset, u16 mem_mask) { return 0xffff; } + virtual u16 read_rom30(offs_t offset, u16 mem_mask) { return 0xffff; } + virtual u16 read_rom40(offs_t offset, u16 mem_mask) { return 0xffff; } + virtual u16 read_ram(offs_t offset, u16 mem_mask) { return 0xffff; } + virtual void write_ram(offs_t offset, u16 data, u16 mem_mask) {} + virtual u16 read_io(offs_t offset, u16 mem_mask) { return 0xffff; } + virtual void write_io(offs_t offset, u16 data, u16 mem_mask) { } + + void rom_alloc(u32 size); + void nvram_alloc(u32 size); + u16* get_rom_base() { return m_rom; } uint8_t* get_nvram_base() { return &m_nvram[0]; } uint32_t get_rom_size() { return m_rom_size; } uint32_t get_nvram_size() { return m_nvram.size(); } void save_nvram() { device().save_item(NAME(m_nvram)); } void set_has_rtc(bool val) { m_has_rtc = val; } - void set_is_rotated(bool val) { m_is_rotated = val; } - int get_is_rotated() { return m_is_rotated ? 1 : 0; } protected: device_ws_cart_interface(const machine_config &mconfig, device_t &device); // internal state - uint8_t *m_rom; - uint32_t m_rom_size; - std::vector<uint8_t> m_nvram; + u16 *m_rom; + u32 m_rom_size; + std::vector<u8> m_nvram; + u32 m_nvram_size; int m_bank_mask; - bool m_has_rtc, m_is_rotated; + bool m_has_rtc; }; // ======================> ws_cart_slot_device class ws_cart_slot_device : public device_t, - public device_image_interface, + public device_cartrom_image_interface, public device_single_card_slot_interface<device_ws_cart_interface> { public: // construction/destruction template <typename T> - ws_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, T &&opts, const char *dflt) + ws_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock, T &&opts, const char *dflt) : ws_cart_slot_device(mconfig, tag, owner, clock) { option_reset(); @@ -142,50 +142,41 @@ public: set_default_option(dflt); set_fixed(false); } - ws_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + ws_cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); virtual ~ws_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 true; } virtual bool is_reset_on_load() const noexcept override { return true; } virtual const char *image_interface() const noexcept override { return "wswan_cart"; } virtual const char *file_extensions() const noexcept override { return "ws,wsc,bin"; } - // 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; } - int get_is_rotated() { return m_cart->get_is_rotated(); } - int get_cart_type(const uint8_t *ROM, uint32_t len, uint32_t &nvram_len) const; - void internal_header_logging(uint8_t *ROM, uint32_t offs, uint32_t len); + int get_cart_type(const u16 *ROM, u32 len, u32 &nvram_len) const; + void internal_header_logging(const u16 *ROM, u32 offs, u32 len); void save_nvram() { if (m_cart && m_cart->get_nvram_size()) m_cart->save_nvram(); } // reading and writing - virtual uint8_t read_rom20(offs_t offset); - virtual uint8_t read_rom30(offs_t offset); - virtual uint8_t read_rom40(offs_t offset); - virtual uint8_t read_ram(offs_t offset); - virtual void write_ram(offs_t offset, uint8_t data); - virtual uint8_t read_io(offs_t offset); - virtual void write_io(offs_t offset, uint8_t data); + virtual u16 read_rom20(offs_t offset, u16 mem_mask); + virtual u16 read_rom30(offs_t offset, u16 mem_mask); + virtual u16 read_rom40(offs_t offset, u16 mem_mask); + virtual u16 read_ram(offs_t offset, u16 mem_mask); + virtual void write_ram(offs_t offset, u16 data, u16 mem_mask); + virtual u16 read_io(offs_t offset, u16 mem_mask); + virtual void write_io(offs_t offset, u16 data, u16 mem_mask); 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_ws_cart_interface* m_cart; + device_ws_cart_interface *m_cart; }; @@ -193,11 +184,4 @@ protected: // device type definition DECLARE_DEVICE_TYPE(WS_CART_SLOT, ws_cart_slot_device) - -/*************************************************************************** - DEVICE CONFIGURATION MACROS - ***************************************************************************/ - -#define WSSLOT_ROM_REGION_TAG ":cart:rom" - #endif // MAME_BUS_WSWAN_SLOT_H |