diff options
Diffstat (limited to 'src/devices/bus/spectrum')
58 files changed, 142 insertions, 142 deletions
diff --git a/src/devices/bus/spectrum/beta.cpp b/src/devices/bus/spectrum/beta.cpp index 8578cf46b3d..c9aea116a63 100644 --- a/src/devices/bus/spectrum/beta.cpp +++ b/src/devices/bus/spectrum/beta.cpp @@ -311,7 +311,7 @@ void spectrum_gamma_device::device_add_mconfig(machine_config& config) m_centronics->busy_handler().set([this](u8 data) { m_centronics_busy = data; }); m_centronics->set_output_latch(cent_data_out); - ACIA6850(config, m_acia, 0); // schematics missing, wiring unknown + ACIA6850(config, m_acia); // schematics missing, wiring unknown } const tiny_rom_entry *spectrum_betav2_device::device_rom_region() const @@ -353,7 +353,7 @@ const tiny_rom_entry *spectrum_gamma_device::device_rom_region() const // spectrum_betav2_device - constructor //------------------------------------------------- -spectrum_betav2_device::spectrum_betav2_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +spectrum_betav2_device::spectrum_betav2_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_spectrum_expansion_interface(mconfig, *this) , m_rom(*this, "rom") @@ -364,54 +364,54 @@ spectrum_betav2_device::spectrum_betav2_device(const machine_config &mconfig, de { } -spectrum_betav2_device::spectrum_betav2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +spectrum_betav2_device::spectrum_betav2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : spectrum_betav2_device(mconfig, SPECTRUM_BETAV2, tag, owner, clock) { } -spectrum_betav3_device::spectrum_betav3_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +spectrum_betav3_device::spectrum_betav3_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : spectrum_betav2_device(mconfig, type, tag, owner, clock) { } -spectrum_betav3_device::spectrum_betav3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +spectrum_betav3_device::spectrum_betav3_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : spectrum_betav3_device(mconfig, SPECTRUM_BETAV3, tag, owner, clock) { } -spectrum_betaplus_device::spectrum_betaplus_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +spectrum_betaplus_device::spectrum_betaplus_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : spectrum_betav3_device(mconfig, type, tag, owner, clock) { } -spectrum_betaplus_device::spectrum_betaplus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +spectrum_betaplus_device::spectrum_betaplus_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : spectrum_betaplus_device(mconfig, SPECTRUM_BETAPLUS, tag, owner, clock) { } -spectrum_betaclone_device::spectrum_betaclone_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +spectrum_betaclone_device::spectrum_betaclone_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : spectrum_betaplus_device(mconfig, type, tag, owner, clock) { } -spectrum_betaclone_device::spectrum_betaclone_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +spectrum_betaclone_device::spectrum_betaclone_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : spectrum_betaclone_device(mconfig, SPECTRUM_BETACLONE, tag, owner, clock) { } -spectrum_betacbi_device::spectrum_betacbi_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +spectrum_betacbi_device::spectrum_betacbi_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : spectrum_betaclone_device(mconfig, type, tag, owner, clock) , m_centronics(*this, "centronics") , m_centronics_busy(0) { } -spectrum_betacbi_device::spectrum_betacbi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +spectrum_betacbi_device::spectrum_betacbi_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : spectrum_betacbi_device(mconfig, SPECTRUM_BETACBI, tag, owner, clock) { } -spectrum_gamma_device::spectrum_gamma_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +spectrum_gamma_device::spectrum_gamma_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : spectrum_betaplus_device(mconfig, type, tag, owner, clock) , m_ppi(*this, "ppi") , m_acia(*this, "acia") @@ -420,7 +420,7 @@ spectrum_gamma_device::spectrum_gamma_device(const machine_config &mconfig, devi { } -spectrum_gamma_device::spectrum_gamma_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +spectrum_gamma_device::spectrum_gamma_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : spectrum_gamma_device(mconfig, SPECTRUM_GAMMA, tag, owner, clock) { } diff --git a/src/devices/bus/spectrum/beta.h b/src/devices/bus/spectrum/beta.h index 1827c741355..90837ac6d1b 100644 --- a/src/devices/bus/spectrum/beta.h +++ b/src/devices/bus/spectrum/beta.h @@ -28,8 +28,8 @@ class spectrum_betav2_device : { public: // construction/destruction - spectrum_betav2_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); - spectrum_betav2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + spectrum_betav2_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); + spectrum_betav2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); static void floppy_formats(format_registration &fr); @@ -75,8 +75,8 @@ class spectrum_betav3_device : { public: // construction/destruction - spectrum_betav3_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); - spectrum_betav3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + spectrum_betav3_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); + spectrum_betav3_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual void device_add_mconfig(machine_config &config) override; @@ -91,8 +91,8 @@ class spectrum_betaplus_device : { public: // construction/destruction - spectrum_betaplus_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); - spectrum_betaplus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + spectrum_betaplus_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); + spectrum_betaplus_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); DECLARE_INPUT_CHANGED_MEMBER(magic_button); @@ -107,8 +107,8 @@ class spectrum_betaclone_device : { public: // construction/destruction - spectrum_betaclone_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); - spectrum_betaclone_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + spectrum_betaclone_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); + spectrum_betaclone_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual uint8_t mreq_r(offs_t offset) override; @@ -121,8 +121,8 @@ class spectrum_betacbi_device : { public: // construction/destruction - spectrum_betacbi_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); - spectrum_betacbi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + spectrum_betacbi_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); + spectrum_betacbi_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual void device_start() override; @@ -142,8 +142,8 @@ class spectrum_gamma_device : { public: // construction/destruction - spectrum_gamma_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); - spectrum_gamma_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + spectrum_gamma_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); + spectrum_gamma_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); DECLARE_CUSTOM_INPUT_MEMBER(busy_r) { return !m_centronics_busy; } protected: diff --git a/src/devices/bus/spectrum/beta128.cpp b/src/devices/bus/spectrum/beta128.cpp index 09b95763a27..e79c6b72930 100644 --- a/src/devices/bus/spectrum/beta128.cpp +++ b/src/devices/bus/spectrum/beta128.cpp @@ -131,7 +131,7 @@ const tiny_rom_entry *spectrum_beta128_device::device_rom_region() const // spectrum_beta128_device - constructor //------------------------------------------------- -spectrum_beta128_device::spectrum_beta128_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +spectrum_beta128_device::spectrum_beta128_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, SPECTRUM_BETA128, tag, owner, clock) , device_spectrum_expansion_interface(mconfig, *this) , m_rom(*this, "rom") diff --git a/src/devices/bus/spectrum/beta128.h b/src/devices/bus/spectrum/beta128.h index bcbc889c94d..fe4a58042e9 100644 --- a/src/devices/bus/spectrum/beta128.h +++ b/src/devices/bus/spectrum/beta128.h @@ -25,7 +25,7 @@ class spectrum_beta128_device : { public: // construction/destruction - spectrum_beta128_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + spectrum_beta128_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); static void floppy_formats(format_registration &fr); DECLARE_INPUT_CHANGED_MEMBER(magic_button); diff --git a/src/devices/bus/spectrum/d40.cpp b/src/devices/bus/spectrum/d40.cpp index 9a7811b7936..f7b95a56337 100644 --- a/src/devices/bus/spectrum/d40.cpp +++ b/src/devices/bus/spectrum/d40.cpp @@ -145,7 +145,7 @@ const tiny_rom_entry *spectrum_d80v2_device::device_rom_region() const // spectrum_d40base_device - constructor //------------------------------------------------- -spectrum_d40base_device::spectrum_d40base_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +spectrum_d40base_device::spectrum_d40base_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_spectrum_expansion_interface(mconfig, *this) , m_rom(*this, "rom") @@ -154,26 +154,26 @@ spectrum_d40base_device::spectrum_d40base_device(const machine_config &mconfig, { } -spectrum_d40_device::spectrum_d40_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +spectrum_d40_device::spectrum_d40_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : spectrum_d40base_device(mconfig, SPECTRUM_D40, tag, owner, clock) , m_fdc(*this, "fdc") , m_floppy(*this, "fdc:%u", 0) { } -spectrum_d40_device::spectrum_d40_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +spectrum_d40_device::spectrum_d40_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) :spectrum_d40base_device(mconfig, type, tag, owner, clock) , m_fdc(*this, "fdc") , m_floppy(*this, "fdc:%u", 0) { } -spectrum_d80_device::spectrum_d80_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +spectrum_d80_device::spectrum_d80_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : spectrum_d40_device(mconfig, SPECTRUM_D80, tag, owner, clock) { } -spectrum_d80v2_device::spectrum_d80v2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +spectrum_d80v2_device::spectrum_d80v2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : spectrum_d40base_device(mconfig, SPECTRUM_D80V2, tag, owner, clock) , m_fdc(*this, "fdc") , m_floppy(*this, "fdc:%u", 0) diff --git a/src/devices/bus/spectrum/d40.h b/src/devices/bus/spectrum/d40.h index 250b2feccd8..ca1fd9161bf 100644 --- a/src/devices/bus/spectrum/d40.h +++ b/src/devices/bus/spectrum/d40.h @@ -29,7 +29,7 @@ public: DECLARE_INPUT_CHANGED_MEMBER(snapshot_button); protected: - spectrum_d40base_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + spectrum_d40base_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; @@ -66,10 +66,10 @@ class spectrum_d40_device : public spectrum_d40base_device { public: - spectrum_d40_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + spectrum_d40_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: - spectrum_d40_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + spectrum_d40_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); virtual void device_add_mconfig(machine_config &config) override; virtual const tiny_rom_entry *device_rom_region() const override; @@ -95,7 +95,7 @@ class spectrum_d80_device : public spectrum_d40_device { public: - spectrum_d80_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + spectrum_d80_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual void device_add_mconfig(machine_config &config) override; @@ -105,7 +105,7 @@ class spectrum_d80v2_device : public spectrum_d40base_device { public: - spectrum_d80v2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + spectrum_d80v2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual void device_add_mconfig(machine_config &config) override; diff --git a/src/devices/bus/spectrum/exp.cpp b/src/devices/bus/spectrum/exp.cpp index a0c79eeaec8..2359f555463 100644 --- a/src/devices/bus/spectrum/exp.cpp +++ b/src/devices/bus/spectrum/exp.cpp @@ -40,7 +40,7 @@ device_spectrum_expansion_interface::device_spectrum_expansion_interface(const m // spectrum_expansion_slot_device - constructor //------------------------------------------------- -spectrum_expansion_slot_device::spectrum_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +spectrum_expansion_slot_device::spectrum_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, SPECTRUM_EXPANSION_SLOT, tag, owner, clock), device_single_card_slot_interface<device_spectrum_expansion_interface>(mconfig, *this), m_card(nullptr), diff --git a/src/devices/bus/spectrum/exp.h b/src/devices/bus/spectrum/exp.h index 04e3e942889..86ba437c48f 100644 --- a/src/devices/bus/spectrum/exp.h +++ b/src/devices/bus/spectrum/exp.h @@ -71,7 +71,7 @@ public: set_fixed(false); } - spectrum_expansion_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock = 0); + spectrum_expansion_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock = XTAL()); // callbacks auto irq_handler() { return m_irq_handler.bind(); } diff --git a/src/devices/bus/spectrum/floppyone.cpp b/src/devices/bus/spectrum/floppyone.cpp index 4291199501d..22ec40a2588 100644 --- a/src/devices/bus/spectrum/floppyone.cpp +++ b/src/devices/bus/spectrum/floppyone.cpp @@ -148,7 +148,7 @@ const tiny_rom_entry *spectrum_flpone_device::device_rom_region() const // spectrum_flpone_device - constructor //------------------------------------------------- -spectrum_flpone_device::spectrum_flpone_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +spectrum_flpone_device::spectrum_flpone_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, SPECTRUM_FLPONE, tag, owner, clock) , device_spectrum_expansion_interface(mconfig, *this) , m_rom(*this, "rom") diff --git a/src/devices/bus/spectrum/floppyone.h b/src/devices/bus/spectrum/floppyone.h index 8eeea6bad0f..6916c2933d4 100644 --- a/src/devices/bus/spectrum/floppyone.h +++ b/src/devices/bus/spectrum/floppyone.h @@ -28,7 +28,7 @@ class spectrum_flpone_device : { public: // construction/destruction - spectrum_flpone_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + spectrum_flpone_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); static void floppy_formats(format_registration &fr); DECLARE_INPUT_CHANGED_MEMBER(snapshot_button) { m_slot->nmi_w(newval ? ASSERT_LINE : CLEAR_LINE); } diff --git a/src/devices/bus/spectrum/fuller.cpp b/src/devices/bus/spectrum/fuller.cpp index 0346a806171..95dd6cc83c7 100644 --- a/src/devices/bus/spectrum/fuller.cpp +++ b/src/devices/bus/spectrum/fuller.cpp @@ -66,7 +66,7 @@ void spectrum_fuller_device::device_add_mconfig(machine_config &config) // spectrum_fuller_device - constructor //------------------------------------------------- -spectrum_fuller_device::spectrum_fuller_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +spectrum_fuller_device::spectrum_fuller_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, SPECTRUM_FULLER, tag, owner, clock) , device_spectrum_expansion_interface(mconfig, *this) , m_exp(*this, "exp") diff --git a/src/devices/bus/spectrum/fuller.h b/src/devices/bus/spectrum/fuller.h index fa16ec01579..00239d1abce 100644 --- a/src/devices/bus/spectrum/fuller.h +++ b/src/devices/bus/spectrum/fuller.h @@ -27,7 +27,7 @@ class spectrum_fuller_device : { public: // construction/destruction - spectrum_fuller_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + spectrum_fuller_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/spectrum/intf1.cpp b/src/devices/bus/spectrum/intf1.cpp index df40de1f9d6..ee821c657ee 100644 --- a/src/devices/bus/spectrum/intf1.cpp +++ b/src/devices/bus/spectrum/intf1.cpp @@ -72,7 +72,7 @@ const tiny_rom_entry *spectrum_intf1_device::device_rom_region() const // spectrum_intf1_device - constructor //------------------------------------------------- -spectrum_intf1_device::spectrum_intf1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +spectrum_intf1_device::spectrum_intf1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, SPECTRUM_INTF1, tag, owner, clock) , device_spectrum_expansion_interface(mconfig, *this) , m_exp(*this, "exp") diff --git a/src/devices/bus/spectrum/intf1.h b/src/devices/bus/spectrum/intf1.h index 787c64b843d..5700e66d222 100644 --- a/src/devices/bus/spectrum/intf1.h +++ b/src/devices/bus/spectrum/intf1.h @@ -25,7 +25,7 @@ class spectrum_intf1_device: { public: // construction/destruction - spectrum_intf1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + spectrum_intf1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); static constexpr feature_type unemulated_features() { return feature::DISK | feature::LAN; } diff --git a/src/devices/bus/spectrum/intf2.cpp b/src/devices/bus/spectrum/intf2.cpp index 5b407d88df3..f0f32a8c359 100644 --- a/src/devices/bus/spectrum/intf2.cpp +++ b/src/devices/bus/spectrum/intf2.cpp @@ -72,7 +72,7 @@ void spectrum_intf2_device::device_add_mconfig(machine_config &config) // spectrum_intf2_device - constructor //------------------------------------------------- -spectrum_intf2_device::spectrum_intf2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +spectrum_intf2_device::spectrum_intf2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, SPECTRUM_INTF2, tag, owner, clock) , device_spectrum_expansion_interface(mconfig, *this) , m_cart(*this, "cartslot") diff --git a/src/devices/bus/spectrum/intf2.h b/src/devices/bus/spectrum/intf2.h index 4faecbae93a..5597f8d6ff1 100644 --- a/src/devices/bus/spectrum/intf2.h +++ b/src/devices/bus/spectrum/intf2.h @@ -25,7 +25,7 @@ class spectrum_intf2_device: { public: // construction/destruction - spectrum_intf2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + spectrum_intf2_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/spectrum/kempdisc.cpp b/src/devices/bus/spectrum/kempdisc.cpp index 32573ebf969..96dd410e352 100644 --- a/src/devices/bus/spectrum/kempdisc.cpp +++ b/src/devices/bus/spectrum/kempdisc.cpp @@ -118,7 +118,7 @@ const tiny_rom_entry *spectrum_spdos_device::device_rom_region() const // spectrum_kempdisc_device - constructor //------------------------------------------------- -spectrum_kempdisc_device::spectrum_kempdisc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +spectrum_kempdisc_device::spectrum_kempdisc_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_spectrum_expansion_interface(mconfig, *this) , m_rom(*this, "rom") @@ -129,12 +129,12 @@ spectrum_kempdisc_device::spectrum_kempdisc_device(const machine_config &mconfig { } -spectrum_kempdisc_device::spectrum_kempdisc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +spectrum_kempdisc_device::spectrum_kempdisc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : spectrum_kempdisc_device(mconfig, SPECTRUM_KEMPDISC, tag, owner, clock) { } -spectrum_spdos_device::spectrum_spdos_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +spectrum_spdos_device::spectrum_spdos_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : spectrum_kempdisc_device(mconfig, SPECTRUM_SPDOS, tag, owner, clock) { } diff --git a/src/devices/bus/spectrum/kempdisc.h b/src/devices/bus/spectrum/kempdisc.h index 3a3b5118402..c8914264e59 100644 --- a/src/devices/bus/spectrum/kempdisc.h +++ b/src/devices/bus/spectrum/kempdisc.h @@ -25,12 +25,12 @@ class spectrum_kempdisc_device : { public: // construction/destruction - spectrum_kempdisc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + spectrum_kempdisc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); static void floppy_formats(format_registration &fr); protected: - spectrum_kempdisc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + spectrum_kempdisc_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; virtual void device_reset() override; @@ -65,7 +65,7 @@ class spectrum_spdos_device : { public: // construction/destruction - spectrum_spdos_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + spectrum_spdos_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // optional information overrides diff --git a/src/devices/bus/spectrum/kempjoy.cpp b/src/devices/bus/spectrum/kempjoy.cpp index 4dee6eabba0..ef6d980254c 100644 --- a/src/devices/bus/spectrum/kempjoy.cpp +++ b/src/devices/bus/spectrum/kempjoy.cpp @@ -48,7 +48,7 @@ ioport_constructor spectrum_kempjoy_device::device_input_ports() const // spectrum_kempjoy_device - constructor //------------------------------------------------- -spectrum_kempjoy_device::spectrum_kempjoy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +spectrum_kempjoy_device::spectrum_kempjoy_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, SPECTRUM_KEMPJOY, tag, owner, clock) , device_spectrum_expansion_interface(mconfig, *this) , m_joy(*this, "JOY") diff --git a/src/devices/bus/spectrum/kempjoy.h b/src/devices/bus/spectrum/kempjoy.h index 466dceb7517..35bff2c8775 100644 --- a/src/devices/bus/spectrum/kempjoy.h +++ b/src/devices/bus/spectrum/kempjoy.h @@ -26,7 +26,7 @@ class spectrum_kempjoy_device : { public: // construction/destruction - spectrum_kempjoy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + spectrum_kempjoy_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/spectrum/logitek.cpp b/src/devices/bus/spectrum/logitek.cpp index 6406231ce47..8d75701439d 100644 --- a/src/devices/bus/spectrum/logitek.cpp +++ b/src/devices/bus/spectrum/logitek.cpp @@ -66,7 +66,7 @@ ROM_END void spectrum_proceed_device::device_add_mconfig(machine_config &config) { - Z80PIO(config, m_z80pio, 3500000); + Z80PIO(config, m_z80pio, XTAL::u(3500000)); m_z80pio->out_pa_callback().set(FUNC(spectrum_proceed_device::pioa_w)); m_z80pio->in_pb_callback().set(FUNC(spectrum_proceed_device::piob_r)); m_z80pio->out_pb_callback().set(FUNC(spectrum_proceed_device::piob_w)); @@ -92,7 +92,7 @@ const tiny_rom_entry *spectrum_proceed_device::device_rom_region() const // spectrum_proceed_device - constructor //------------------------------------------------- -spectrum_proceed_device::spectrum_proceed_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +spectrum_proceed_device::spectrum_proceed_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, SPECTRUM_PROCEED, tag, owner, clock) , device_spectrum_expansion_interface(mconfig, *this) , m_rom(*this, "rom") diff --git a/src/devices/bus/spectrum/logitek.h b/src/devices/bus/spectrum/logitek.h index a6d807d7236..aa023f50eac 100644 --- a/src/devices/bus/spectrum/logitek.h +++ b/src/devices/bus/spectrum/logitek.h @@ -26,7 +26,7 @@ class spectrum_proceed_device : { public: // construction/destruction - spectrum_proceed_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + spectrum_proceed_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/spectrum/lprint.cpp b/src/devices/bus/spectrum/lprint.cpp index 912c26d6c74..2a8b82e0736 100644 --- a/src/devices/bus/spectrum/lprint.cpp +++ b/src/devices/bus/spectrum/lprint.cpp @@ -142,7 +142,7 @@ const tiny_rom_entry *spectrum_kempcentreu_device::device_rom_region() const // spectrum_lprint_device - constructors //------------------------------------------------- -spectrum_lprint_device::spectrum_lprint_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +spectrum_lprint_device::spectrum_lprint_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, SPECTRUM_LPRINT, tag, owner, clock) , device_spectrum_expansion_interface(mconfig, *this) , m_rom(*this, "rom") @@ -150,7 +150,7 @@ spectrum_lprint_device::spectrum_lprint_device(const machine_config &mconfig, co { } -spectrum_lprint3_device::spectrum_lprint3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +spectrum_lprint3_device::spectrum_lprint3_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, SPECTRUM_LPRINT3, tag, owner, clock) , device_spectrum_expansion_interface(mconfig, *this) , m_rom(*this, "rom") @@ -160,14 +160,14 @@ spectrum_lprint3_device::spectrum_lprint3_device(const machine_config &mconfig, { } -spectrum_kempcentrs_device::spectrum_kempcentrs_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +spectrum_kempcentrs_device::spectrum_kempcentrs_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, SPECTRUM_KEMPCENTRS, tag, owner, clock) , device_spectrum_expansion_interface(mconfig, *this) , m_centronics(*this, "centronics") { } -spectrum_kempcentre_device::spectrum_kempcentre_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +spectrum_kempcentre_device::spectrum_kempcentre_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_spectrum_expansion_interface(mconfig, *this) , m_rom(*this, "rom") @@ -175,12 +175,12 @@ spectrum_kempcentre_device::spectrum_kempcentre_device(const machine_config &mco { } -spectrum_kempcentre_device::spectrum_kempcentre_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +spectrum_kempcentre_device::spectrum_kempcentre_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : spectrum_kempcentre_device(mconfig, SPECTRUM_KEMPCENTREF, tag, owner, clock) { } -spectrum_kempcentreu_device::spectrum_kempcentreu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +spectrum_kempcentreu_device::spectrum_kempcentreu_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : spectrum_kempcentre_device(mconfig, SPECTRUM_KEMPCENTREU, tag, owner, clock) { } diff --git a/src/devices/bus/spectrum/lprint.h b/src/devices/bus/spectrum/lprint.h index d58793607c6..a0ca51f2b0a 100644 --- a/src/devices/bus/spectrum/lprint.h +++ b/src/devices/bus/spectrum/lprint.h @@ -23,7 +23,7 @@ class spectrum_lprint_device : { public: // construction/destruction - spectrum_lprint_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + spectrum_lprint_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides @@ -57,7 +57,7 @@ class spectrum_lprint3_device : { public: // construction/destruction - spectrum_lprint3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + spectrum_lprint3_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides @@ -98,7 +98,7 @@ class spectrum_kempcentrs_device : { public: // construction/destruction - spectrum_kempcentrs_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + spectrum_kempcentrs_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides @@ -125,10 +125,10 @@ class spectrum_kempcentre_device : { public: // construction/destruction - spectrum_kempcentre_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + spectrum_kempcentre_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: - spectrum_kempcentre_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + spectrum_kempcentre_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; @@ -160,7 +160,7 @@ class spectrum_kempcentreu_device : { public: // construction/destruction - spectrum_kempcentreu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + spectrum_kempcentreu_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/spectrum/melodik.cpp b/src/devices/bus/spectrum/melodik.cpp index 0b77635c051..72c09910877 100644 --- a/src/devices/bus/spectrum/melodik.cpp +++ b/src/devices/bus/spectrum/melodik.cpp @@ -43,7 +43,7 @@ void spectrum_melodik_device::device_add_mconfig(machine_config &config) // spectrum_melodik_device - constructor //------------------------------------------------- -spectrum_melodik_device::spectrum_melodik_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +spectrum_melodik_device::spectrum_melodik_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, SPECTRUM_MELODIK, tag, owner, clock) , device_spectrum_expansion_interface(mconfig, *this) , m_exp(*this, "exp") diff --git a/src/devices/bus/spectrum/melodik.h b/src/devices/bus/spectrum/melodik.h index 6c0d4f6b3fd..5a41f9fe8ad 100644 --- a/src/devices/bus/spectrum/melodik.h +++ b/src/devices/bus/spectrum/melodik.h @@ -27,7 +27,7 @@ class spectrum_melodik_device : { public: // construction/destruction - spectrum_melodik_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + spectrum_melodik_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/spectrum/mface.cpp b/src/devices/bus/spectrum/mface.cpp index 693b3eb4fcf..9a2d04bff1c 100644 --- a/src/devices/bus/spectrum/mface.cpp +++ b/src/devices/bus/spectrum/mface.cpp @@ -354,7 +354,7 @@ const tiny_rom_entry *spectrum_mprint_device::device_rom_region() const // spectrum_mface_base_device - constructor //------------------------------------------------- -spectrum_mface_base_device::spectrum_mface_base_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +spectrum_mface_base_device::spectrum_mface_base_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_spectrum_expansion_interface(mconfig, *this) , m_rom(*this, "rom") @@ -362,64 +362,64 @@ spectrum_mface_base_device::spectrum_mface_base_device(const machine_config &mco { } -spectrum_mface1v2_device::spectrum_mface1v2_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +spectrum_mface1v2_device::spectrum_mface1v2_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : spectrum_mface_base_device(mconfig, type, tag, owner, clock) , m_joy(*this, "JOY") , m_hwconfig(*this, "CONFIG") { } -spectrum_mface1v2_device::spectrum_mface1v2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +spectrum_mface1v2_device::spectrum_mface1v2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : spectrum_mface1v2_device(mconfig, SPECTRUM_MFACE1V2, tag, owner, clock) { } -spectrum_mface1v1_device::spectrum_mface1v1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +spectrum_mface1v1_device::spectrum_mface1v1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : spectrum_mface1v2_device(mconfig, SPECTRUM_MFACE1V1, tag, owner, clock) { } -spectrum_mface1v3_device::spectrum_mface1v3_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +spectrum_mface1v3_device::spectrum_mface1v3_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : spectrum_mface1v2_device(mconfig, type, tag, owner, clock) { } -spectrum_mface1v3_device::spectrum_mface1v3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +spectrum_mface1v3_device::spectrum_mface1v3_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : spectrum_mface1v3_device(mconfig, SPECTRUM_MFACE1V3, tag, owner, clock) { } -spectrum_mface1_device::spectrum_mface1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +spectrum_mface1_device::spectrum_mface1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : spectrum_mface1v3_device(mconfig, SPECTRUM_MFACE1, tag, owner, clock) { } -spectrum_mface128_base_device::spectrum_mface128_base_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +spectrum_mface128_base_device::spectrum_mface128_base_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : spectrum_mface_base_device(mconfig, type, tag, owner, clock) { } -spectrum_mface128v1_device::spectrum_mface128v1_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +spectrum_mface128v1_device::spectrum_mface128v1_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : spectrum_mface128_base_device(mconfig, type, tag, owner, clock) { } -spectrum_mface128v1_device::spectrum_mface128v1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +spectrum_mface128v1_device::spectrum_mface128v1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : spectrum_mface128v1_device(mconfig, SPECTRUM_MFACE128V1, tag, owner, clock) { } -spectrum_mface128_device::spectrum_mface128_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +spectrum_mface128_device::spectrum_mface128_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : spectrum_mface128v1_device(mconfig, SPECTRUM_MFACE128, tag, owner, clock) { } -spectrum_mface3_device::spectrum_mface3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +spectrum_mface3_device::spectrum_mface3_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : spectrum_mface128_base_device(mconfig, SPECTRUM_MFACE3, tag, owner, clock) { } -spectrum_mprint_device::spectrum_mprint_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +spectrum_mprint_device::spectrum_mprint_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : spectrum_mface128_base_device(mconfig, SPECTRUM_MPRINT, tag, owner, clock) , m_centronics(*this, "centronics") { diff --git a/src/devices/bus/spectrum/mface.h b/src/devices/bus/spectrum/mface.h index 7b3fbf03e72..0f379119f17 100644 --- a/src/devices/bus/spectrum/mface.h +++ b/src/devices/bus/spectrum/mface.h @@ -21,12 +21,12 @@ class spectrum_mface_base_device : { public: // construction/destruction - spectrum_mface_base_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + spectrum_mface_base_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual DECLARE_INPUT_CHANGED_MEMBER(magic_button) { m_slot->nmi_w(newval ? CLEAR_LINE : ASSERT_LINE); } protected: - spectrum_mface_base_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + spectrum_mface_base_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; @@ -61,12 +61,12 @@ protected: class spectrum_mface1v2_device : public spectrum_mface_base_device { public: - spectrum_mface1v2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + spectrum_mface1v2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); DECLARE_INPUT_CHANGED_MEMBER(magic_button) override; protected: - spectrum_mface1v2_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + spectrum_mface1v2_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; @@ -85,7 +85,7 @@ protected: class spectrum_mface1v1_device : public spectrum_mface1v2_device { public: - spectrum_mface1v1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + spectrum_mface1v1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides @@ -101,10 +101,10 @@ protected: class spectrum_mface1v3_device : public spectrum_mface1v2_device { public: - spectrum_mface1v3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + spectrum_mface1v3_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: - spectrum_mface1v3_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + spectrum_mface1v3_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); // optional information overrides virtual const tiny_rom_entry *device_rom_region() const override; @@ -116,7 +116,7 @@ protected: class spectrum_mface1_device : public spectrum_mface1v3_device { public: - spectrum_mface1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + spectrum_mface1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); DECLARE_INPUT_CHANGED_MEMBER(magic_button) override; @@ -132,12 +132,12 @@ protected: class spectrum_mface128_base_device : public spectrum_mface_base_device { public: - spectrum_mface128_base_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + spectrum_mface128_base_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); DECLARE_INPUT_CHANGED_MEMBER(magic_button) override; protected: - spectrum_mface128_base_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + spectrum_mface128_base_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; @@ -149,10 +149,10 @@ protected: class spectrum_mface128v1_device : public spectrum_mface128_base_device { public: - spectrum_mface128v1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + spectrum_mface128v1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: - spectrum_mface128v1_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + spectrum_mface128v1_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; @@ -169,7 +169,7 @@ protected: class spectrum_mface128_device : public spectrum_mface128v1_device { public: - spectrum_mface128_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + spectrum_mface128_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // optional information overrides @@ -183,7 +183,7 @@ protected: class spectrum_mface3_device : public spectrum_mface128_base_device { public: - spectrum_mface3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + spectrum_mface3_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); DECLARE_INPUT_CHANGED_MEMBER(magic_button) override; @@ -207,7 +207,7 @@ private: class spectrum_mprint_device : public spectrum_mface128_base_device { public: - spectrum_mprint_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + spectrum_mprint_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/spectrum/mgt.cpp b/src/devices/bus/spectrum/mgt.cpp index 581a748dcea..0f54be726cc 100644 --- a/src/devices/bus/spectrum/mgt.cpp +++ b/src/devices/bus/spectrum/mgt.cpp @@ -329,7 +329,7 @@ const tiny_rom_entry *spectrum_disciple_device::device_rom_region() const // spectrum_plusd_device - constructor //------------------------------------------------- -spectrum_plusd_device::spectrum_plusd_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +spectrum_plusd_device::spectrum_plusd_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_spectrum_expansion_interface(mconfig, *this) , m_rom(*this, "rom") @@ -340,7 +340,7 @@ spectrum_plusd_device::spectrum_plusd_device(const machine_config &mconfig, devi { } -spectrum_plusd_device::spectrum_plusd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +spectrum_plusd_device::spectrum_plusd_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : spectrum_plusd_device(mconfig, SPECTRUM_PLUSD, tag, owner, clock) { } @@ -349,7 +349,7 @@ spectrum_plusd_device::spectrum_plusd_device(const machine_config &mconfig, cons // spectrum_disciple_device - constructor //------------------------------------------------- -spectrum_disciple_device::spectrum_disciple_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +spectrum_disciple_device::spectrum_disciple_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : spectrum_plusd_device(mconfig, SPECTRUM_DISCIPLE, tag, owner, clock) , m_exp(*this, "exp") , m_joy1(*this, "JOY1") diff --git a/src/devices/bus/spectrum/mgt.h b/src/devices/bus/spectrum/mgt.h index 35d168b10ae..a58502a76a6 100644 --- a/src/devices/bus/spectrum/mgt.h +++ b/src/devices/bus/spectrum/mgt.h @@ -29,13 +29,13 @@ class spectrum_plusd_device: public device_t, public device_spectrum_expansion_i { public: // construction/destruction - spectrum_plusd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + spectrum_plusd_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); static void floppy_formats(format_registration &fr); DECLARE_INPUT_CHANGED_MEMBER(snapshot_button); protected: - spectrum_plusd_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + spectrum_plusd_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; @@ -69,7 +69,7 @@ class spectrum_disciple_device: public spectrum_plusd_device { public: // construction/destruction - spectrum_disciple_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + spectrum_disciple_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); DECLARE_INPUT_CHANGED_MEMBER(inhibit_button) { if (!newval) m_romcs = 0; } diff --git a/src/devices/bus/spectrum/mikroplus.cpp b/src/devices/bus/spectrum/mikroplus.cpp index 9f46bc1b7db..4b99263a312 100644 --- a/src/devices/bus/spectrum/mikroplus.cpp +++ b/src/devices/bus/spectrum/mikroplus.cpp @@ -67,7 +67,7 @@ const tiny_rom_entry *spectrum_mikroplus_device::device_rom_region() const // spectrum_mikroplus_device - constructor //------------------------------------------------- -spectrum_mikroplus_device::spectrum_mikroplus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +spectrum_mikroplus_device::spectrum_mikroplus_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, SPECTRUM_MIKROPLUS, tag, owner, clock) , device_spectrum_expansion_interface(mconfig, *this) , m_rom(*this, "rom") diff --git a/src/devices/bus/spectrum/mikroplus.h b/src/devices/bus/spectrum/mikroplus.h index e06cb38bb2c..a66939af1fc 100644 --- a/src/devices/bus/spectrum/mikroplus.h +++ b/src/devices/bus/spectrum/mikroplus.h @@ -26,7 +26,7 @@ class spectrum_mikroplus_device : { public: // construction/destruction - spectrum_mikroplus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + spectrum_mikroplus_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/spectrum/mpoker.cpp b/src/devices/bus/spectrum/mpoker.cpp index c2d84d13c1b..40304099e4d 100644 --- a/src/devices/bus/spectrum/mpoker.cpp +++ b/src/devices/bus/spectrum/mpoker.cpp @@ -99,7 +99,7 @@ const tiny_rom_entry *spectrum_mpoker_device::device_rom_region() const // spectrum_mpoker_device - constructor //------------------------------------------------- -spectrum_mpoker_device::spectrum_mpoker_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +spectrum_mpoker_device::spectrum_mpoker_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, SPECTRUM_MPOKER, tag, owner, clock) , device_spectrum_expansion_interface(mconfig, *this) , m_rom(*this, "rom") diff --git a/src/devices/bus/spectrum/mpoker.h b/src/devices/bus/spectrum/mpoker.h index 27f7cef19b0..b043f20349a 100644 --- a/src/devices/bus/spectrum/mpoker.h +++ b/src/devices/bus/spectrum/mpoker.h @@ -21,7 +21,7 @@ class spectrum_mpoker_device : public device_t, public device_spectrum_expansion { public: // construction/destruction - spectrum_mpoker_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + spectrum_mpoker_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); DECLARE_INPUT_CHANGED_MEMBER(freeze_button); diff --git a/src/devices/bus/spectrum/opus.cpp b/src/devices/bus/spectrum/opus.cpp index 37eff23bce6..d41050ef063 100644 --- a/src/devices/bus/spectrum/opus.cpp +++ b/src/devices/bus/spectrum/opus.cpp @@ -91,7 +91,7 @@ void spectrum_opus_device::device_add_mconfig(machine_config &config) m_centronics->busy_handler().set(FUNC(spectrum_opus_device::busy_w)); /* pia */ - PIA6821(config, m_pia, 0); + PIA6821(config, m_pia); m_pia->writepa_handler().set(FUNC(spectrum_opus_device::pia_out_a)); m_pia->writepb_handler().set(FUNC(spectrum_opus_device::pia_out_b)); m_pia->cb2_handler().set("centronics", FUNC(centronics_device::write_strobe)); @@ -119,7 +119,7 @@ const tiny_rom_entry *spectrum_opus_device::device_rom_region() const // spectrum_opus_device - constructor //------------------------------------------------- -spectrum_opus_device::spectrum_opus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +spectrum_opus_device::spectrum_opus_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, SPECTRUM_OPUS, tag, owner, clock) , device_spectrum_expansion_interface(mconfig, *this) , m_joy(*this, "JOY") diff --git a/src/devices/bus/spectrum/opus.h b/src/devices/bus/spectrum/opus.h index 2c175621820..a308e8c12bd 100644 --- a/src/devices/bus/spectrum/opus.h +++ b/src/devices/bus/spectrum/opus.h @@ -28,7 +28,7 @@ class spectrum_opus_device: { public: // construction/destruction - spectrum_opus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + spectrum_opus_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); static void floppy_formats(format_registration &fr); diff --git a/src/devices/bus/spectrum/plus2test.cpp b/src/devices/bus/spectrum/plus2test.cpp index 3d90ed4dee3..a5b744f162d 100644 --- a/src/devices/bus/spectrum/plus2test.cpp +++ b/src/devices/bus/spectrum/plus2test.cpp @@ -42,7 +42,7 @@ const tiny_rom_entry *spectrum_plus2test_device::device_rom_region() const // spectrum_plus2test_device - constructor //------------------------------------------------- -spectrum_plus2test_device::spectrum_plus2test_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +spectrum_plus2test_device::spectrum_plus2test_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, SPECTRUM_PLUS2TEST, tag, owner, clock) , device_spectrum_expansion_interface(mconfig, *this) , m_rom(*this, "rom") diff --git a/src/devices/bus/spectrum/plus2test.h b/src/devices/bus/spectrum/plus2test.h index f8caad2fa26..3d596a43674 100644 --- a/src/devices/bus/spectrum/plus2test.h +++ b/src/devices/bus/spectrum/plus2test.h @@ -26,7 +26,7 @@ class spectrum_plus2test_device : { public: // construction/destruction - spectrum_plus2test_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + spectrum_plus2test_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/spectrum/protek.cpp b/src/devices/bus/spectrum/protek.cpp index 6e21268682e..7b6a33ec1b2 100644 --- a/src/devices/bus/spectrum/protek.cpp +++ b/src/devices/bus/spectrum/protek.cpp @@ -50,7 +50,7 @@ ioport_constructor spectrum_protek_device::device_input_ports() const // spectrum_protek_device - constructor //------------------------------------------------- -spectrum_protek_device::spectrum_protek_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +spectrum_protek_device::spectrum_protek_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, SPECTRUM_PROTEK, tag, owner, clock) , device_spectrum_expansion_interface(mconfig, *this) , m_exp_line3(*this, "LINE3") diff --git a/src/devices/bus/spectrum/protek.h b/src/devices/bus/spectrum/protek.h index 9edd5a82f29..248c6ecf63e 100644 --- a/src/devices/bus/spectrum/protek.h +++ b/src/devices/bus/spectrum/protek.h @@ -26,7 +26,7 @@ class spectrum_protek_device : { public: // construction/destruction - spectrum_protek_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + spectrum_protek_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/spectrum/sdi.cpp b/src/devices/bus/spectrum/sdi.cpp index ab8becb80f8..356b9098cfd 100644 --- a/src/devices/bus/spectrum/sdi.cpp +++ b/src/devices/bus/spectrum/sdi.cpp @@ -66,7 +66,7 @@ const tiny_rom_entry *spectrum_sdi_device::device_rom_region() const // spectrum_sdi_device - constructor //------------------------------------------------- -spectrum_sdi_device::spectrum_sdi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +spectrum_sdi_device::spectrum_sdi_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, SPECTRUM_SDI, tag, owner, clock) , device_spectrum_expansion_interface(mconfig, *this) , m_rom(*this, "rom") diff --git a/src/devices/bus/spectrum/sdi.h b/src/devices/bus/spectrum/sdi.h index 619ec52f44f..1f2c26efe7d 100644 --- a/src/devices/bus/spectrum/sdi.h +++ b/src/devices/bus/spectrum/sdi.h @@ -24,7 +24,7 @@ class spectrum_sdi_device : { public: // construction/destruction - spectrum_sdi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + spectrum_sdi_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/spectrum/sixword.cpp b/src/devices/bus/spectrum/sixword.cpp index c85a9347dc9..247e93e9a4e 100644 --- a/src/devices/bus/spectrum/sixword.cpp +++ b/src/devices/bus/spectrum/sixword.cpp @@ -193,7 +193,7 @@ const tiny_rom_entry *spectrum_swiftdisc2_device::device_rom_region() const // spectrum_swiftdisc_device - constructor //------------------------------------------------- -spectrum_swiftdisc_device::spectrum_swiftdisc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +spectrum_swiftdisc_device::spectrum_swiftdisc_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_spectrum_expansion_interface(mconfig, *this) , m_rom(*this, "rom") @@ -205,12 +205,12 @@ spectrum_swiftdisc_device::spectrum_swiftdisc_device(const machine_config &mconf { } -spectrum_swiftdisc_device::spectrum_swiftdisc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +spectrum_swiftdisc_device::spectrum_swiftdisc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : spectrum_swiftdisc_device(mconfig, SPECTRUM_SWIFTDISC, tag, owner, clock) { } -spectrum_swiftdisc2_device::spectrum_swiftdisc2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +spectrum_swiftdisc2_device::spectrum_swiftdisc2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : spectrum_swiftdisc_device(mconfig, SPECTRUM_SWIFTDISC2, tag, owner, clock) , m_centronics(*this, "centronics") , m_conf(*this, "CONF") diff --git a/src/devices/bus/spectrum/sixword.h b/src/devices/bus/spectrum/sixword.h index c11108454f6..893c5aaab36 100644 --- a/src/devices/bus/spectrum/sixword.h +++ b/src/devices/bus/spectrum/sixword.h @@ -27,13 +27,13 @@ class spectrum_swiftdisc_device : { public: // construction/destruction - spectrum_swiftdisc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + spectrum_swiftdisc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); static void floppy_formats(format_registration &fr); DECLARE_INPUT_CHANGED_MEMBER(nmi_button) { m_rombank |= newval << 12; m_slot->nmi_w(newval ? ASSERT_LINE : CLEAR_LINE); } protected: - spectrum_swiftdisc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + spectrum_swiftdisc_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; @@ -75,7 +75,7 @@ class spectrum_swiftdisc2_device : { public: // construction/destruction - spectrum_swiftdisc2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + spectrum_swiftdisc2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/spectrum/speccydos.cpp b/src/devices/bus/spectrum/speccydos.cpp index 1afbb52da26..b13ddcfe4d8 100644 --- a/src/devices/bus/spectrum/speccydos.cpp +++ b/src/devices/bus/spectrum/speccydos.cpp @@ -131,7 +131,7 @@ const tiny_rom_entry *spectrum_speccydos_device::device_rom_region() const // spectrum_speccydos_device - constructor //------------------------------------------------- -spectrum_speccydos_device::spectrum_speccydos_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +spectrum_speccydos_device::spectrum_speccydos_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, SPECTRUM_SPECCYDOS, tag, owner, clock) , device_spectrum_expansion_interface(mconfig, *this) , m_rom(*this, "rom") diff --git a/src/devices/bus/spectrum/speccydos.h b/src/devices/bus/spectrum/speccydos.h index 3cdb29b7b38..19004176bc5 100644 --- a/src/devices/bus/spectrum/speccydos.h +++ b/src/devices/bus/spectrum/speccydos.h @@ -25,7 +25,7 @@ class spectrum_speccydos_device : { public: // construction/destruction - spectrum_speccydos_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + spectrum_speccydos_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); static void floppy_formats(format_registration &fr); DECLARE_INPUT_CHANGED_MEMBER(magic_button) { m_slot->nmi_w(newval ? ASSERT_LINE : CLEAR_LINE); } diff --git a/src/devices/bus/spectrum/specdrum.cpp b/src/devices/bus/spectrum/specdrum.cpp index 49764da5da5..221898db24c 100644 --- a/src/devices/bus/spectrum/specdrum.cpp +++ b/src/devices/bus/spectrum/specdrum.cpp @@ -25,7 +25,7 @@ DEFINE_DEVICE_TYPE(SPECTRUM_SPECDRUM, spectrum_specdrum_device, "spectrum_specdr void spectrum_specdrum_device::device_add_mconfig(machine_config &config) { SPEAKER(config, "speaker").front_center(); - ZN428E(config, m_dac, 0).add_route(ALL_OUTPUTS, "speaker", 0.5); + ZN428E(config, m_dac).add_route(ALL_OUTPUTS, "speaker", 0.5); } @@ -37,7 +37,7 @@ void spectrum_specdrum_device::device_add_mconfig(machine_config &config) // spectrum_specdrum_device - constructor //------------------------------------------------- -spectrum_specdrum_device::spectrum_specdrum_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +spectrum_specdrum_device::spectrum_specdrum_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, SPECTRUM_SPECDRUM, tag, owner, clock) , device_spectrum_expansion_interface(mconfig, *this) , m_dac(*this, "dac") diff --git a/src/devices/bus/spectrum/specdrum.h b/src/devices/bus/spectrum/specdrum.h index 7412a8509c0..9d4e1992dc5 100644 --- a/src/devices/bus/spectrum/specdrum.h +++ b/src/devices/bus/spectrum/specdrum.h @@ -28,7 +28,7 @@ class spectrum_specdrum_device : { public: // construction/destruction - spectrum_specdrum_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + spectrum_specdrum_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/spectrum/specmate.cpp b/src/devices/bus/spectrum/specmate.cpp index 4177a74f814..95c7f0f786d 100644 --- a/src/devices/bus/spectrum/specmate.cpp +++ b/src/devices/bus/spectrum/specmate.cpp @@ -120,7 +120,7 @@ const tiny_rom_entry *spectrum_specmate_device::device_rom_region() const // spectrum_specmate_device - constructor //------------------------------------------------- -spectrum_specmate_device::spectrum_specmate_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +spectrum_specmate_device::spectrum_specmate_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, SPECTRUM_SPECMATE, tag, owner, clock) , device_spectrum_expansion_interface(mconfig, *this) , m_rom(*this, "rom") diff --git a/src/devices/bus/spectrum/specmate.h b/src/devices/bus/spectrum/specmate.h index cc361b49171..192918b3339 100644 --- a/src/devices/bus/spectrum/specmate.h +++ b/src/devices/bus/spectrum/specmate.h @@ -21,7 +21,7 @@ class spectrum_specmate_device : public device_t, public device_spectrum_expansi { public: // construction/destruction - spectrum_specmate_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + spectrum_specmate_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); DECLARE_INPUT_CHANGED_MEMBER(freeze_button) { m_slot->nmi_w(newval ? CLEAR_LINE : ASSERT_LINE); } diff --git a/src/devices/bus/spectrum/uslot.cpp b/src/devices/bus/spectrum/uslot.cpp index eeef849a8fe..3b08cb3f222 100644 --- a/src/devices/bus/spectrum/uslot.cpp +++ b/src/devices/bus/spectrum/uslot.cpp @@ -40,7 +40,7 @@ void spectrum_uslot_device::device_add_mconfig(machine_config &config) // spectrum_uslot_device - constructor //------------------------------------------------- -spectrum_uslot_device::spectrum_uslot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +spectrum_uslot_device::spectrum_uslot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, SPECTRUM_USLOT, tag, owner, clock) , device_spectrum_expansion_interface(mconfig, *this) , m_exp1(*this, "exp1") diff --git a/src/devices/bus/spectrum/uslot.h b/src/devices/bus/spectrum/uslot.h index 0764d014147..119203c8d22 100644 --- a/src/devices/bus/spectrum/uslot.h +++ b/src/devices/bus/spectrum/uslot.h @@ -26,7 +26,7 @@ class spectrum_uslot_device : { public: // construction/destruction - spectrum_uslot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + spectrum_uslot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/spectrum/usource.cpp b/src/devices/bus/spectrum/usource.cpp index 3c368297fef..37e263f858d 100644 --- a/src/devices/bus/spectrum/usource.cpp +++ b/src/devices/bus/spectrum/usource.cpp @@ -46,7 +46,7 @@ const tiny_rom_entry *spectrum_usource_device::device_rom_region() const // spectrum_usource_device - constructor //------------------------------------------------- -spectrum_usource_device::spectrum_usource_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +spectrum_usource_device::spectrum_usource_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, SPECTRUM_USOURCE, tag, owner, clock), device_spectrum_expansion_interface(mconfig, *this), m_rom(*this, "rom") diff --git a/src/devices/bus/spectrum/usource.h b/src/devices/bus/spectrum/usource.h index 1f0d7d44e58..092a4bcc2a5 100644 --- a/src/devices/bus/spectrum/usource.h +++ b/src/devices/bus/spectrum/usource.h @@ -28,7 +28,7 @@ class spectrum_usource_device : { public: // construction/destruction - spectrum_usource_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + spectrum_usource_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/spectrum/uspeech.cpp b/src/devices/bus/spectrum/uspeech.cpp index 06e48dca0fd..0261570d1af 100644 --- a/src/devices/bus/spectrum/uspeech.cpp +++ b/src/devices/bus/spectrum/uspeech.cpp @@ -61,7 +61,7 @@ void spectrum_uspeech_device::device_add_mconfig(machine_config &config) // spectrum_uspeech_device - constructor //------------------------------------------------- -spectrum_uspeech_device::spectrum_uspeech_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +spectrum_uspeech_device::spectrum_uspeech_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, SPECTRUM_USPEECH, tag, owner, clock), device_spectrum_expansion_interface(mconfig, *this), m_nsp(*this, "sp0256"), @@ -151,12 +151,12 @@ void spectrum_uspeech_device::mreq_w(offs_t offset, uint8_t data) case 0x3000: // intonation low - m_nsp->set_clock(3050000); // oscillator frequency read from hardware + m_nsp->set_clock(XTAL::u(3050000)); // oscillator frequency read from hardware break; case 0x3001: // intonation high - m_nsp->set_clock(3260000); // oscillator frequency read from hardware + m_nsp->set_clock(XTAL::u(3260000)); // oscillator frequency read from hardware break; } } diff --git a/src/devices/bus/spectrum/uspeech.h b/src/devices/bus/spectrum/uspeech.h index 078e33599af..8a9946e6156 100644 --- a/src/devices/bus/spectrum/uspeech.h +++ b/src/devices/bus/spectrum/uspeech.h @@ -29,7 +29,7 @@ class spectrum_uspeech_device : { public: // construction/destruction - spectrum_uspeech_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + spectrum_uspeech_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/spectrum/wafa.cpp b/src/devices/bus/spectrum/wafa.cpp index c5af195289c..ced9ac85ac0 100644 --- a/src/devices/bus/spectrum/wafa.cpp +++ b/src/devices/bus/spectrum/wafa.cpp @@ -71,7 +71,7 @@ const tiny_rom_entry *spectrum_wafa_device::device_rom_region() const // spectrum_wafa_device - constructor //------------------------------------------------- -spectrum_wafa_device::spectrum_wafa_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +spectrum_wafa_device::spectrum_wafa_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, SPECTRUM_WAFA, tag, owner, clock) , device_spectrum_expansion_interface(mconfig, *this) , m_exp(*this, "exp") diff --git a/src/devices/bus/spectrum/wafa.h b/src/devices/bus/spectrum/wafa.h index 6ca1f4d256a..3797a3ca667 100644 --- a/src/devices/bus/spectrum/wafa.h +++ b/src/devices/bus/spectrum/wafa.h @@ -27,7 +27,7 @@ class spectrum_wafa_device: { public: // construction/destruction - spectrum_wafa_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + spectrum_wafa_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); static constexpr feature_type unemulated_features() { return feature::DISK | feature::LAN; } |