diff options
Diffstat (limited to 'src/devices/bus/electron')
66 files changed, 83 insertions, 83 deletions
diff --git a/src/devices/bus/electron/cart/abr.cpp b/src/devices/bus/electron/cart/abr.cpp index 0c82ca65782..af1e4fbd3ab 100644 --- a/src/devices/bus/electron/cart/abr.cpp +++ b/src/devices/bus/electron/cart/abr.cpp @@ -25,7 +25,7 @@ DEFINE_DEVICE_TYPE(ELECTRON_ABR, electron_abr_device, "electron_abr", "Electron // electron_abr_device - constructor //------------------------------------------------- -electron_abr_device::electron_abr_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +electron_abr_device::electron_abr_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ELECTRON_ABR, tag, owner, clock) , device_electron_cart_interface(mconfig, *this) { diff --git a/src/devices/bus/electron/cart/abr.h b/src/devices/bus/electron/cart/abr.h index 3ef92c95a8d..d7c1fc6649f 100644 --- a/src/devices/bus/electron/cart/abr.h +++ b/src/devices/bus/electron/cart/abr.h @@ -25,7 +25,7 @@ class electron_abr_device : public device_t, { public: // construction/destruction - electron_abr_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + electron_abr_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/electron/cart/ap34.cpp b/src/devices/bus/electron/cart/ap34.cpp index ecb3b9da30c..5f4d4659ab7 100644 --- a/src/devices/bus/electron/cart/ap34.cpp +++ b/src/devices/bus/electron/cart/ap34.cpp @@ -61,7 +61,7 @@ void electron_ap34_device::device_add_mconfig(machine_config &config) // electron_ap34_device - constructor //------------------------------------------------- -electron_ap34_device::electron_ap34_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +electron_ap34_device::electron_ap34_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ELECTRON_AP34, tag, owner, clock) , device_electron_cart_interface(mconfig, *this) , m_fdc(*this, "fdc") diff --git a/src/devices/bus/electron/cart/ap34.h b/src/devices/bus/electron/cart/ap34.h index ac84e7cd58f..3c3f762d7b8 100644 --- a/src/devices/bus/electron/cart/ap34.h +++ b/src/devices/bus/electron/cart/ap34.h @@ -26,7 +26,7 @@ class electron_ap34_device : { public: // construction/destruction - electron_ap34_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + electron_ap34_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/electron/cart/ap5.cpp b/src/devices/bus/electron/cart/ap5.cpp index 90c4188d7b1..6862015154d 100644 --- a/src/devices/bus/electron/cart/ap5.cpp +++ b/src/devices/bus/electron/cart/ap5.cpp @@ -63,7 +63,7 @@ void electron_ap5_device::device_add_mconfig(machine_config &config) // electron_ap5_device - constructor //------------------------------------------------- -electron_ap5_device::electron_ap5_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +electron_ap5_device::electron_ap5_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ELECTRON_AP5, tag, owner, clock) , device_electron_cart_interface(mconfig, *this) , m_irqs(*this, "irqs") diff --git a/src/devices/bus/electron/cart/ap5.h b/src/devices/bus/electron/cart/ap5.h index 9e69c775c63..f1b23f4c0f2 100644 --- a/src/devices/bus/electron/cart/ap5.h +++ b/src/devices/bus/electron/cart/ap5.h @@ -28,7 +28,7 @@ class electron_ap5_device : { public: // construction/destruction - electron_ap5_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + electron_ap5_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/electron/cart/aqr.cpp b/src/devices/bus/electron/cart/aqr.cpp index 8be0176efc4..ba7a411078a 100644 --- a/src/devices/bus/electron/cart/aqr.cpp +++ b/src/devices/bus/electron/cart/aqr.cpp @@ -25,7 +25,7 @@ DEFINE_DEVICE_TYPE(ELECTRON_AQR, electron_aqr_device, "electron_aqr", "Electron // electron_aqr_device - constructor //------------------------------------------------- -electron_aqr_device::electron_aqr_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +electron_aqr_device::electron_aqr_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ELECTRON_AQR, tag, owner, clock) , device_electron_cart_interface(mconfig, *this) , m_page_register(0) diff --git a/src/devices/bus/electron/cart/aqr.h b/src/devices/bus/electron/cart/aqr.h index 820f967b5cf..c267415e030 100644 --- a/src/devices/bus/electron/cart/aqr.h +++ b/src/devices/bus/electron/cart/aqr.h @@ -25,7 +25,7 @@ class electron_aqr_device : public device_t, { public: // construction/destruction - electron_aqr_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + electron_aqr_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/electron/cart/click.cpp b/src/devices/bus/electron/cart/click.cpp index 46bb123c9e4..4dfd48592ba 100644 --- a/src/devices/bus/electron/cart/click.cpp +++ b/src/devices/bus/electron/cart/click.cpp @@ -57,7 +57,7 @@ ioport_constructor electron_click_device::device_input_ports() const // electron_click_device - constructor //------------------------------------------------- -electron_click_device::electron_click_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +electron_click_device::electron_click_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ELECTRON_CLICK, tag, owner, clock) , device_electron_cart_interface(mconfig, *this) , m_rtc(*this, "rtc") diff --git a/src/devices/bus/electron/cart/click.h b/src/devices/bus/electron/cart/click.h index cb7dd114687..4ddcd6c7ab7 100644 --- a/src/devices/bus/electron/cart/click.h +++ b/src/devices/bus/electron/cart/click.h @@ -28,7 +28,7 @@ class electron_click_device : public device_t, { public: // construction/destruction - electron_click_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + electron_click_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); DECLARE_INPUT_CHANGED_MEMBER(click_button); diff --git a/src/devices/bus/electron/cart/cumana.cpp b/src/devices/bus/electron/cart/cumana.cpp index 9b854871e59..68782806942 100644 --- a/src/devices/bus/electron/cart/cumana.cpp +++ b/src/devices/bus/electron/cart/cumana.cpp @@ -67,7 +67,7 @@ void electron_cumana_device::device_add_mconfig(machine_config &config) // electron_cumana_device - constructor //------------------------------------------------- -electron_cumana_device::electron_cumana_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +electron_cumana_device::electron_cumana_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ELECTRON_CUMANA, tag, owner, clock) , device_electron_cart_interface(mconfig, *this) , m_fdc(*this, "fdc") diff --git a/src/devices/bus/electron/cart/cumana.h b/src/devices/bus/electron/cart/cumana.h index 2dce4bbc78c..5672952f7d7 100644 --- a/src/devices/bus/electron/cart/cumana.h +++ b/src/devices/bus/electron/cart/cumana.h @@ -27,7 +27,7 @@ class electron_cumana_device : { public: // construction/destruction - electron_cumana_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + electron_cumana_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/electron/cart/elksdp1.cpp b/src/devices/bus/electron/cart/elksdp1.cpp index c2baf7e7801..241d073c27f 100644 --- a/src/devices/bus/electron/cart/elksdp1.cpp +++ b/src/devices/bus/electron/cart/elksdp1.cpp @@ -26,7 +26,7 @@ DEFINE_DEVICE_TYPE(ELECTRON_ELKSDP1, electron_elksdp1_device, "electron_elksdp1" void electron_elksdp1_device::device_add_mconfig(machine_config &config) { - SPI_SDCARD(config, m_sdcard, 0); + SPI_SDCARD(config, m_sdcard); m_sdcard->spi_miso_callback().set([this](int state) { m_in_bit = state; }); } @@ -38,7 +38,7 @@ void electron_elksdp1_device::device_add_mconfig(machine_config &config) // electron_elksdp1_device - constructor //------------------------------------------------- -electron_elksdp1_device::electron_elksdp1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +electron_elksdp1_device::electron_elksdp1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ELECTRON_ELKSDP1, tag, owner, clock) , device_electron_cart_interface(mconfig, *this) , m_sdcard(*this, "sdcard") diff --git a/src/devices/bus/electron/cart/elksdp1.h b/src/devices/bus/electron/cart/elksdp1.h index d0f606591ec..61267e4a990 100644 --- a/src/devices/bus/electron/cart/elksdp1.h +++ b/src/devices/bus/electron/cart/elksdp1.h @@ -21,7 +21,7 @@ class electron_elksdp1_device : public device_t, public device_electron_cart_int { public: // construction/destruction - electron_elksdp1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + electron_elksdp1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/electron/cart/mgc.cpp b/src/devices/bus/electron/cart/mgc.cpp index 5f80559c47a..99f8bedb560 100644 --- a/src/devices/bus/electron/cart/mgc.cpp +++ b/src/devices/bus/electron/cart/mgc.cpp @@ -33,7 +33,7 @@ DEFINE_DEVICE_TYPE(ELECTRON_MGC, electron_mgc_device, "electron_mgc", "Electron // electron_mgc_device - constructor //------------------------------------------------- -electron_mgc_device::electron_mgc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +electron_mgc_device::electron_mgc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ELECTRON_MGC, tag, owner, clock) , device_electron_cart_interface(mconfig, *this) , m_page_latch(0) diff --git a/src/devices/bus/electron/cart/mgc.h b/src/devices/bus/electron/cart/mgc.h index bf23aa34391..f089b6fb0c2 100644 --- a/src/devices/bus/electron/cart/mgc.h +++ b/src/devices/bus/electron/cart/mgc.h @@ -25,7 +25,7 @@ class electron_mgc_device : public device_t, { public: // construction/destruction - electron_mgc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + electron_mgc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/electron/cart/peg400.cpp b/src/devices/bus/electron/cart/peg400.cpp index cba69099613..a685516d67d 100644 --- a/src/devices/bus/electron/cart/peg400.cpp +++ b/src/devices/bus/electron/cart/peg400.cpp @@ -60,7 +60,7 @@ void electron_peg400_device::device_add_mconfig(machine_config &config) // electron_peg400_device - constructor //------------------------------------------------- -electron_peg400_device::electron_peg400_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +electron_peg400_device::electron_peg400_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ELECTRON_PEG400, tag, owner, clock) , device_electron_cart_interface(mconfig, *this) , m_fdc(*this, "fdc") diff --git a/src/devices/bus/electron/cart/peg400.h b/src/devices/bus/electron/cart/peg400.h index 141cc1fe02f..95418380c12 100644 --- a/src/devices/bus/electron/cart/peg400.h +++ b/src/devices/bus/electron/cart/peg400.h @@ -24,7 +24,7 @@ class electron_peg400_device : { public: // construction/destruction - electron_peg400_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + electron_peg400_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/electron/cart/romp144.cpp b/src/devices/bus/electron/cart/romp144.cpp index 8bdeab7cc34..57ba5066ca4 100644 --- a/src/devices/bus/electron/cart/romp144.cpp +++ b/src/devices/bus/electron/cart/romp144.cpp @@ -49,7 +49,7 @@ void electron_romp144_device::device_add_mconfig(machine_config &config) // electron_romp144_device - constructor //------------------------------------------------- -electron_romp144_device::electron_romp144_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +electron_romp144_device::electron_romp144_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ELECTRON_ROMP144, tag, owner, clock) , device_electron_cart_interface(mconfig, *this) , m_romslot(*this, "rom%u", 7) diff --git a/src/devices/bus/electron/cart/romp144.h b/src/devices/bus/electron/cart/romp144.h index 45916a3ab38..240788191c3 100644 --- a/src/devices/bus/electron/cart/romp144.h +++ b/src/devices/bus/electron/cart/romp144.h @@ -23,7 +23,7 @@ class electron_romp144_device : { public: // construction/destruction - electron_romp144_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + electron_romp144_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/electron/cart/rs423.cpp b/src/devices/bus/electron/cart/rs423.cpp index 68838a4cae2..746b27900d7 100644 --- a/src/devices/bus/electron/cart/rs423.cpp +++ b/src/devices/bus/electron/cart/rs423.cpp @@ -43,7 +43,7 @@ void electron_rs423_device::device_add_mconfig(machine_config &config) // electron_rs423_device - constructor //------------------------------------------------- -electron_rs423_device::electron_rs423_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +electron_rs423_device::electron_rs423_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ELECTRON_RS423, tag, owner, clock) , device_electron_cart_interface(mconfig, *this) , m_duart(*this, "duart") diff --git a/src/devices/bus/electron/cart/rs423.h b/src/devices/bus/electron/cart/rs423.h index 0068b9c701e..9fc582cd68d 100644 --- a/src/devices/bus/electron/cart/rs423.h +++ b/src/devices/bus/electron/cart/rs423.h @@ -22,7 +22,7 @@ class electron_rs423_device : { public: // construction/destruction - electron_rs423_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + electron_rs423_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/electron/cart/slot.cpp b/src/devices/bus/electron/cart/slot.cpp index bcdff13233d..9268c2d5d03 100644 --- a/src/devices/bus/electron/cart/slot.cpp +++ b/src/devices/bus/electron/cart/slot.cpp @@ -89,7 +89,7 @@ void device_electron_cart_interface::nvram_alloc(uint32_t size) //------------------------------------------------- // electron_cartslot_device - constructor //------------------------------------------------- -electron_cartslot_device::electron_cartslot_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) : +electron_cartslot_device::electron_cartslot_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_cartrom_image_interface(mconfig, *this), device_single_card_slot_interface<device_electron_cart_interface>(mconfig, *this), @@ -99,7 +99,7 @@ electron_cartslot_device::electron_cartslot_device(const machine_config &mconfig { } -electron_cartslot_device::electron_cartslot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +electron_cartslot_device::electron_cartslot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : electron_cartslot_device(mconfig, ELECTRON_CARTSLOT, tag, owner, clock) { } diff --git a/src/devices/bus/electron/cart/slot.h b/src/devices/bus/electron/cart/slot.h index b71da09d5ae..a03b6ca63eb 100644 --- a/src/devices/bus/electron/cart/slot.h +++ b/src/devices/bus/electron/cart/slot.h @@ -121,7 +121,7 @@ class electron_cartslot_device : public device_t, public: // construction/destruction template <typename T> - electron_cartslot_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock, T &&slot_options, const char *default_option) + electron_cartslot_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock, T &&slot_options, const char *default_option) : electron_cartslot_device(mconfig, tag, owner, clock) { option_reset(); @@ -130,7 +130,7 @@ public: set_fixed(false); } - electron_cartslot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + electron_cartslot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); // callbacks auto irq_handler() { return m_irq_handler.bind(); } @@ -158,7 +158,7 @@ public: DECLARE_WRITE_LINE_MEMBER(nmi_w) { m_nmi_handler(state); } protected: - electron_cartslot_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + electron_cartslot_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); // device-level overrides virtual void device_start() override; diff --git a/src/devices/bus/electron/cart/sndexp.cpp b/src/devices/bus/electron/cart/sndexp.cpp index 9ca096adbfd..fa587549f7b 100644 --- a/src/devices/bus/electron/cart/sndexp.cpp +++ b/src/devices/bus/electron/cart/sndexp.cpp @@ -60,7 +60,7 @@ ioport_constructor electron_sndexp_device::device_input_ports() const // electron_sndexp_device - constructor //------------------------------------------------- -electron_sndexp_device::electron_sndexp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +electron_sndexp_device::electron_sndexp_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ELECTRON_SNDEXP, tag, owner, clock) , device_electron_cart_interface(mconfig, *this) , m_sn(*this, "sn76489") diff --git a/src/devices/bus/electron/cart/sndexp.h b/src/devices/bus/electron/cart/sndexp.h index f222185aa5f..1eb70a91c0a 100644 --- a/src/devices/bus/electron/cart/sndexp.h +++ b/src/devices/bus/electron/cart/sndexp.h @@ -22,7 +22,7 @@ class electron_sndexp_device : { public: // construction/destruction - electron_sndexp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + electron_sndexp_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/electron/cart/sndexp3.cpp b/src/devices/bus/electron/cart/sndexp3.cpp index f39fb90c414..925dfb1346f 100644 --- a/src/devices/bus/electron/cart/sndexp3.cpp +++ b/src/devices/bus/electron/cart/sndexp3.cpp @@ -39,7 +39,7 @@ void electron_sndexp3_device::device_add_mconfig(machine_config &config) // electron_sndexp3_device - constructor //------------------------------------------------- -electron_sndexp3_device::electron_sndexp3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +electron_sndexp3_device::electron_sndexp3_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ELECTRON_SNDEXP3, tag, owner, clock) , device_electron_cart_interface(mconfig, *this) , m_sn(*this, "sn76489") diff --git a/src/devices/bus/electron/cart/sndexp3.h b/src/devices/bus/electron/cart/sndexp3.h index 95d437b63e2..455ea7a9a66 100644 --- a/src/devices/bus/electron/cart/sndexp3.h +++ b/src/devices/bus/electron/cart/sndexp3.h @@ -22,7 +22,7 @@ class electron_sndexp3_device : { public: // construction/destruction - electron_sndexp3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + electron_sndexp3_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/electron/cart/sp64.cpp b/src/devices/bus/electron/cart/sp64.cpp index 9b5d497999e..3b811207a72 100644 --- a/src/devices/bus/electron/cart/sp64.cpp +++ b/src/devices/bus/electron/cart/sp64.cpp @@ -25,7 +25,7 @@ DEFINE_DEVICE_TYPE(ELECTRON_SP64, electron_sp64_device, "electron_sp64", "Slogge // electron_sp64_device - constructor //------------------------------------------------- -electron_sp64_device::electron_sp64_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +electron_sp64_device::electron_sp64_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ELECTRON_SP64, tag, owner, clock) , device_electron_cart_interface(mconfig, *this) , m_page_register(0) diff --git a/src/devices/bus/electron/cart/sp64.h b/src/devices/bus/electron/cart/sp64.h index 68954fc9d30..2466621ad47 100644 --- a/src/devices/bus/electron/cart/sp64.h +++ b/src/devices/bus/electron/cart/sp64.h @@ -25,7 +25,7 @@ class electron_sp64_device : public device_t, { public: // construction/destruction - electron_sp64_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + electron_sp64_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/electron/cart/std.cpp b/src/devices/bus/electron/cart/std.cpp index f2b7333f347..6bbad0f3f78 100644 --- a/src/devices/bus/electron/cart/std.cpp +++ b/src/devices/bus/electron/cart/std.cpp @@ -25,7 +25,7 @@ DEFINE_DEVICE_TYPE(ELECTRON_STDCART, electron_stdcart_device, "electron_stdcart" // electron_stdcart_device - constructor //------------------------------------------------- -electron_stdcart_device::electron_stdcart_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +electron_stdcart_device::electron_stdcart_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ELECTRON_STDCART, tag, owner, clock) , device_electron_cart_interface(mconfig, *this) { diff --git a/src/devices/bus/electron/cart/std.h b/src/devices/bus/electron/cart/std.h index 3fc9cefbcd9..dae32559841 100644 --- a/src/devices/bus/electron/cart/std.h +++ b/src/devices/bus/electron/cart/std.h @@ -24,7 +24,7 @@ class electron_stdcart_device : public device_t, { public: // construction/destruction - electron_stdcart_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + electron_stdcart_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/electron/cart/stlefs.cpp b/src/devices/bus/electron/cart/stlefs.cpp index 462ead401d1..0f1932976c4 100644 --- a/src/devices/bus/electron/cart/stlefs.cpp +++ b/src/devices/bus/electron/cart/stlefs.cpp @@ -70,7 +70,7 @@ void electron_stlefs_device::device_add_mconfig(machine_config &config) // electron_stlefs_device - constructor //------------------------------------------------- -electron_stlefs_device::electron_stlefs_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +electron_stlefs_device::electron_stlefs_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ELECTRON_STLEFS, tag, owner, clock) , device_electron_cart_interface(mconfig, *this) , m_irqs(*this, "irqs") diff --git a/src/devices/bus/electron/cart/stlefs.h b/src/devices/bus/electron/cart/stlefs.h index 2ff8e53ea87..2b0e33214d3 100644 --- a/src/devices/bus/electron/cart/stlefs.h +++ b/src/devices/bus/electron/cart/stlefs.h @@ -28,7 +28,7 @@ class electron_stlefs_device : { public: // construction/destruction - electron_stlefs_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + electron_stlefs_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/electron/cart/tube.cpp b/src/devices/bus/electron/cart/tube.cpp index 02dcd00275d..e4cea6d5a49 100644 --- a/src/devices/bus/electron/cart/tube.cpp +++ b/src/devices/bus/electron/cart/tube.cpp @@ -37,7 +37,7 @@ void electron_tube_device::device_add_mconfig(machine_config &config) // electron_tube_device - constructor //------------------------------------------------- -electron_tube_device::electron_tube_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +electron_tube_device::electron_tube_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ELECTRON_TUBE, tag, owner, clock) , device_electron_cart_interface(mconfig, *this) , m_tube(*this, "tube") diff --git a/src/devices/bus/electron/cart/tube.h b/src/devices/bus/electron/cart/tube.h index 1d239ef5215..579c68fbdc0 100644 --- a/src/devices/bus/electron/cart/tube.h +++ b/src/devices/bus/electron/cart/tube.h @@ -22,7 +22,7 @@ class electron_tube_device : { public: // construction/destruction - electron_tube_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + electron_tube_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/electron/elksd128.cpp b/src/devices/bus/electron/elksd128.cpp index 302144bb343..12179d61ba3 100644 --- a/src/devices/bus/electron/elksd128.cpp +++ b/src/devices/bus/electron/elksd128.cpp @@ -57,7 +57,7 @@ ROM_END void electron_elksd128_device::device_add_mconfig(machine_config &config) { - SPI_SDCARD(config, m_sdcard, 0); + SPI_SDCARD(config, m_sdcard); m_sdcard->spi_miso_callback().set([this](int state) { m_in_bit = state; }); } @@ -78,7 +78,7 @@ const tiny_rom_entry *electron_elksd128_device::device_rom_region() const // electron_elksd128_device - constructor //------------------------------------------------- -electron_elksd128_device::electron_elksd128_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +electron_elksd128_device::electron_elksd128_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ELECTRON_ELKSD128, tag, owner, clock) , device_electron_expansion_interface(mconfig, *this) , m_flash(*this, "flash") diff --git a/src/devices/bus/electron/elksd128.h b/src/devices/bus/electron/elksd128.h index 48ff1375ea9..bde97f588a7 100644 --- a/src/devices/bus/electron/elksd128.h +++ b/src/devices/bus/electron/elksd128.h @@ -24,7 +24,7 @@ class electron_elksd128_device: { public: // construction/destruction - electron_elksd128_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + electron_elksd128_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/electron/elksd64.cpp b/src/devices/bus/electron/elksd64.cpp index c76c9a8c685..030fc3732f0 100644 --- a/src/devices/bus/electron/elksd64.cpp +++ b/src/devices/bus/electron/elksd64.cpp @@ -38,7 +38,7 @@ ROM_END void electron_elksd64_device::device_add_mconfig(machine_config &config) { - SPI_SDCARD(config, m_sdcard, 0); + SPI_SDCARD(config, m_sdcard); m_sdcard->spi_miso_callback().set([this](int state) { m_status = state << 7; }); } @@ -59,7 +59,7 @@ const tiny_rom_entry *electron_elksd64_device::device_rom_region() const // electron_elksd64_device - constructor //------------------------------------------------- -electron_elksd64_device::electron_elksd64_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +electron_elksd64_device::electron_elksd64_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ELECTRON_ELKSD64, tag, owner, clock) , device_electron_expansion_interface(mconfig, *this) , m_flash(*this, "flash") diff --git a/src/devices/bus/electron/elksd64.h b/src/devices/bus/electron/elksd64.h index d21b9595fc0..093eaf34a5b 100644 --- a/src/devices/bus/electron/elksd64.h +++ b/src/devices/bus/electron/elksd64.h @@ -24,7 +24,7 @@ class electron_elksd64_device: { public: // construction/destruction - electron_elksd64_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + electron_elksd64_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/electron/exp.cpp b/src/devices/bus/electron/exp.cpp index 6e9b1c6a2e4..097111bcb28 100644 --- a/src/devices/bus/electron/exp.cpp +++ b/src/devices/bus/electron/exp.cpp @@ -40,7 +40,7 @@ device_electron_expansion_interface::device_electron_expansion_interface(const m // electron_expansion_slot_device - constructor //------------------------------------------------- -electron_expansion_slot_device::electron_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +electron_expansion_slot_device::electron_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ELECTRON_EXPANSION_SLOT, tag, owner, clock), device_single_card_slot_interface<device_electron_expansion_interface>(mconfig, *this), m_card(nullptr), diff --git a/src/devices/bus/electron/exp.h b/src/devices/bus/electron/exp.h index ea0c435a4be..b1895f62cac 100644 --- a/src/devices/bus/electron/exp.h +++ b/src/devices/bus/electron/exp.h @@ -103,7 +103,7 @@ class electron_expansion_slot_device : public device_t, public device_single_car public: // construction/destruction template <typename T> - electron_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, T &&opts, const char *dflt) + electron_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock, T &&opts, const char *dflt) : electron_expansion_slot_device(mconfig, tag, owner, clock) { option_reset(); @@ -111,7 +111,7 @@ public: set_default_option(dflt); set_fixed(false); } - electron_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + electron_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); // callbacks auto irq_handler() { return m_irq_handler.bind(); } diff --git a/src/devices/bus/electron/fbjoy.cpp b/src/devices/bus/electron/fbjoy.cpp index e5a4042cfeb..19012c64572 100644 --- a/src/devices/bus/electron/fbjoy.cpp +++ b/src/devices/bus/electron/fbjoy.cpp @@ -46,7 +46,7 @@ ioport_constructor electron_fbjoy_device::device_input_ports() const // electron_fbjoy_device - constructor //------------------------------------------------- -electron_fbjoy_device::electron_fbjoy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +electron_fbjoy_device::electron_fbjoy_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ELECTRON_FBJOY, tag, owner, clock) , device_electron_expansion_interface(mconfig, *this) , m_joy(*this, "JOY") diff --git a/src/devices/bus/electron/fbjoy.h b/src/devices/bus/electron/fbjoy.h index d9faaa6cd15..4ea31227377 100644 --- a/src/devices/bus/electron/fbjoy.h +++ b/src/devices/bus/electron/fbjoy.h @@ -28,7 +28,7 @@ class electron_fbjoy_device : { public: // construction/destruction - electron_fbjoy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + electron_fbjoy_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); // optional information overrides virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/electron/fbprint.cpp b/src/devices/bus/electron/fbprint.cpp index 00bb056db75..6952e78144d 100644 --- a/src/devices/bus/electron/fbprint.cpp +++ b/src/devices/bus/electron/fbprint.cpp @@ -39,7 +39,7 @@ void electron_fbprint_device::device_add_mconfig(machine_config &config) // electron_fbprint_device - constructor //------------------------------------------------- -electron_fbprint_device::electron_fbprint_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +electron_fbprint_device::electron_fbprint_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ELECTRON_FBPRINT, tag, owner, clock) , device_electron_expansion_interface(mconfig, *this) , m_centronics(*this, "centronics") diff --git a/src/devices/bus/electron/fbprint.h b/src/devices/bus/electron/fbprint.h index f279e216943..4cb598ae6cb 100644 --- a/src/devices/bus/electron/fbprint.h +++ b/src/devices/bus/electron/fbprint.h @@ -24,7 +24,7 @@ class electron_fbprint_device: { public: // construction/destruction - electron_fbprint_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + electron_fbprint_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/electron/m2105.cpp b/src/devices/bus/electron/m2105.cpp index 35ba1e40e13..9c40e47482d 100644 --- a/src/devices/bus/electron/m2105.cpp +++ b/src/devices/bus/electron/m2105.cpp @@ -116,7 +116,7 @@ void electron_m2105_device::device_add_mconfig(machine_config &config) TMS6100(config, "tms6100", 640000/4); - tms5220_device &tms(TMS5220(config, "tms5220", 640000)); + tms5220_device &tms(TMS5220(config, "tms5220", XTAL::u(640000))); tms.ready_cb().set(m_via[0], FUNC(via6522_device::write_ca1)); tms.ready_cb().append(m_via[0], FUNC(via6522_device::write_pb2)); tms.irq_cb().set(m_via[0], FUNC(via6522_device::write_ca2)); @@ -144,7 +144,7 @@ const tiny_rom_entry *electron_m2105_device::device_rom_region() const // electron_m2105_device - constructor //------------------------------------------------- -electron_m2105_device::electron_m2105_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +electron_m2105_device::electron_m2105_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ELECTRON_M2105, tag, owner, clock) , device_electron_expansion_interface(mconfig, *this) , m_exp_rom(*this, "exp_rom") diff --git a/src/devices/bus/electron/m2105.h b/src/devices/bus/electron/m2105.h index 07c5ffc35c4..d0afe533562 100644 --- a/src/devices/bus/electron/m2105.h +++ b/src/devices/bus/electron/m2105.h @@ -32,7 +32,7 @@ class electron_m2105_device: { public: // construction/destruction - electron_m2105_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + electron_m2105_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/electron/mc68k.cpp b/src/devices/bus/electron/mc68k.cpp index 06e39350977..8650430fc51 100644 --- a/src/devices/bus/electron/mc68k.cpp +++ b/src/devices/bus/electron/mc68k.cpp @@ -92,14 +92,14 @@ void electron_mc68k_device::device_add_mconfig(machine_config &config) RAM(config, m_ram).set_default_size("256K").set_extra_options("64K,128K,192K"); - PIA6821(config, m_pia[0], 0); + PIA6821(config, m_pia[0]); m_pia[0]->writepb_handler().set(m_pia[1], FUNC(pia6821_device::set_a_input)); m_pia[0]->ca2_handler().set(m_pia[1], FUNC(pia6821_device::cb1_w)); m_pia[0]->cb2_handler().set(m_pia[1], FUNC(pia6821_device::ca1_w)); m_pia[0]->irqa_handler().set("irq_ipl0", FUNC(input_merger_device::in_w<0>)); m_pia[0]->irqb_handler().set("irq_ipl0", FUNC(input_merger_device::in_w<1>)); - PIA6821(config, m_pia[1], 0); + PIA6821(config, m_pia[1]); m_pia[1]->writepb_handler().set(m_pia[0], FUNC(pia6821_device::set_a_input)); m_pia[1]->ca2_handler().set(m_pia[0], FUNC(pia6821_device::cb1_w)); m_pia[1]->cb2_handler().set(m_pia[0], FUNC(pia6821_device::ca1_w)); @@ -109,7 +109,7 @@ void electron_mc68k_device::device_add_mconfig(machine_config &config) via6522_device &via(MOS6522(config, "via", 10_MHz_XTAL / 10)); via.irq_handler().set("irq_ipl1", FUNC(input_merger_device::in_w<0>)); - acia6850_device &acia(ACIA6850(config, "acia", 0)); + acia6850_device &acia(ACIA6850(config, "acia")); acia.irq_handler().set("irq_ipl1", FUNC(input_merger_device::in_w<1>)); clock_device &acia_clock(CLOCK(config, "acia_clock", 3.6864_MHz_XTAL / 12)); @@ -130,7 +130,7 @@ const tiny_rom_entry *electron_mc68k_device::device_rom_region() const // electron_mc68k_device - constructor //------------------------------------------------- -electron_mc68k_device::electron_mc68k_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +electron_mc68k_device::electron_mc68k_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ELECTRON_MC68K, tag, owner, clock) , device_electron_expansion_interface(mconfig, *this) , m_maincpu(*this, "maincpu") diff --git a/src/devices/bus/electron/mc68k.h b/src/devices/bus/electron/mc68k.h index c469d06e357..ef27b553e3b 100644 --- a/src/devices/bus/electron/mc68k.h +++ b/src/devices/bus/electron/mc68k.h @@ -27,7 +27,7 @@ class electron_mc68k_device: { public: // construction/destruction - electron_mc68k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + electron_mc68k_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/electron/mode7.cpp b/src/devices/bus/electron/mode7.cpp index 408b6a92300..5093b84499e 100644 --- a/src/devices/bus/electron/mode7.cpp +++ b/src/devices/bus/electron/mode7.cpp @@ -95,7 +95,7 @@ const tiny_rom_entry *electron_mode7_device::device_rom_region() const // electron_mode7_device - constructor //------------------------------------------------- -electron_mode7_device::electron_mode7_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +electron_mode7_device::electron_mode7_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ELECTRON_MODE7, tag, owner, clock) , device_electron_expansion_interface(mconfig, *this) , m_screen(*this, "screen") diff --git a/src/devices/bus/electron/mode7.h b/src/devices/bus/electron/mode7.h index b3c447ee87d..afd1641aceb 100644 --- a/src/devices/bus/electron/mode7.h +++ b/src/devices/bus/electron/mode7.h @@ -27,7 +27,7 @@ public: static constexpr feature_type imperfect_features() { return feature::GRAPHICS; } // construction/destruction - electron_mode7_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + electron_mode7_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); DECLARE_INPUT_CHANGED_MEMBER(break_button); diff --git a/src/devices/bus/electron/plus1.cpp b/src/devices/bus/electron/plus1.cpp index e9aa67bb16b..6e5511ac7ef 100644 --- a/src/devices/bus/electron/plus1.cpp +++ b/src/devices/bus/electron/plus1.cpp @@ -171,7 +171,7 @@ const tiny_rom_entry *electron_ap6_device::device_rom_region() const // electron_plus1_device - constructor //------------------------------------------------- -electron_plus1_device::electron_plus1_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +electron_plus1_device::electron_plus1_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_electron_expansion_interface(mconfig, *this) , m_irqs(*this, "irqs") @@ -188,17 +188,17 @@ electron_plus1_device::electron_plus1_device(const machine_config &mconfig, devi { } -electron_plus1_device::electron_plus1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +electron_plus1_device::electron_plus1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : electron_plus1_device(mconfig, ELECTRON_PLUS1, tag, owner, clock) { } -electron_ap1_device::electron_ap1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +electron_ap1_device::electron_ap1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : electron_plus1_device(mconfig, ELECTRON_AP1, tag, owner, clock) { } -electron_ap6_device::electron_ap6_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock) +electron_ap6_device::electron_ap6_device(const machine_config& mconfig, const char* tag, device_t* owner, const XTAL &clock) : electron_plus1_device(mconfig, ELECTRON_AP6, tag, owner, clock) , m_rom(*this, "rom%u", 1) , m_links(*this, "LINKS") diff --git a/src/devices/bus/electron/plus1.h b/src/devices/bus/electron/plus1.h index bdfd35808e7..f48433e37aa 100644 --- a/src/devices/bus/electron/plus1.h +++ b/src/devices/bus/electron/plus1.h @@ -29,10 +29,10 @@ class electron_plus1_device: { public: // construction/destruction - electron_plus1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + electron_plus1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: - electron_plus1_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + electron_plus1_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); // device-level overrides virtual void device_start() override; @@ -62,7 +62,7 @@ protected: class electron_ap1_device : public electron_plus1_device { public: - electron_ap1_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock); + electron_ap1_device(const machine_config& mconfig, const char* tag, device_t* owner, const XTAL &clock); protected: // optional information overrides @@ -73,7 +73,7 @@ protected: class electron_ap6_device : public electron_plus1_device { public: - electron_ap6_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock); + electron_ap6_device(const machine_config& mconfig, const char* tag, device_t* owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/electron/plus2.cpp b/src/devices/bus/electron/plus2.cpp index 7a75524ed5c..6f8f68982f1 100644 --- a/src/devices/bus/electron/plus2.cpp +++ b/src/devices/bus/electron/plus2.cpp @@ -76,7 +76,7 @@ void electron_plus2_device::device_add_mconfig(machine_config &config) // electron_plus2_device - constructor //------------------------------------------------- -electron_plus2_device::electron_plus2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +electron_plus2_device::electron_plus2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ELECTRON_PLUS2, tag, owner, clock) , device_electron_expansion_interface(mconfig, *this) , m_irqs(*this, "irqs") diff --git a/src/devices/bus/electron/plus2.h b/src/devices/bus/electron/plus2.h index 04e3a280377..390b1ae7277 100644 --- a/src/devices/bus/electron/plus2.h +++ b/src/devices/bus/electron/plus2.h @@ -28,7 +28,7 @@ class electron_plus2_device: { public: // construction/destruction - electron_plus2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + electron_plus2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/electron/plus3.cpp b/src/devices/bus/electron/plus3.cpp index 1589bc722b9..cd7b85e0f1b 100644 --- a/src/devices/bus/electron/plus3.cpp +++ b/src/devices/bus/electron/plus3.cpp @@ -99,7 +99,7 @@ const tiny_rom_entry *electron_plus3_device::device_rom_region() const // electron_plus3_device - constructor //------------------------------------------------- -electron_plus3_device::electron_plus3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +electron_plus3_device::electron_plus3_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ELECTRON_PLUS3, tag, owner, clock) , device_electron_expansion_interface(mconfig, *this) , m_exp(*this, "exp") diff --git a/src/devices/bus/electron/plus3.h b/src/devices/bus/electron/plus3.h index 2854557675b..8f0a5638a83 100644 --- a/src/devices/bus/electron/plus3.h +++ b/src/devices/bus/electron/plus3.h @@ -24,7 +24,7 @@ class electron_plus3_device: { public: // construction/destruction - electron_plus3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + electron_plus3_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/electron/pwrjoy.cpp b/src/devices/bus/electron/pwrjoy.cpp index 1ff7ab79566..38f1a11703b 100644 --- a/src/devices/bus/electron/pwrjoy.cpp +++ b/src/devices/bus/electron/pwrjoy.cpp @@ -55,7 +55,7 @@ const tiny_rom_entry *electron_pwrjoy_device::device_rom_region() const // electron_pwrjoy_device - constructor //------------------------------------------------- -electron_pwrjoy_device::electron_pwrjoy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +electron_pwrjoy_device::electron_pwrjoy_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ELECTRON_PWRJOY, tag, owner, clock) , device_electron_expansion_interface(mconfig, *this) , m_exp_rom(*this, "exp_rom") diff --git a/src/devices/bus/electron/pwrjoy.h b/src/devices/bus/electron/pwrjoy.h index abc91cf3e2b..cf72e5f8284 100644 --- a/src/devices/bus/electron/pwrjoy.h +++ b/src/devices/bus/electron/pwrjoy.h @@ -26,7 +26,7 @@ class electron_pwrjoy_device : { public: // construction/destruction - electron_pwrjoy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + electron_pwrjoy_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); // optional information overrides virtual const tiny_rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/electron/rombox.cpp b/src/devices/bus/electron/rombox.cpp index 47040271e7f..e6cdb9f8c04 100644 --- a/src/devices/bus/electron/rombox.cpp +++ b/src/devices/bus/electron/rombox.cpp @@ -85,7 +85,7 @@ void electron_rombox_device::device_add_mconfig(machine_config &config) // electron_rombox_device - constructor //------------------------------------------------- -electron_rombox_device::electron_rombox_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +electron_rombox_device::electron_rombox_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ELECTRON_ROMBOX, tag, owner, clock), device_electron_expansion_interface(mconfig, *this), m_exp(*this, "exp"), diff --git a/src/devices/bus/electron/rombox.h b/src/devices/bus/electron/rombox.h index 65ed2fa80d8..b18fc522904 100644 --- a/src/devices/bus/electron/rombox.h +++ b/src/devices/bus/electron/rombox.h @@ -24,7 +24,7 @@ class electron_rombox_device: { public: // construction/destruction - electron_rombox_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + electron_rombox_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/electron/romboxp.cpp b/src/devices/bus/electron/romboxp.cpp index 59d83bc4121..2a53446c6ff 100644 --- a/src/devices/bus/electron/romboxp.cpp +++ b/src/devices/bus/electron/romboxp.cpp @@ -120,7 +120,7 @@ const tiny_rom_entry *electron_romboxp_device::device_rom_region() const // electron_romboxp_device - constructor //------------------------------------------------- -electron_romboxp_device::electron_romboxp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +electron_romboxp_device::electron_romboxp_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ELECTRON_ROMBOXP, tag, owner, clock) , device_electron_expansion_interface(mconfig, *this) , m_irqs(*this, "irqs") diff --git a/src/devices/bus/electron/romboxp.h b/src/devices/bus/electron/romboxp.h index 62b2124c913..2a3b1b02de2 100644 --- a/src/devices/bus/electron/romboxp.h +++ b/src/devices/bus/electron/romboxp.h @@ -29,7 +29,7 @@ class electron_romboxp_device: { public: // construction/destruction - electron_romboxp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + electron_romboxp_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/electron/sidewndr.cpp b/src/devices/bus/electron/sidewndr.cpp index a2ab8011b09..0702b416c70 100644 --- a/src/devices/bus/electron/sidewndr.cpp +++ b/src/devices/bus/electron/sidewndr.cpp @@ -84,7 +84,7 @@ const tiny_rom_entry *electron_sidewndr_device::device_rom_region() const // electron_sidewndr_device - constructor //------------------------------------------------- -electron_sidewndr_device::electron_sidewndr_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +electron_sidewndr_device::electron_sidewndr_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ELECTRON_SIDEWNDR, tag, owner, clock) , device_electron_expansion_interface(mconfig, *this) , m_exp(*this, "exp") diff --git a/src/devices/bus/electron/sidewndr.h b/src/devices/bus/electron/sidewndr.h index 2e1dea53087..5199d8ffdc5 100644 --- a/src/devices/bus/electron/sidewndr.h +++ b/src/devices/bus/electron/sidewndr.h @@ -24,7 +24,7 @@ class electron_sidewndr_device: { public: // construction/destruction - electron_sidewndr_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + electron_sidewndr_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides |