diff options
Diffstat (limited to 'src/devices/bus/vtech/memexp')
-rw-r--r-- | src/devices/bus/vtech/memexp/floppy.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/vtech/memexp/floppy.h | 2 | ||||
-rw-r--r-- | src/devices/bus/vtech/memexp/memexp.cpp | 8 | ||||
-rw-r--r-- | src/devices/bus/vtech/memexp/memexp.h | 12 | ||||
-rw-r--r-- | src/devices/bus/vtech/memexp/memory.cpp | 8 | ||||
-rw-r--r-- | src/devices/bus/vtech/memexp/memory.h | 8 | ||||
-rw-r--r-- | src/devices/bus/vtech/memexp/rs232.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/vtech/memexp/rs232.h | 2 | ||||
-rw-r--r-- | src/devices/bus/vtech/memexp/rtty.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/vtech/memexp/rtty.h | 2 | ||||
-rw-r--r-- | src/devices/bus/vtech/memexp/sdloader.cpp | 4 | ||||
-rw-r--r-- | src/devices/bus/vtech/memexp/sdloader.h | 2 | ||||
-rw-r--r-- | src/devices/bus/vtech/memexp/wordpro.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/vtech/memexp/wordpro.h | 2 |
14 files changed, 27 insertions, 31 deletions
diff --git a/src/devices/bus/vtech/memexp/floppy.cpp b/src/devices/bus/vtech/memexp/floppy.cpp index 4e641947aaf..55f1c249309 100644 --- a/src/devices/bus/vtech/memexp/floppy.cpp +++ b/src/devices/bus/vtech/memexp/floppy.cpp @@ -95,7 +95,7 @@ void vtech_floppy_controller_device::device_add_mconfig(machine_config &config) // vtech_floppy_controller_device - constructor //------------------------------------------------- -vtech_floppy_controller_device::vtech_floppy_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +vtech_floppy_controller_device::vtech_floppy_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : vtech_memexp_device(mconfig, VTECH_FLOPPY_CONTROLLER, tag, owner, clock), m_memexp(*this, "mem"), m_floppy0(*this, "0"), diff --git a/src/devices/bus/vtech/memexp/floppy.h b/src/devices/bus/vtech/memexp/floppy.h index 167cbf5ba63..abe89105ed1 100644 --- a/src/devices/bus/vtech/memexp/floppy.h +++ b/src/devices/bus/vtech/memexp/floppy.h @@ -28,7 +28,7 @@ class vtech_floppy_controller_device : public vtech_memexp_device { public: // construction/destruction - vtech_floppy_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + vtech_floppy_controller_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual const tiny_rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/vtech/memexp/memexp.cpp b/src/devices/bus/vtech/memexp/memexp.cpp index 74d2213009a..b5df1a3040d 100644 --- a/src/devices/bus/vtech/memexp/memexp.cpp +++ b/src/devices/bus/vtech/memexp/memexp.cpp @@ -27,7 +27,7 @@ DEFINE_DEVICE_TYPE(VTECH_MEMEXP_SLOT, vtech_memexp_slot_device, "vtech_memexp_sl // vtech_memexp_slot_device - constructor //------------------------------------------------- -vtech_memexp_slot_device::vtech_memexp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +vtech_memexp_slot_device::vtech_memexp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, VTECH_MEMEXP_SLOT, tag, owner, clock), device_single_card_slot_interface<device_vtech_memexp_interface>(mconfig, *this), m_memspace(*this, finder_base::DUMMY_TAG, -1), @@ -36,6 +36,10 @@ vtech_memexp_slot_device::vtech_memexp_slot_device(const machine_config &mconfig m_nmi_handler(*this), m_reset_handler(*this) { + option_reset(); + vtech_memexp_carts(*this); + set_default_option(nullptr); + set_fixed(false); } //------------------------------------------------- @@ -125,7 +129,7 @@ device_vtech_memexp_interface::~device_vtech_memexp_interface() // vtech_memexp_device - constructor //------------------------------------------------- -vtech_memexp_device::vtech_memexp_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) : +vtech_memexp_device::vtech_memexp_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, type, tag, owner, clock), device_vtech_memexp_interface(mconfig, *this), m_mem(*this, "memspace"), diff --git a/src/devices/bus/vtech/memexp/memexp.h b/src/devices/bus/vtech/memexp/memexp.h index 5fd3ee6a449..75013fe98a4 100644 --- a/src/devices/bus/vtech/memexp/memexp.h +++ b/src/devices/bus/vtech/memexp/memexp.h @@ -53,15 +53,7 @@ class vtech_memexp_slot_device : public device_t, public device_single_card_slot friend class device_vtech_memexp_interface; public: // construction/destruction - vtech_memexp_slot_device(machine_config const &mconfig, char const *tag, device_t *owner) - : vtech_memexp_slot_device(mconfig, tag, owner, (uint32_t)0) - { - option_reset(); - vtech_memexp_carts(*this); - set_default_option(nullptr); - set_fixed(false); - } - vtech_memexp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + vtech_memexp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL()); virtual ~vtech_memexp_slot_device(); template <typename T> void set_memspace(T &&tag, int spacenum) { m_memspace.set_tag(std::forward<T>(tag), spacenum); } @@ -114,7 +106,7 @@ class vtech_memexp_device : public device_t, public device_vtech_memexp_interfac { public: // construction/destruction - vtech_memexp_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + vtech_memexp_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); // from host virtual uint8_t mreq_r(offs_t offset) override; diff --git a/src/devices/bus/vtech/memexp/memory.cpp b/src/devices/bus/vtech/memexp/memory.cpp index bfac5f06b4c..b770f4a66f9 100644 --- a/src/devices/bus/vtech/memexp/memory.cpp +++ b/src/devices/bus/vtech/memexp/memory.cpp @@ -38,7 +38,7 @@ void vtech_laser110_16k_device::mem_map(address_map &map) // laser110_16k_device - constructor //------------------------------------------------- -vtech_laser110_16k_device::vtech_laser110_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +vtech_laser110_16k_device::vtech_laser110_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : vtech_memexp_device(mconfig, VTECH_LASER110_16K, tag, owner, clock) { } @@ -71,7 +71,7 @@ void vtech_laser210_16k_device::mem_map(address_map &map) // vtech_laser210_16k_device - constructor //------------------------------------------------- -vtech_laser210_16k_device::vtech_laser210_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +vtech_laser210_16k_device::vtech_laser210_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : vtech_memexp_device(mconfig, VTECH_LASER210_16K, tag, owner, clock) { } @@ -104,7 +104,7 @@ void vtech_laser310_16k_device::mem_map(address_map &map) // vtech_laser310_16k_device - constructor //------------------------------------------------- -vtech_laser310_16k_device::vtech_laser310_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +vtech_laser310_16k_device::vtech_laser310_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : vtech_memexp_device(mconfig, VTECH_LASER310_16K, tag, owner, clock) { } @@ -148,7 +148,7 @@ void vtech_laser_64k_device::io_map(address_map &map) // vtech_laser_64k_device - constructor //------------------------------------------------- -vtech_laser_64k_device::vtech_laser_64k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +vtech_laser_64k_device::vtech_laser_64k_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : vtech_memexp_device(mconfig, VTECH_LASER_64K, tag, owner, clock), m_fixed_bank(*this, "fixed_bank"), m_bank(*this, "bank") diff --git a/src/devices/bus/vtech/memexp/memory.h b/src/devices/bus/vtech/memexp/memory.h index 5af19fd27f1..c61844fb447 100644 --- a/src/devices/bus/vtech/memexp/memory.h +++ b/src/devices/bus/vtech/memexp/memory.h @@ -24,7 +24,7 @@ class vtech_laser110_16k_device : public vtech_memexp_device { public: // construction/destruction - vtech_laser110_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + vtech_laser110_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual void device_start() override; @@ -38,7 +38,7 @@ class vtech_laser210_16k_device : public vtech_memexp_device { public: // construction/destruction - vtech_laser210_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + vtech_laser210_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual void device_start() override; @@ -52,7 +52,7 @@ class vtech_laser310_16k_device : public vtech_memexp_device { public: // construction/destruction - vtech_laser310_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + vtech_laser310_16k_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual void device_start() override; @@ -66,7 +66,7 @@ class vtech_laser_64k_device : public vtech_memexp_device { public: // construction/destruction - vtech_laser_64k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + vtech_laser_64k_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual void device_start() override; diff --git a/src/devices/bus/vtech/memexp/rs232.cpp b/src/devices/bus/vtech/memexp/rs232.cpp index cf07b2055d6..ea2d65f14b6 100644 --- a/src/devices/bus/vtech/memexp/rs232.cpp +++ b/src/devices/bus/vtech/memexp/rs232.cpp @@ -67,7 +67,7 @@ void vtech_rs232_interface_device::device_add_mconfig(machine_config &config) // vtech_rs232_interface_device - constructor //------------------------------------------------- -vtech_rs232_interface_device::vtech_rs232_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +vtech_rs232_interface_device::vtech_rs232_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : vtech_memexp_device(mconfig, VTECH_RS232_INTERFACE, tag, owner, clock), m_rs232(*this, "rs232"), m_rx(1) diff --git a/src/devices/bus/vtech/memexp/rs232.h b/src/devices/bus/vtech/memexp/rs232.h index 30af4a2eaaf..75749c83742 100644 --- a/src/devices/bus/vtech/memexp/rs232.h +++ b/src/devices/bus/vtech/memexp/rs232.h @@ -25,7 +25,7 @@ class vtech_rs232_interface_device : public vtech_memexp_device { public: // construction/destruction - vtech_rs232_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + vtech_rs232_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual const tiny_rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/vtech/memexp/rtty.cpp b/src/devices/bus/vtech/memexp/rtty.cpp index 6a0f96c58a8..337cd5c848b 100644 --- a/src/devices/bus/vtech/memexp/rtty.cpp +++ b/src/devices/bus/vtech/memexp/rtty.cpp @@ -52,7 +52,7 @@ const tiny_rom_entry *vtech_rtty_interface_device::device_rom_region() const // vtech_rtty_interface_device - constructor //------------------------------------------------- -vtech_rtty_interface_device::vtech_rtty_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +vtech_rtty_interface_device::vtech_rtty_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : vtech_memexp_device(mconfig, VTECH_RTTY_INTERFACE, tag, owner, clock) { } diff --git a/src/devices/bus/vtech/memexp/rtty.h b/src/devices/bus/vtech/memexp/rtty.h index 62d1f5b94af..24796e6b5ea 100644 --- a/src/devices/bus/vtech/memexp/rtty.h +++ b/src/devices/bus/vtech/memexp/rtty.h @@ -24,7 +24,7 @@ class vtech_rtty_interface_device : public vtech_memexp_device { public: // construction/destruction - vtech_rtty_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + vtech_rtty_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual const tiny_rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/vtech/memexp/sdloader.cpp b/src/devices/bus/vtech/memexp/sdloader.cpp index 84df085c86a..7e533c0bc7c 100644 --- a/src/devices/bus/vtech/memexp/sdloader.cpp +++ b/src/devices/bus/vtech/memexp/sdloader.cpp @@ -87,7 +87,7 @@ void vtech_sdloader_device::device_add_mconfig(machine_config &config) { vtech_memexp_device::device_add_mconfig(config); - SPI_SDCARD(config, m_sdcard, 0); + SPI_SDCARD(config, m_sdcard); m_sdcard->spi_miso_callback().set(FUNC(vtech_sdloader_device::spi_miso_w)); } @@ -100,7 +100,7 @@ void vtech_sdloader_device::device_add_mconfig(machine_config &config) // vtech_sdloader_device - constructor //------------------------------------------------- -vtech_sdloader_device::vtech_sdloader_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +vtech_sdloader_device::vtech_sdloader_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : vtech_memexp_device(mconfig, VTECH_SDLOADER, tag, owner, clock), m_sdcard(*this, "sdcard"), m_dosbank(*this, "dosbank"), diff --git a/src/devices/bus/vtech/memexp/sdloader.h b/src/devices/bus/vtech/memexp/sdloader.h index fe1fa6ea313..8ab77f287bd 100644 --- a/src/devices/bus/vtech/memexp/sdloader.h +++ b/src/devices/bus/vtech/memexp/sdloader.h @@ -25,7 +25,7 @@ class vtech_sdloader_device : public vtech_memexp_device { public: // construction/destruction - vtech_sdloader_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + vtech_sdloader_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); static constexpr feature_type unemulated_features() { return feature::DISK; } diff --git a/src/devices/bus/vtech/memexp/wordpro.cpp b/src/devices/bus/vtech/memexp/wordpro.cpp index 811cb953a83..7bffe76b49a 100644 --- a/src/devices/bus/vtech/memexp/wordpro.cpp +++ b/src/devices/bus/vtech/memexp/wordpro.cpp @@ -52,7 +52,7 @@ const tiny_rom_entry *vtech_wordpro_device::device_rom_region() const // vtech_wordpro_device - constructor //------------------------------------------------- -vtech_wordpro_device::vtech_wordpro_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +vtech_wordpro_device::vtech_wordpro_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : vtech_memexp_device(mconfig, VTECH_WORDPRO, tag, owner, clock) { } diff --git a/src/devices/bus/vtech/memexp/wordpro.h b/src/devices/bus/vtech/memexp/wordpro.h index 0515a12bb36..e5484556923 100644 --- a/src/devices/bus/vtech/memexp/wordpro.h +++ b/src/devices/bus/vtech/memexp/wordpro.h @@ -24,7 +24,7 @@ class vtech_wordpro_device : public vtech_memexp_device { public: // construction/destruction - vtech_wordpro_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + vtech_wordpro_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual const tiny_rom_entry *device_rom_region() const override; |