diff options
author | 2022-06-16 12:47:52 +0200 | |
---|---|---|
committer | 2025-04-29 23:06:41 +0200 | |
commit | 45d4cd52a8194f2ef9e0383cfb2e2a35634af6ff (patch) | |
tree | 4e8d8fcb7382a5e9e0bce5ec59939bcfbe67155a /src/devices/bus/vtech/ioexp | |
parent | 5c14bcdfcb4aefb71b5b62387c4ad05dbeb3814e (diff) |
full xtal conversionxtal
Diffstat (limited to 'src/devices/bus/vtech/ioexp')
-rw-r--r-- | src/devices/bus/vtech/ioexp/ioexp.cpp | 8 | ||||
-rw-r--r-- | src/devices/bus/vtech/ioexp/ioexp.h | 12 | ||||
-rw-r--r-- | src/devices/bus/vtech/ioexp/joystick.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/vtech/ioexp/joystick.h | 2 | ||||
-rw-r--r-- | src/devices/bus/vtech/ioexp/lpen.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/vtech/ioexp/lpen.h | 2 | ||||
-rw-r--r-- | src/devices/bus/vtech/ioexp/printer.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/vtech/ioexp/printer.h | 2 |
8 files changed, 14 insertions, 18 deletions
diff --git a/src/devices/bus/vtech/ioexp/ioexp.cpp b/src/devices/bus/vtech/ioexp/ioexp.cpp index 475f287201e..1258438dda5 100644 --- a/src/devices/bus/vtech/ioexp/ioexp.cpp +++ b/src/devices/bus/vtech/ioexp/ioexp.cpp @@ -27,11 +27,15 @@ DEFINE_DEVICE_TYPE(VTECH_IOEXP_SLOT, vtech_ioexp_slot_device, "vtech_ioexp_slot" // vtech_ioexp_slot_device - constructor //------------------------------------------------- -vtech_ioexp_slot_device::vtech_ioexp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +vtech_ioexp_slot_device::vtech_ioexp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, VTECH_IOEXP_SLOT, tag, owner, clock), device_single_card_slot_interface<device_vtech_ioexp_interface>(mconfig, *this), m_iospace(*this, finder_base::DUMMY_TAG, -1) { + option_reset(); + vtech_ioexp_slot_carts(*this); + set_default_option(nullptr); + set_fixed(false); } //------------------------------------------------- @@ -100,7 +104,7 @@ device_vtech_ioexp_interface::~device_vtech_ioexp_interface() // vtech_ioexp_device - constructor //------------------------------------------------- -vtech_ioexp_device::vtech_ioexp_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) : +vtech_ioexp_device::vtech_ioexp_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_ioexp_interface(mconfig, *this), m_io(*this, "iospace") diff --git a/src/devices/bus/vtech/ioexp/ioexp.h b/src/devices/bus/vtech/ioexp/ioexp.h index c851d0e0d48..266121ab207 100644 --- a/src/devices/bus/vtech/ioexp/ioexp.h +++ b/src/devices/bus/vtech/ioexp/ioexp.h @@ -46,15 +46,7 @@ class vtech_ioexp_slot_device : public device_t, public device_single_card_slot_ friend class device_vtech_ioexp_interface; public: // construction/destruction - vtech_ioexp_slot_device(machine_config const &mconfig, char const *tag, device_t *owner) - : vtech_ioexp_slot_device(mconfig, tag, owner, (uint32_t)0) - { - option_reset(); - vtech_ioexp_slot_carts(*this); - set_default_option(nullptr); - set_fixed(false); - } - vtech_ioexp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + vtech_ioexp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL()); virtual ~vtech_ioexp_slot_device(); template <typename T> void set_iospace(T &&tag, int spacenum) { m_iospace.set_tag(std::forward<T>(tag), spacenum); } @@ -90,7 +82,7 @@ class vtech_ioexp_device : public device_t, public device_vtech_ioexp_interface { public: // construction/destruction - vtech_ioexp_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + vtech_ioexp_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); // from host virtual uint8_t iorq_r(offs_t offset) override; diff --git a/src/devices/bus/vtech/ioexp/joystick.cpp b/src/devices/bus/vtech/ioexp/joystick.cpp index f54125c64ae..c6b9e2ae7f9 100644 --- a/src/devices/bus/vtech/ioexp/joystick.cpp +++ b/src/devices/bus/vtech/ioexp/joystick.cpp @@ -75,7 +75,7 @@ ioport_constructor vtech_joystick_interface_device::device_input_ports() const // vtech_joystick_interface_device - constructor //------------------------------------------------- -vtech_joystick_interface_device::vtech_joystick_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +vtech_joystick_interface_device::vtech_joystick_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : vtech_ioexp_device(mconfig, VTECH_JOYSTICK_INTERFACE, tag, owner, clock), m_joy0(*this, "joystick_0"), m_joy0_arm(*this, "joystick_0_arm"), diff --git a/src/devices/bus/vtech/ioexp/joystick.h b/src/devices/bus/vtech/ioexp/joystick.h index 2d59f7d4951..57d9a5dbc45 100644 --- a/src/devices/bus/vtech/ioexp/joystick.h +++ b/src/devices/bus/vtech/ioexp/joystick.h @@ -27,7 +27,7 @@ class vtech_joystick_interface_device : public vtech_ioexp_device { public: // construction/destruction - vtech_joystick_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + vtech_joystick_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); uint8_t joystick_r(offs_t offset); diff --git a/src/devices/bus/vtech/ioexp/lpen.cpp b/src/devices/bus/vtech/ioexp/lpen.cpp index 732340218e1..32accdeeeb5 100644 --- a/src/devices/bus/vtech/ioexp/lpen.cpp +++ b/src/devices/bus/vtech/ioexp/lpen.cpp @@ -37,7 +37,7 @@ void vtech_lpen_interface_device::io_map(address_map &map) // vtech_lpen_interface_device - constructor //------------------------------------------------- -vtech_lpen_interface_device::vtech_lpen_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +vtech_lpen_interface_device::vtech_lpen_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : vtech_ioexp_device(mconfig, VTECH_LPEN_INTERFACE, tag, owner, clock) { } diff --git a/src/devices/bus/vtech/ioexp/lpen.h b/src/devices/bus/vtech/ioexp/lpen.h index 95759e5fcff..285d884da44 100644 --- a/src/devices/bus/vtech/ioexp/lpen.h +++ b/src/devices/bus/vtech/ioexp/lpen.h @@ -24,7 +24,7 @@ class vtech_lpen_interface_device : public vtech_ioexp_device { public: // construction/destruction - vtech_lpen_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + vtech_lpen_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); static constexpr feature_type unemulated_features() { return feature::CONTROLS; } diff --git a/src/devices/bus/vtech/ioexp/printer.cpp b/src/devices/bus/vtech/ioexp/printer.cpp index b5eaa4e8a4b..1947862a911 100644 --- a/src/devices/bus/vtech/ioexp/printer.cpp +++ b/src/devices/bus/vtech/ioexp/printer.cpp @@ -55,7 +55,7 @@ void vtech_printer_interface_device::device_add_mconfig(machine_config &config) // vtech_printer_interface_device - constructor //------------------------------------------------- -vtech_printer_interface_device::vtech_printer_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +vtech_printer_interface_device::vtech_printer_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : vtech_ioexp_device(mconfig, VTECH_PRINTER_INTERFACE, tag, owner, clock), m_centronics(*this, "centronics"), m_latch(*this, "latch"), diff --git a/src/devices/bus/vtech/ioexp/printer.h b/src/devices/bus/vtech/ioexp/printer.h index be25c7fd614..8668eb80901 100644 --- a/src/devices/bus/vtech/ioexp/printer.h +++ b/src/devices/bus/vtech/ioexp/printer.h @@ -27,7 +27,7 @@ class vtech_printer_interface_device : public vtech_ioexp_device { public: // construction/destruction - vtech_printer_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + vtech_printer_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual void device_add_mconfig(machine_config &config) override; |