summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/c64
diff options
context:
space:
mode:
author Olivier Galibert <galibert@pobox.com>2022-06-16 12:47:52 +0200
committer Olivier Galibert <galibert@pobox.com>2025-04-29 23:06:41 +0200
commit45d4cd52a8194f2ef9e0383cfb2e2a35634af6ff (patch)
tree4e8d8fcb7382a5e9e0bce5ec59939bcfbe67155a /src/devices/bus/c64
parent5c14bcdfcb4aefb71b5b62387c4ad05dbeb3814e (diff)
full xtal conversionxtal
Diffstat (limited to 'src/devices/bus/c64')
-rw-r--r--src/devices/bus/c64/16kb.cpp2
-rw-r--r--src/devices/bus/c64/16kb.h2
-rw-r--r--src/devices/bus/c64/4dxh.cpp2
-rw-r--r--src/devices/bus/c64/4dxh.h2
-rw-r--r--src/devices/bus/c64/4ksa.cpp2
-rw-r--r--src/devices/bus/c64/4ksa.h2
-rw-r--r--src/devices/bus/c64/4tba.cpp2
-rw-r--r--src/devices/bus/c64/4tba.h2
-rw-r--r--src/devices/bus/c64/bn1541.cpp2
-rw-r--r--src/devices/bus/c64/bn1541.h2
-rw-r--r--src/devices/bus/c64/buscard.cpp10
-rw-r--r--src/devices/bus/c64/buscard.h2
-rw-r--r--src/devices/bus/c64/buscard2.cpp8
-rw-r--r--src/devices/bus/c64/buscard2.h2
-rw-r--r--src/devices/bus/c64/c128_comal80.cpp2
-rw-r--r--src/devices/bus/c64/c128_comal80.h2
-rw-r--r--src/devices/bus/c64/c128_partner.cpp2
-rw-r--r--src/devices/bus/c64/c128_partner.h2
-rw-r--r--src/devices/bus/c64/comal80.cpp2
-rw-r--r--src/devices/bus/c64/comal80.h2
-rw-r--r--src/devices/bus/c64/cpm.cpp6
-rw-r--r--src/devices/bus/c64/cpm.h4
-rw-r--r--src/devices/bus/c64/currah_speech.cpp4
-rw-r--r--src/devices/bus/c64/currah_speech.h2
-rw-r--r--src/devices/bus/c64/dela_ep256.cpp2
-rw-r--r--src/devices/bus/c64/dela_ep256.h2
-rw-r--r--src/devices/bus/c64/dela_ep64.cpp2
-rw-r--r--src/devices/bus/c64/dela_ep64.h2
-rw-r--r--src/devices/bus/c64/dela_ep7x8.cpp2
-rw-r--r--src/devices/bus/c64/dela_ep7x8.h2
-rw-r--r--src/devices/bus/c64/dinamic.cpp2
-rw-r--r--src/devices/bus/c64/dinamic.h2
-rw-r--r--src/devices/bus/c64/dqbb.cpp2
-rw-r--r--src/devices/bus/c64/dqbb.h2
-rw-r--r--src/devices/bus/c64/easy_calc_result.cpp2
-rw-r--r--src/devices/bus/c64/easy_calc_result.h2
-rw-r--r--src/devices/bus/c64/easyflash.cpp2
-rw-r--r--src/devices/bus/c64/easyflash.h2
-rw-r--r--src/devices/bus/c64/epyx_fast_load.cpp2
-rw-r--r--src/devices/bus/c64/epyx_fast_load.h2
-rw-r--r--src/devices/bus/c64/exos.cpp2
-rw-r--r--src/devices/bus/c64/exos.h2
-rw-r--r--src/devices/bus/c64/exp.cpp2
-rw-r--r--src/devices/bus/c64/exp.h8
-rw-r--r--src/devices/bus/c64/fcc.cpp2
-rw-r--r--src/devices/bus/c64/fcc.h2
-rw-r--r--src/devices/bus/c64/final.cpp2
-rw-r--r--src/devices/bus/c64/final.h2
-rw-r--r--src/devices/bus/c64/final3.cpp2
-rw-r--r--src/devices/bus/c64/final3.h2
-rw-r--r--src/devices/bus/c64/fun_play.cpp2
-rw-r--r--src/devices/bus/c64/fun_play.h2
-rw-r--r--src/devices/bus/c64/geocable.cpp2
-rw-r--r--src/devices/bus/c64/geocable.h2
-rw-r--r--src/devices/bus/c64/georam.cpp2
-rw-r--r--src/devices/bus/c64/georam.h2
-rw-r--r--src/devices/bus/c64/ide64.cpp2
-rw-r--r--src/devices/bus/c64/ide64.h2
-rw-r--r--src/devices/bus/c64/ieee488.cpp6
-rw-r--r--src/devices/bus/c64/ieee488.h2
-rw-r--r--src/devices/bus/c64/kingsoft.cpp2
-rw-r--r--src/devices/bus/c64/kingsoft.h2
-rw-r--r--src/devices/bus/c64/mach5.cpp2
-rw-r--r--src/devices/bus/c64/mach5.h2
-rw-r--r--src/devices/bus/c64/magic_desk.cpp2
-rw-r--r--src/devices/bus/c64/magic_desk.h2
-rw-r--r--src/devices/bus/c64/magic_formel.cpp4
-rw-r--r--src/devices/bus/c64/magic_formel.h2
-rw-r--r--src/devices/bus/c64/magic_voice.cpp6
-rw-r--r--src/devices/bus/c64/magic_voice.h2
-rw-r--r--src/devices/bus/c64/midi_maplin.cpp6
-rw-r--r--src/devices/bus/c64/midi_maplin.h2
-rw-r--r--src/devices/bus/c64/midi_namesoft.cpp6
-rw-r--r--src/devices/bus/c64/midi_namesoft.h2
-rw-r--r--src/devices/bus/c64/midi_passport.cpp10
-rw-r--r--src/devices/bus/c64/midi_passport.h2
-rw-r--r--src/devices/bus/c64/midi_sci.cpp6
-rw-r--r--src/devices/bus/c64/midi_sci.h2
-rw-r--r--src/devices/bus/c64/midi_siel.cpp6
-rw-r--r--src/devices/bus/c64/midi_siel.h2
-rw-r--r--src/devices/bus/c64/mikro_assembler.cpp2
-rw-r--r--src/devices/bus/c64/mikro_assembler.h2
-rw-r--r--src/devices/bus/c64/multiscreen.cpp6
-rw-r--r--src/devices/bus/c64/multiscreen.h2
-rw-r--r--src/devices/bus/c64/music64.cpp2
-rw-r--r--src/devices/bus/c64/music64.h2
-rw-r--r--src/devices/bus/c64/neoram.cpp2
-rw-r--r--src/devices/bus/c64/neoram.h2
-rw-r--r--src/devices/bus/c64/ocean.cpp2
-rw-r--r--src/devices/bus/c64/ocean.h2
-rw-r--r--src/devices/bus/c64/pagefox.cpp2
-rw-r--r--src/devices/bus/c64/pagefox.h2
-rw-r--r--src/devices/bus/c64/partner.cpp2
-rw-r--r--src/devices/bus/c64/partner.h2
-rw-r--r--src/devices/bus/c64/prophet64.cpp2
-rw-r--r--src/devices/bus/c64/prophet64.h2
-rw-r--r--src/devices/bus/c64/ps64.cpp4
-rw-r--r--src/devices/bus/c64/ps64.h2
-rw-r--r--src/devices/bus/c64/reu.cpp10
-rw-r--r--src/devices/bus/c64/reu.h8
-rw-r--r--src/devices/bus/c64/rex.cpp2
-rw-r--r--src/devices/bus/c64/rex.h2
-rw-r--r--src/devices/bus/c64/rex_ep256.cpp2
-rw-r--r--src/devices/bus/c64/rex_ep256.h2
-rw-r--r--src/devices/bus/c64/ross.cpp2
-rw-r--r--src/devices/bus/c64/ross.h2
-rw-r--r--src/devices/bus/c64/sfx_sound_expander.cpp2
-rw-r--r--src/devices/bus/c64/sfx_sound_expander.h2
-rw-r--r--src/devices/bus/c64/silverrock.cpp2
-rw-r--r--src/devices/bus/c64/silverrock.h2
-rw-r--r--src/devices/bus/c64/simons_basic.cpp2
-rw-r--r--src/devices/bus/c64/simons_basic.h2
-rw-r--r--src/devices/bus/c64/speakeasy.cpp4
-rw-r--r--src/devices/bus/c64/speakeasy.h2
-rw-r--r--src/devices/bus/c64/stardos.cpp2
-rw-r--r--src/devices/bus/c64/stardos.h2
-rw-r--r--src/devices/bus/c64/std.cpp2
-rw-r--r--src/devices/bus/c64/std.h2
-rw-r--r--src/devices/bus/c64/structured_basic.cpp2
-rw-r--r--src/devices/bus/c64/structured_basic.h2
-rw-r--r--src/devices/bus/c64/super_explode.cpp2
-rw-r--r--src/devices/bus/c64/super_explode.h2
-rw-r--r--src/devices/bus/c64/super_games.cpp2
-rw-r--r--src/devices/bus/c64/super_games.h2
-rw-r--r--src/devices/bus/c64/supercpu.cpp4
-rw-r--r--src/devices/bus/c64/supercpu.h2
-rw-r--r--src/devices/bus/c64/sw8k.cpp2
-rw-r--r--src/devices/bus/c64/sw8k.h2
-rw-r--r--src/devices/bus/c64/swiftlink.cpp4
-rw-r--r--src/devices/bus/c64/swiftlink.h2
-rw-r--r--src/devices/bus/c64/system3.cpp2
-rw-r--r--src/devices/bus/c64/system3.h2
-rw-r--r--src/devices/bus/c64/tdos.cpp2
-rw-r--r--src/devices/bus/c64/tdos.h2
-rw-r--r--src/devices/bus/c64/turbo232.cpp4
-rw-r--r--src/devices/bus/c64/turbo232.h2
-rw-r--r--src/devices/bus/c64/vizastar.cpp2
-rw-r--r--src/devices/bus/c64/vizastar.h2
-rw-r--r--src/devices/bus/c64/vw64.cpp2
-rw-r--r--src/devices/bus/c64/vw64.h2
-rw-r--r--src/devices/bus/c64/warp_speed.cpp2
-rw-r--r--src/devices/bus/c64/warp_speed.h2
-rw-r--r--src/devices/bus/c64/westermann.cpp2
-rw-r--r--src/devices/bus/c64/westermann.h2
-rw-r--r--src/devices/bus/c64/xl80.cpp2
-rw-r--r--src/devices/bus/c64/xl80.h2
-rw-r--r--src/devices/bus/c64/z80videopak.cpp2
-rw-r--r--src/devices/bus/c64/z80videopak.h2
-rw-r--r--src/devices/bus/c64/zaxxon.cpp2
-rw-r--r--src/devices/bus/c64/zaxxon.h2
150 files changed, 195 insertions, 195 deletions
diff --git a/src/devices/bus/c64/16kb.cpp b/src/devices/bus/c64/16kb.cpp
index 4b497f88591..a94bb9567f4 100644
--- a/src/devices/bus/c64/16kb.cpp
+++ b/src/devices/bus/c64/16kb.cpp
@@ -62,7 +62,7 @@ ioport_constructor c64_16kb_cartridge_device::device_input_ports() const
// c64_16kb_cartridge_device - constructor
//-------------------------------------------------
-c64_16kb_cartridge_device::c64_16kb_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_16kb_cartridge_device::c64_16kb_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_16KB, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this),
m_sw1(*this, "SW1"),
diff --git a/src/devices/bus/c64/16kb.h b/src/devices/bus/c64/16kb.h
index d17e7636879..7ab351fae4d 100644
--- a/src/devices/bus/c64/16kb.h
+++ b/src/devices/bus/c64/16kb.h
@@ -28,7 +28,7 @@ class c64_16kb_cartridge_device : public device_t, public device_c64_expansion_c
{
public:
// construction/destruction
- c64_16kb_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_16kb_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/4dxh.cpp b/src/devices/bus/c64/4dxh.cpp
index 4273388543b..e28c2967fb3 100644
--- a/src/devices/bus/c64/4dxh.cpp
+++ b/src/devices/bus/c64/4dxh.cpp
@@ -62,7 +62,7 @@ ioport_constructor c64_4dxh_device::device_input_ports() const
// c64_4dxh_device - constructor
//-------------------------------------------------
-c64_4dxh_device::c64_4dxh_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_4dxh_device::c64_4dxh_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_4DXH, tag, owner, clock),
device_pet_user_port_interface(mconfig, *this)
{
diff --git a/src/devices/bus/c64/4dxh.h b/src/devices/bus/c64/4dxh.h
index 620228e4942..d1bbe17e6a6 100644
--- a/src/devices/bus/c64/4dxh.h
+++ b/src/devices/bus/c64/4dxh.h
@@ -26,7 +26,7 @@ class c64_4dxh_device : public device_t, public device_pet_user_port_interface
{
public:
// construction/destruction
- c64_4dxh_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_4dxh_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/c64/4ksa.cpp b/src/devices/bus/c64/4ksa.cpp
index 39a86b6b17c..164297719bc 100644
--- a/src/devices/bus/c64/4ksa.cpp
+++ b/src/devices/bus/c64/4ksa.cpp
@@ -62,7 +62,7 @@ ioport_constructor c64_4ksa_device::device_input_ports() const
// c64_4ksa_device - constructor
//-------------------------------------------------
-c64_4ksa_device::c64_4ksa_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_4ksa_device::c64_4ksa_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_4KSA, tag, owner, clock),
device_pet_user_port_interface(mconfig, *this)
{
diff --git a/src/devices/bus/c64/4ksa.h b/src/devices/bus/c64/4ksa.h
index 6208ab201d2..d9f758a0a23 100644
--- a/src/devices/bus/c64/4ksa.h
+++ b/src/devices/bus/c64/4ksa.h
@@ -26,7 +26,7 @@ class c64_4ksa_device : public device_t, public device_pet_user_port_interface
{
public:
// construction/destruction
- c64_4ksa_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_4ksa_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/c64/4tba.cpp b/src/devices/bus/c64/4tba.cpp
index 4fc58cb0d49..1c7ae31f3fe 100644
--- a/src/devices/bus/c64/4tba.cpp
+++ b/src/devices/bus/c64/4tba.cpp
@@ -62,7 +62,7 @@ ioport_constructor c64_4tba_device::device_input_ports() const
// c64_4tba_device - constructor
//-------------------------------------------------
-c64_4tba_device::c64_4tba_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_4tba_device::c64_4tba_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_4TBA, tag, owner, clock),
device_pet_user_port_interface(mconfig, *this)
{
diff --git a/src/devices/bus/c64/4tba.h b/src/devices/bus/c64/4tba.h
index dc4f3b2186c..b18074e184f 100644
--- a/src/devices/bus/c64/4tba.h
+++ b/src/devices/bus/c64/4tba.h
@@ -26,7 +26,7 @@ class c64_4tba_device : public device_t, public device_pet_user_port_interface
{
public:
// construction/destruction
- c64_4tba_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_4tba_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/c64/bn1541.cpp b/src/devices/bus/c64/bn1541.cpp
index ffdf84b77d1..3e2f152ac70 100644
--- a/src/devices/bus/c64/bn1541.cpp
+++ b/src/devices/bus/c64/bn1541.cpp
@@ -61,7 +61,7 @@ device_c64_floppy_parallel_interface::~device_c64_floppy_parallel_interface()
// c64_bn1541_device - constructor
//-------------------------------------------------
-c64_bn1541_device::c64_bn1541_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_bn1541_device::c64_bn1541_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_BN1541, tag, owner, clock),
device_pet_user_port_interface(mconfig, *this),
device_c64_floppy_parallel_interface(mconfig, *this), m_parallel_output(0)
diff --git a/src/devices/bus/c64/bn1541.h b/src/devices/bus/c64/bn1541.h
index af6fedd7c97..08b29759ea3 100644
--- a/src/devices/bus/c64/bn1541.h
+++ b/src/devices/bus/c64/bn1541.h
@@ -47,7 +47,7 @@ class c64_bn1541_device : public device_t,
{
public:
// construction/destruction
- c64_bn1541_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_bn1541_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/buscard.cpp b/src/devices/bus/c64/buscard.cpp
index aef66ef022b..669eabd8bf4 100644
--- a/src/devices/bus/c64/buscard.cpp
+++ b/src/devices/bus/c64/buscard.cpp
@@ -222,7 +222,7 @@ WRITE_LINE_MEMBER( c64_buscard_device::busy_w )
void c64_buscard_device::device_add_mconfig(machine_config &config)
{
- I8255A(config, m_ppi, 0);
+ I8255A(config, m_ppi);
m_ppi->in_pa_callback().set(FUNC(c64_buscard_device::ppi_pa_r));
m_ppi->out_pa_callback().set(FUNC(c64_buscard_device::ppi_pa_w));
m_ppi->in_pb_callback().set_constant(0xff);
@@ -230,11 +230,11 @@ void c64_buscard_device::device_add_mconfig(machine_config &config)
m_ppi->in_pc_callback().set(FUNC(c64_buscard_device::ppi_pc_r));
m_ppi->out_pc_callback().set(FUNC(c64_buscard_device::ppi_pc_w));
- DS75160A(config, m_ieee1, 0);
+ DS75160A(config, m_ieee1);
m_ieee1->read_callback().set(IEEE488_TAG, FUNC(ieee488_device::dio_r));
m_ieee1->write_callback().set(IEEE488_TAG, FUNC(ieee488_device::host_dio_w));
- DS75161A(config, m_ieee2, 0);
+ DS75161A(config, m_ieee2);
m_ieee2->in_ren().set(IEEE488_TAG, FUNC(ieee488_device::ren_r));
m_ieee2->in_ifc().set(IEEE488_TAG, FUNC(ieee488_device::ifc_r));
m_ieee2->in_ndac().set(IEEE488_TAG, FUNC(ieee488_device::ndac_r));
@@ -252,7 +252,7 @@ void c64_buscard_device::device_add_mconfig(machine_config &config)
m_ieee2->out_atn().set(IEEE488_TAG, FUNC(ieee488_device::host_atn_w));
m_ieee2->out_srq().set(IEEE488_TAG, FUNC(ieee488_device::host_srq_w));
- IEEE488(config, m_bus, 0);
+ IEEE488(config, m_bus);
ieee488_slot_device::add_cbm_defaults(config, nullptr);
CENTRONICS(config, m_centronics, centronics_devices, nullptr);
@@ -272,7 +272,7 @@ void c64_buscard_device::device_add_mconfig(machine_config &config)
// c64_buscard_device - constructor
//-------------------------------------------------
-c64_buscard_device::c64_buscard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_buscard_device::c64_buscard_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_BUSCARD, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this),
m_ppi(*this, "u2"),
diff --git a/src/devices/bus/c64/buscard.h b/src/devices/bus/c64/buscard.h
index 151598060ad..230a84e258f 100644
--- a/src/devices/bus/c64/buscard.h
+++ b/src/devices/bus/c64/buscard.h
@@ -32,7 +32,7 @@ class c64_buscard_device : public device_t,
{
public:
// construction/destruction
- c64_buscard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_buscard_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/buscard2.cpp b/src/devices/bus/c64/buscard2.cpp
index 65ee3b0ebb8..309a765cf33 100644
--- a/src/devices/bus/c64/buscard2.cpp
+++ b/src/devices/bus/c64/buscard2.cpp
@@ -105,11 +105,11 @@ WRITE_LINE_MEMBER( c64_buscard2_device::busy_w )
void c64_buscard2_device::device_add_mconfig(machine_config &config)
{
- RIOT6532(config, m_riot, 0);
+ RIOT6532(config, m_riot);
- PIA6821(config, m_pia, 0);
+ PIA6821(config, m_pia);
- IEEE488(config, m_bus, 0);
+ IEEE488(config, m_bus);
ieee488_slot_device::add_cbm_defaults(config, nullptr);
CENTRONICS(config, m_centronics, centronics_devices, nullptr);
@@ -129,7 +129,7 @@ void c64_buscard2_device::device_add_mconfig(machine_config &config)
// c64_buscard2_device - constructor
//-------------------------------------------------
-c64_buscard2_device::c64_buscard2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_buscard2_device::c64_buscard2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_BUSCARD2, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this),
m_riot(*this, "riot"),
diff --git a/src/devices/bus/c64/buscard2.h b/src/devices/bus/c64/buscard2.h
index e0250f03d03..8c235cfce1b 100644
--- a/src/devices/bus/c64/buscard2.h
+++ b/src/devices/bus/c64/buscard2.h
@@ -31,7 +31,7 @@ class c64_buscard2_device : public device_t,
{
public:
// construction/destruction
- c64_buscard2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_buscard2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/c128_comal80.cpp b/src/devices/bus/c64/c128_comal80.cpp
index f1ce8c5c87a..c8e93c03b9c 100644
--- a/src/devices/bus/c64/c128_comal80.cpp
+++ b/src/devices/bus/c64/c128_comal80.cpp
@@ -27,7 +27,7 @@ DEFINE_DEVICE_TYPE(C128_COMAL80, c128_comal80_cartridge_device, "c128_comal80",
// c128_comal80_cartridge_device - constructor
//-------------------------------------------------
-c128_comal80_cartridge_device::c128_comal80_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c128_comal80_cartridge_device::c128_comal80_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C128_COMAL80, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this),
m_bank(0)
diff --git a/src/devices/bus/c64/c128_comal80.h b/src/devices/bus/c64/c128_comal80.h
index fe413f9bef6..06107e5c70e 100644
--- a/src/devices/bus/c64/c128_comal80.h
+++ b/src/devices/bus/c64/c128_comal80.h
@@ -27,7 +27,7 @@ class c128_comal80_cartridge_device : public device_t,
{
public:
// construction/destruction
- c128_comal80_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c128_comal80_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/c128_partner.cpp b/src/devices/bus/c64/c128_partner.cpp
index 7c6cf1aea97..e9c3d6cb75e 100644
--- a/src/devices/bus/c64/c128_partner.cpp
+++ b/src/devices/bus/c64/c128_partner.cpp
@@ -77,7 +77,7 @@ ioport_constructor c128_partner_cartridge_device::device_input_ports() const
// c128_partner_cartridge_device - constructor
//-------------------------------------------------
-c128_partner_cartridge_device::c128_partner_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c128_partner_cartridge_device::c128_partner_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C128_PARTNER, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this),
m_ram(*this, "ram", 0x2000, ENDIANNESS_LITTLE),
diff --git a/src/devices/bus/c64/c128_partner.h b/src/devices/bus/c64/c128_partner.h
index 3f91afbb0e9..587d0ccf42d 100644
--- a/src/devices/bus/c64/c128_partner.h
+++ b/src/devices/bus/c64/c128_partner.h
@@ -28,7 +28,7 @@ class c128_partner_cartridge_device : public device_t,
{
public:
// construction/destruction
- c128_partner_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c128_partner_cartridge_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/c64/comal80.cpp b/src/devices/bus/c64/comal80.cpp
index 0ce6dcbfb5a..40a3f604ad6 100644
--- a/src/devices/bus/c64/comal80.cpp
+++ b/src/devices/bus/c64/comal80.cpp
@@ -27,7 +27,7 @@ DEFINE_DEVICE_TYPE(C64_COMAL80, c64_comal80_cartridge_device, "c64_comal80", "C6
// c64_comal80_cartridge_device - constructor
//-------------------------------------------------
-c64_comal80_cartridge_device::c64_comal80_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_comal80_cartridge_device::c64_comal80_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_COMAL80, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this),
m_bank(0)
diff --git a/src/devices/bus/c64/comal80.h b/src/devices/bus/c64/comal80.h
index af0958a8940..1abe98fb26c 100644
--- a/src/devices/bus/c64/comal80.h
+++ b/src/devices/bus/c64/comal80.h
@@ -27,7 +27,7 @@ class c64_comal80_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_comal80_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_comal80_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/cpm.cpp b/src/devices/bus/c64/cpm.cpp
index f60fe8bd506..99b8ad6bc3c 100644
--- a/src/devices/bus/c64/cpm.cpp
+++ b/src/devices/bus/c64/cpm.cpp
@@ -62,7 +62,7 @@ void c64_cpm_cartridge_device::z80_io(address_map &map)
void c64_cpm_cartridge_device::device_add_mconfig(machine_config &config)
{
- Z80(config, m_maincpu, 3000000);
+ Z80(config, m_maincpu, XTAL::u(3000000));
m_maincpu->set_addrmap(AS_PROGRAM, &c64_cpm_cartridge_device::z80_mem);
m_maincpu->set_addrmap(AS_IO, &c64_cpm_cartridge_device::z80_io);
}
@@ -122,7 +122,7 @@ inline void c64_cpm_cartridge_device::update_signals()
// c64_cpm_cartridge_device - constructor
//-------------------------------------------------
-c64_cpm_cartridge_device::c64_cpm_cartridge_device(const machine_config& mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+c64_cpm_cartridge_device::c64_cpm_cartridge_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_c64_expansion_card_interface(mconfig, *this),
m_maincpu(*this, Z80_TAG),
@@ -131,7 +131,7 @@ c64_cpm_cartridge_device::c64_cpm_cartridge_device(const machine_config& mconfig
{
}
-c64_cpm_cartridge_device::c64_cpm_cartridge_device(const machine_config& mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_cpm_cartridge_device::c64_cpm_cartridge_device(const machine_config& mconfig, const char *tag, device_t *owner, const XTAL &clock) :
c64_cpm_cartridge_device(mconfig, C64_CPM, tag, owner, clock)
{
}
diff --git a/src/devices/bus/c64/cpm.h b/src/devices/bus/c64/cpm.h
index c490d61aa58..e80ced0d8e4 100644
--- a/src/devices/bus/c64/cpm.h
+++ b/src/devices/bus/c64/cpm.h
@@ -27,10 +27,10 @@ class c64_cpm_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_cpm_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_cpm_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- c64_cpm_cartridge_device(const machine_config& mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ c64_cpm_cartridge_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/c64/currah_speech.cpp b/src/devices/bus/c64/currah_speech.cpp
index 0216e4c4ef5..8d807a4ba6f 100644
--- a/src/devices/bus/c64/currah_speech.cpp
+++ b/src/devices/bus/c64/currah_speech.cpp
@@ -106,7 +106,7 @@ const tiny_rom_entry *c64_currah_speech_cartridge_device::device_rom_region() co
void c64_currah_speech_cartridge_device::device_add_mconfig(machine_config &config)
{
SPEAKER(config, "mono").front_center();
- SP0256(config, m_nsp, 4000000); // ???
+ SP0256(config, m_nsp, XTAL::u(4000000)); // ???
m_nsp->add_route(ALL_OUTPUTS, "mono", 1.00);
}
@@ -138,7 +138,7 @@ void c64_currah_speech_cartridge_device::set_osc1(int voice, int intonation)
// c64_currah_speech_cartridge_device - constructor
//-------------------------------------------------
-c64_currah_speech_cartridge_device::c64_currah_speech_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_currah_speech_cartridge_device::c64_currah_speech_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_CURRAH_SPEECH, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this),
m_nsp(*this, "sp0256")
diff --git a/src/devices/bus/c64/currah_speech.h b/src/devices/bus/c64/currah_speech.h
index f856833f659..179967526de 100644
--- a/src/devices/bus/c64/currah_speech.h
+++ b/src/devices/bus/c64/currah_speech.h
@@ -28,7 +28,7 @@ class c64_currah_speech_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_currah_speech_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_currah_speech_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/dela_ep256.cpp b/src/devices/bus/c64/dela_ep256.cpp
index d5052f914b2..dde8d788582 100644
--- a/src/devices/bus/c64/dela_ep256.cpp
+++ b/src/devices/bus/c64/dela_ep256.cpp
@@ -38,7 +38,7 @@ void c64_dela_ep256_cartridge_device::device_add_mconfig(machine_config &config)
// c64_dela_ep256_cartridge_device - constructor
//-------------------------------------------------
-c64_dela_ep256_cartridge_device::c64_dela_ep256_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_dela_ep256_cartridge_device::c64_dela_ep256_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_DELA_EP256, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this),
m_eproms(*this, "rom%u", 1U)
diff --git a/src/devices/bus/c64/dela_ep256.h b/src/devices/bus/c64/dela_ep256.h
index bb6806f4d8e..1addc1e9fed 100644
--- a/src/devices/bus/c64/dela_ep256.h
+++ b/src/devices/bus/c64/dela_ep256.h
@@ -29,7 +29,7 @@ class c64_dela_ep256_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_dela_ep256_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_dela_ep256_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/dela_ep64.cpp b/src/devices/bus/c64/dela_ep64.cpp
index 5798794f7eb..70592f3b571 100644
--- a/src/devices/bus/c64/dela_ep64.cpp
+++ b/src/devices/bus/c64/dela_ep64.cpp
@@ -37,7 +37,7 @@ void c64_dela_ep64_cartridge_device::device_add_mconfig(machine_config &config)
// c64_dela_ep64_cartridge_device - constructor
//-------------------------------------------------
-c64_dela_ep64_cartridge_device::c64_dela_ep64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_dela_ep64_cartridge_device::c64_dela_ep64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_DELA_EP64, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this),
m_eprom1(*this, "eprom1"),
diff --git a/src/devices/bus/c64/dela_ep64.h b/src/devices/bus/c64/dela_ep64.h
index 95ac3440871..6aa026205ae 100644
--- a/src/devices/bus/c64/dela_ep64.h
+++ b/src/devices/bus/c64/dela_ep64.h
@@ -29,7 +29,7 @@ class c64_dela_ep64_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_dela_ep64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_dela_ep64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/dela_ep7x8.cpp b/src/devices/bus/c64/dela_ep7x8.cpp
index 0c71555b880..8e2dd88387b 100644
--- a/src/devices/bus/c64/dela_ep7x8.cpp
+++ b/src/devices/bus/c64/dela_ep7x8.cpp
@@ -42,7 +42,7 @@ void c64_dela_ep7x8_cartridge_device::device_add_mconfig(machine_config &config)
// c64_dela_ep7x8_cartridge_device - constructor
//-------------------------------------------------
-c64_dela_ep7x8_cartridge_device::c64_dela_ep7x8_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_dela_ep7x8_cartridge_device::c64_dela_ep7x8_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_DELA_EP7X8, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this),
m_eprom(*this, "rom%u", 1U)
diff --git a/src/devices/bus/c64/dela_ep7x8.h b/src/devices/bus/c64/dela_ep7x8.h
index 50e1b3af01e..a000175868d 100644
--- a/src/devices/bus/c64/dela_ep7x8.h
+++ b/src/devices/bus/c64/dela_ep7x8.h
@@ -29,7 +29,7 @@ class c64_dela_ep7x8_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_dela_ep7x8_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_dela_ep7x8_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/dinamic.cpp b/src/devices/bus/c64/dinamic.cpp
index 13d37749335..89aac9ec324 100644
--- a/src/devices/bus/c64/dinamic.cpp
+++ b/src/devices/bus/c64/dinamic.cpp
@@ -27,7 +27,7 @@ DEFINE_DEVICE_TYPE(C64_DINAMIC, c64_dinamic_cartridge_device, "c64_dinamic", "C6
// c64_dinamic_cartridge_device - constructor
//-------------------------------------------------
-c64_dinamic_cartridge_device::c64_dinamic_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_dinamic_cartridge_device::c64_dinamic_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_DINAMIC, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this),
m_bank(0)
diff --git a/src/devices/bus/c64/dinamic.h b/src/devices/bus/c64/dinamic.h
index e204964e4a1..f30c02386c9 100644
--- a/src/devices/bus/c64/dinamic.h
+++ b/src/devices/bus/c64/dinamic.h
@@ -27,7 +27,7 @@ class c64_dinamic_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_dinamic_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_dinamic_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/dqbb.cpp b/src/devices/bus/c64/dqbb.cpp
index e08bfbd05b5..a4ed00fe8a6 100644
--- a/src/devices/bus/c64/dqbb.cpp
+++ b/src/devices/bus/c64/dqbb.cpp
@@ -36,7 +36,7 @@ DEFINE_DEVICE_TYPE(C64_DQBB, c64_dqbb_cartridge_device, "c64_dqbb", "C64 Double
// c64_dqbb_cartridge_device - constructor
//-------------------------------------------------
-c64_dqbb_cartridge_device::c64_dqbb_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_dqbb_cartridge_device::c64_dqbb_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_DQBB, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this),
device_nvram_interface(mconfig, *this),
diff --git a/src/devices/bus/c64/dqbb.h b/src/devices/bus/c64/dqbb.h
index 9770793bdd0..57e64339257 100644
--- a/src/devices/bus/c64/dqbb.h
+++ b/src/devices/bus/c64/dqbb.h
@@ -28,7 +28,7 @@ class c64_dqbb_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_dqbb_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_dqbb_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/easy_calc_result.cpp b/src/devices/bus/c64/easy_calc_result.cpp
index 123870d5d3e..3fd64c777f5 100644
--- a/src/devices/bus/c64/easy_calc_result.cpp
+++ b/src/devices/bus/c64/easy_calc_result.cpp
@@ -48,7 +48,7 @@ DEFINE_DEVICE_TYPE(C64_EASY_CALC_RESULT, c64_easy_calc_result_cartridge_device,
// c64_easy_calc_result_cartridge_device - constructor
//-------------------------------------------------
-c64_easy_calc_result_cartridge_device::c64_easy_calc_result_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_easy_calc_result_cartridge_device::c64_easy_calc_result_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_EASY_CALC_RESULT, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this), m_bank(0)
{
diff --git a/src/devices/bus/c64/easy_calc_result.h b/src/devices/bus/c64/easy_calc_result.h
index 2d945b7dea2..ec72a56ff73 100644
--- a/src/devices/bus/c64/easy_calc_result.h
+++ b/src/devices/bus/c64/easy_calc_result.h
@@ -27,7 +27,7 @@ class c64_easy_calc_result_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_easy_calc_result_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_easy_calc_result_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/easyflash.cpp b/src/devices/bus/c64/easyflash.cpp
index eab9ff7930a..966ecc93d01 100644
--- a/src/devices/bus/c64/easyflash.cpp
+++ b/src/devices/bus/c64/easyflash.cpp
@@ -71,7 +71,7 @@ ioport_constructor c64_easyflash_cartridge_device::device_input_ports() const
// c64_easyflash_cartridge_device - constructor
//-------------------------------------------------
-c64_easyflash_cartridge_device::c64_easyflash_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_easyflash_cartridge_device::c64_easyflash_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_EASYFLASH, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this),
m_flash_roml(*this, AM29F040_0_TAG),
diff --git a/src/devices/bus/c64/easyflash.h b/src/devices/bus/c64/easyflash.h
index 6c73a14838a..40c206e2b6c 100644
--- a/src/devices/bus/c64/easyflash.h
+++ b/src/devices/bus/c64/easyflash.h
@@ -28,7 +28,7 @@ class c64_easyflash_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_easyflash_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_easyflash_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/epyx_fast_load.cpp b/src/devices/bus/c64/epyx_fast_load.cpp
index 21352ddef63..1098f868dfc 100644
--- a/src/devices/bus/c64/epyx_fast_load.cpp
+++ b/src/devices/bus/c64/epyx_fast_load.cpp
@@ -37,7 +37,7 @@ DEFINE_DEVICE_TYPE(C64_EPYX_FAST_LOAD, c64_epyx_fast_load_cartridge_device, "c64
// c64_epyx_fast_load_cartridge_device - constructor
//-------------------------------------------------
-c64_epyx_fast_load_cartridge_device::c64_epyx_fast_load_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_epyx_fast_load_cartridge_device::c64_epyx_fast_load_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_EPYX_FAST_LOAD, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this), m_exrom_timer(nullptr)
{
diff --git a/src/devices/bus/c64/epyx_fast_load.h b/src/devices/bus/c64/epyx_fast_load.h
index 8a2ebcaa9b0..8d13a81d508 100644
--- a/src/devices/bus/c64/epyx_fast_load.h
+++ b/src/devices/bus/c64/epyx_fast_load.h
@@ -27,7 +27,7 @@ class c64_epyx_fast_load_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_epyx_fast_load_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_epyx_fast_load_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/exos.cpp b/src/devices/bus/c64/exos.cpp
index 13c5d972642..dbfe1fdca3a 100644
--- a/src/devices/bus/c64/exos.cpp
+++ b/src/devices/bus/c64/exos.cpp
@@ -27,7 +27,7 @@ DEFINE_DEVICE_TYPE(C64_EXOS, c64_exos_cartridge_device, "c64_exos", "C64 ExOS ca
// c64_exos_cartridge_device - constructor
//-------------------------------------------------
-c64_exos_cartridge_device::c64_exos_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_exos_cartridge_device::c64_exos_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_EXOS, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this)
{
diff --git a/src/devices/bus/c64/exos.h b/src/devices/bus/c64/exos.h
index 73b9b2699aa..e31f4fc5536 100644
--- a/src/devices/bus/c64/exos.h
+++ b/src/devices/bus/c64/exos.h
@@ -27,7 +27,7 @@ class c64_exos_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_exos_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_exos_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/exp.cpp b/src/devices/bus/c64/exp.cpp
index 72d66ce6f30..5c0c5ae3e6a 100644
--- a/src/devices/bus/c64/exp.cpp
+++ b/src/devices/bus/c64/exp.cpp
@@ -56,7 +56,7 @@ device_c64_expansion_card_interface::~device_c64_expansion_card_interface()
// c64_expansion_slot_device - constructor
//-------------------------------------------------
-c64_expansion_slot_device::c64_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_expansion_slot_device::c64_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_EXPANSION_SLOT, tag, owner, clock),
device_single_card_slot_interface<device_c64_expansion_card_interface>(mconfig, *this),
device_cartrom_image_interface(mconfig, *this),
diff --git a/src/devices/bus/c64/exp.h b/src/devices/bus/c64/exp.h
index d5861b0c4a3..3607b1f11b9 100644
--- a/src/devices/bus/c64/exp.h
+++ b/src/devices/bus/c64/exp.h
@@ -56,7 +56,7 @@ class c64_expansion_slot_device : public device_t,
public:
// construction/destruction
template <typename T>
- c64_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, T &&opts, const char *dflt)
+ c64_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock, T &&opts, const char *dflt)
: c64_expansion_slot_device(mconfig, tag, owner, clock)
{
option_reset();
@@ -65,7 +65,7 @@ public:
set_fixed(false);
}
- c64_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
auto irq_callback() { return m_write_irq.bind(); }
auto nmi_callback() { return m_write_nmi.bind(); }
@@ -87,8 +87,8 @@ public:
DECLARE_WRITE_LINE_MEMBER( nmi_w ) { m_write_nmi(state); }
DECLARE_WRITE_LINE_MEMBER( dma_w ) { m_write_dma(state); }
DECLARE_WRITE_LINE_MEMBER( reset_w ) { m_write_reset(state); }
- int phi2() { return clock(); }
- int dotclock() { return phi2() * 8; }
+ XTAL phi2() { return clock(); }
+ XTAL dotclock() { return phi2() * 8; }
int hiram() { return m_hiram; }
int loram() { return m_loram; }
diff --git a/src/devices/bus/c64/fcc.cpp b/src/devices/bus/c64/fcc.cpp
index 07ff8840e3a..6199968cc0a 100644
--- a/src/devices/bus/c64/fcc.cpp
+++ b/src/devices/bus/c64/fcc.cpp
@@ -78,7 +78,7 @@ ioport_constructor c64_final_chesscard_device::device_input_ports() const
// c64_final_chesscard_device - constructor
//-------------------------------------------------
-c64_final_chesscard_device::c64_final_chesscard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_final_chesscard_device::c64_final_chesscard_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_FCC, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this),
device_nvram_interface(mconfig, *this),
diff --git a/src/devices/bus/c64/fcc.h b/src/devices/bus/c64/fcc.h
index 33baea0707c..18dbd863f72 100644
--- a/src/devices/bus/c64/fcc.h
+++ b/src/devices/bus/c64/fcc.h
@@ -29,7 +29,7 @@ class c64_final_chesscard_device : public device_t,
{
public:
// construction/destruction
- c64_final_chesscard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_final_chesscard_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/final.cpp b/src/devices/bus/c64/final.cpp
index b11267b1f01..d7a40b39ff0 100644
--- a/src/devices/bus/c64/final.cpp
+++ b/src/devices/bus/c64/final.cpp
@@ -63,7 +63,7 @@ ioport_constructor c64_final_cartridge_device::device_input_ports() const
// c64_final_cartridge_device - constructor
//-------------------------------------------------
-c64_final_cartridge_device::c64_final_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_final_cartridge_device::c64_final_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_FINAL, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this)
{
diff --git a/src/devices/bus/c64/final.h b/src/devices/bus/c64/final.h
index 6d59e737c02..11e18d56dee 100644
--- a/src/devices/bus/c64/final.h
+++ b/src/devices/bus/c64/final.h
@@ -27,7 +27,7 @@ class c64_final_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_final_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_final_cartridge_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/c64/final3.cpp b/src/devices/bus/c64/final3.cpp
index 7df9d03042e..739e3e96c8f 100644
--- a/src/devices/bus/c64/final3.cpp
+++ b/src/devices/bus/c64/final3.cpp
@@ -64,7 +64,7 @@ ioport_constructor c64_final3_cartridge_device::device_input_ports() const
// c64_final3_cartridge_device - constructor
//-------------------------------------------------
-c64_final3_cartridge_device::c64_final3_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_final3_cartridge_device::c64_final3_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_FINAL3, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this), m_bank(0), m_hidden(0)
{
diff --git a/src/devices/bus/c64/final3.h b/src/devices/bus/c64/final3.h
index 8b020482560..0f19ba580ef 100644
--- a/src/devices/bus/c64/final3.h
+++ b/src/devices/bus/c64/final3.h
@@ -27,7 +27,7 @@ class c64_final3_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_final3_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_final3_cartridge_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/c64/fun_play.cpp b/src/devices/bus/c64/fun_play.cpp
index 2a211b21ab5..0c6a2430ee2 100644
--- a/src/devices/bus/c64/fun_play.cpp
+++ b/src/devices/bus/c64/fun_play.cpp
@@ -27,7 +27,7 @@ DEFINE_DEVICE_TYPE(C64_FUN_PLAY, c64_fun_play_cartridge_device, "c64_fun_play",
// c64_fun_play_cartridge_device - constructor
//-------------------------------------------------
-c64_fun_play_cartridge_device::c64_fun_play_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_fun_play_cartridge_device::c64_fun_play_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_FUN_PLAY, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this),
m_bank(0)
diff --git a/src/devices/bus/c64/fun_play.h b/src/devices/bus/c64/fun_play.h
index 6fc082164c6..1b43b5e5755 100644
--- a/src/devices/bus/c64/fun_play.h
+++ b/src/devices/bus/c64/fun_play.h
@@ -27,7 +27,7 @@ class c64_fun_play_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_fun_play_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_fun_play_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/geocable.cpp b/src/devices/bus/c64/geocable.cpp
index e07734f987f..19ec7430bf6 100644
--- a/src/devices/bus/c64/geocable.cpp
+++ b/src/devices/bus/c64/geocable.cpp
@@ -46,7 +46,7 @@ void c64_geocable_device::device_add_mconfig(machine_config &config)
// c64_geocable_device - constructor
//-------------------------------------------------
-c64_geocable_device::c64_geocable_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_geocable_device::c64_geocable_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_GEOCABLE, tag, owner, clock),
device_pet_user_port_interface(mconfig, *this),
m_centronics(*this, CENTRONICS_TAG)
diff --git a/src/devices/bus/c64/geocable.h b/src/devices/bus/c64/geocable.h
index 587a94ad80c..408fa0df991 100644
--- a/src/devices/bus/c64/geocable.h
+++ b/src/devices/bus/c64/geocable.h
@@ -27,7 +27,7 @@ class c64_geocable_device : public device_t, public device_pet_user_port_interfa
{
public:
// construction/destruction
- c64_geocable_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_geocable_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/georam.cpp b/src/devices/bus/c64/georam.cpp
index 377bc10a391..19db7f3c66c 100644
--- a/src/devices/bus/c64/georam.cpp
+++ b/src/devices/bus/c64/georam.cpp
@@ -27,7 +27,7 @@ DEFINE_DEVICE_TYPE(C64_GEORAM, c64_georam_cartridge_device, "c64_georam", "C64 G
// c64_georam_cartridge_device - constructor
//-------------------------------------------------
-c64_georam_cartridge_device::c64_georam_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_georam_cartridge_device::c64_georam_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_GEORAM, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this),
m_ram(*this, "ram", 0x80000, ENDIANNESS_LITTLE),
diff --git a/src/devices/bus/c64/georam.h b/src/devices/bus/c64/georam.h
index 41b7fd82379..0a66f343b92 100644
--- a/src/devices/bus/c64/georam.h
+++ b/src/devices/bus/c64/georam.h
@@ -27,7 +27,7 @@ class c64_georam_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_georam_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_georam_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/ide64.cpp b/src/devices/bus/c64/ide64.cpp
index 830f38c3993..5fa27a61e66 100644
--- a/src/devices/bus/c64/ide64.cpp
+++ b/src/devices/bus/c64/ide64.cpp
@@ -86,7 +86,7 @@ ioport_constructor c64_ide64_cartridge_device::device_input_ports() const
// c64_ide64_cartridge_device - constructor
//-------------------------------------------------
-c64_ide64_cartridge_device::c64_ide64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_ide64_cartridge_device::c64_ide64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_IDE64, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this),
m_flash_rom(*this, AT29C010A_TAG),
diff --git a/src/devices/bus/c64/ide64.h b/src/devices/bus/c64/ide64.h
index 9438e3a1ed0..d0a7d113c2a 100644
--- a/src/devices/bus/c64/ide64.h
+++ b/src/devices/bus/c64/ide64.h
@@ -31,7 +31,7 @@ class c64_ide64_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_ide64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_ide64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/ieee488.cpp b/src/devices/bus/c64/ieee488.cpp
index dc588dfc136..48288cb216c 100644
--- a/src/devices/bus/c64/ieee488.cpp
+++ b/src/devices/bus/c64/ieee488.cpp
@@ -143,7 +143,7 @@ void c64_ieee488_device::tpi_pc_w(uint8_t data)
void c64_ieee488_device::device_add_mconfig(machine_config &config)
{
- TPI6525(config, m_tpi, 0);
+ TPI6525(config, m_tpi);
m_tpi->in_pa_cb().set(FUNC(c64_ieee488_device::tpi_pa_r));
m_tpi->out_pa_cb().set(FUNC(c64_ieee488_device::tpi_pa_w));
m_tpi->in_pb_cb().set(m_bus, FUNC(ieee488_device::dio_r));
@@ -151,7 +151,7 @@ void c64_ieee488_device::device_add_mconfig(machine_config &config)
m_tpi->in_pc_cb().set(FUNC(c64_ieee488_device::tpi_pc_r));
m_tpi->out_pc_cb().set(FUNC(c64_ieee488_device::tpi_pc_w));
- IEEE488(config, m_bus, 0);
+ IEEE488(config, m_bus);
ieee488_slot_device::add_cbm_defaults(config, nullptr);
C64_EXPANSION_SLOT(config, m_exp, DERIVED_CLOCK(1, 1), c64_expansion_cards, nullptr);
@@ -168,7 +168,7 @@ void c64_ieee488_device::device_add_mconfig(machine_config &config)
// c64_ieee488_device - constructor
//-------------------------------------------------
-c64_ieee488_device::c64_ieee488_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_ieee488_device::c64_ieee488_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_IEEE488, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this),
m_tpi(*this, MOS6525_TAG),
diff --git a/src/devices/bus/c64/ieee488.h b/src/devices/bus/c64/ieee488.h
index 60919029bf7..224ac1c5883 100644
--- a/src/devices/bus/c64/ieee488.h
+++ b/src/devices/bus/c64/ieee488.h
@@ -28,7 +28,7 @@ class c64_ieee488_device : public device_t,
{
public:
// construction/destruction
- c64_ieee488_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_ieee488_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/kingsoft.cpp b/src/devices/bus/c64/kingsoft.cpp
index 510032fb720..3e8be5a06b2 100644
--- a/src/devices/bus/c64/kingsoft.cpp
+++ b/src/devices/bus/c64/kingsoft.cpp
@@ -27,7 +27,7 @@ DEFINE_DEVICE_TYPE(C64_KINGSOFT, c64_kingsoft_cartridge_device, "c64_kingsoft",
// c64_kingsoft_cartridge_device - constructor
//-------------------------------------------------
-c64_kingsoft_cartridge_device::c64_kingsoft_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_kingsoft_cartridge_device::c64_kingsoft_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_KINGSOFT, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this)
{
diff --git a/src/devices/bus/c64/kingsoft.h b/src/devices/bus/c64/kingsoft.h
index 3a9fda45fef..afccc2e7363 100644
--- a/src/devices/bus/c64/kingsoft.h
+++ b/src/devices/bus/c64/kingsoft.h
@@ -27,7 +27,7 @@ class c64_kingsoft_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_kingsoft_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_kingsoft_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/mach5.cpp b/src/devices/bus/c64/mach5.cpp
index ddd44407d3e..006cd6972eb 100644
--- a/src/devices/bus/c64/mach5.cpp
+++ b/src/devices/bus/c64/mach5.cpp
@@ -52,7 +52,7 @@ ioport_constructor c64_mach5_cartridge_device::device_input_ports() const
// c64_mach5_cartridge_device - constructor
//-------------------------------------------------
-c64_mach5_cartridge_device::c64_mach5_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_mach5_cartridge_device::c64_mach5_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_MACH5, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this),
m_s1(*this, "S1"), m_c128(false)
diff --git a/src/devices/bus/c64/mach5.h b/src/devices/bus/c64/mach5.h
index a49e1bec347..b532c0e253a 100644
--- a/src/devices/bus/c64/mach5.h
+++ b/src/devices/bus/c64/mach5.h
@@ -26,7 +26,7 @@ class c64_mach5_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_mach5_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_mach5_cartridge_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/c64/magic_desk.cpp b/src/devices/bus/c64/magic_desk.cpp
index 2fe55681966..f1a140a6fe5 100644
--- a/src/devices/bus/c64/magic_desk.cpp
+++ b/src/devices/bus/c64/magic_desk.cpp
@@ -27,7 +27,7 @@ DEFINE_DEVICE_TYPE(C64_MAGIC_DESK, c64_magic_desk_cartridge_device, "c64_magic_d
// c64_magic_desk_cartridge_device - constructor
//-------------------------------------------------
-c64_magic_desk_cartridge_device::c64_magic_desk_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_magic_desk_cartridge_device::c64_magic_desk_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_MAGIC_DESK, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this),
m_bank(0)
diff --git a/src/devices/bus/c64/magic_desk.h b/src/devices/bus/c64/magic_desk.h
index 75f76dee732..811c521e22e 100644
--- a/src/devices/bus/c64/magic_desk.h
+++ b/src/devices/bus/c64/magic_desk.h
@@ -27,7 +27,7 @@ class c64_magic_desk_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_magic_desk_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_magic_desk_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/magic_formel.cpp b/src/devices/bus/c64/magic_formel.cpp
index 1e6c38d1685..5409307eb69 100644
--- a/src/devices/bus/c64/magic_formel.cpp
+++ b/src/devices/bus/c64/magic_formel.cpp
@@ -98,7 +98,7 @@ WRITE_LINE_MEMBER( c64_magic_formel_cartridge_device::pia_cb2_w )
void c64_magic_formel_cartridge_device::device_add_mconfig(machine_config &config)
{
- PIA6821(config, m_pia, 0);
+ PIA6821(config, m_pia);
m_pia->writepa_handler().set(FUNC(c64_magic_formel_cartridge_device::pia_pa_w));
m_pia->writepb_handler().set(FUNC(c64_magic_formel_cartridge_device::pia_pb_w));
m_pia->cb2_handler().set(FUNC(c64_magic_formel_cartridge_device::pia_cb2_w));
@@ -153,7 +153,7 @@ ioport_constructor c64_magic_formel_cartridge_device::device_input_ports() const
// c64_magic_formel_cartridge_device - constructor
//-------------------------------------------------
-c64_magic_formel_cartridge_device::c64_magic_formel_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_magic_formel_cartridge_device::c64_magic_formel_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_MAGIC_FORMEL, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this),
m_pia(*this, MC6821_TAG),
diff --git a/src/devices/bus/c64/magic_formel.h b/src/devices/bus/c64/magic_formel.h
index ab16d4a0e34..aa6e35116b2 100644
--- a/src/devices/bus/c64/magic_formel.h
+++ b/src/devices/bus/c64/magic_formel.h
@@ -27,7 +27,7 @@ class c64_magic_formel_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_magic_formel_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_magic_formel_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
DECLARE_INPUT_CHANGED_MEMBER( freeze );
diff --git a/src/devices/bus/c64/magic_voice.cpp b/src/devices/bus/c64/magic_voice.cpp
index faac3bc0a33..f6752526d69 100644
--- a/src/devices/bus/c64/magic_voice.cpp
+++ b/src/devices/bus/c64/magic_voice.cpp
@@ -221,7 +221,7 @@ WRITE_LINE_MEMBER( c64_magic_voice_cartridge_device::apd_w )
void c64_magic_voice_cartridge_device::device_add_mconfig(machine_config &config)
{
- TPI6525(config, m_tpi, 0);
+ TPI6525(config, m_tpi);
m_tpi->out_irq_cb().set(FUNC(c64_magic_voice_cartridge_device::tpi_irq_w));
m_tpi->in_pa_cb().set(FUNC(c64_magic_voice_cartridge_device::tpi_pa_r));
m_tpi->out_pa_cb().set(FUNC(c64_magic_voice_cartridge_device::tpi_pa_w));
@@ -230,7 +230,7 @@ void c64_magic_voice_cartridge_device::device_add_mconfig(machine_config &config
m_tpi->out_ca_cb().set(FUNC(c64_magic_voice_cartridge_device::tpi_ca_w));
m_tpi->out_cb_cb().set(FUNC(c64_magic_voice_cartridge_device::tpi_cb_w));
- CD40105(config, m_fifo, 0);
+ CD40105(config, m_fifo);
m_fifo->in_ready_cb().set(m_tpi, FUNC(tpi6525_device::i3_w));
SPEAKER(config, "mono").front_center();
@@ -255,7 +255,7 @@ void c64_magic_voice_cartridge_device::device_add_mconfig(machine_config &config
// c64_magic_voice_cartridge_device - constructor
//-------------------------------------------------
-c64_magic_voice_cartridge_device::c64_magic_voice_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_magic_voice_cartridge_device::c64_magic_voice_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_MAGIC_VOICE, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this),
m_vslsi(*this, T6721A_TAG),
diff --git a/src/devices/bus/c64/magic_voice.h b/src/devices/bus/c64/magic_voice.h
index f6c4a4d138e..b55008f9614 100644
--- a/src/devices/bus/c64/magic_voice.h
+++ b/src/devices/bus/c64/magic_voice.h
@@ -29,7 +29,7 @@ class c64_magic_voice_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_magic_voice_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_magic_voice_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/midi_maplin.cpp b/src/devices/bus/c64/midi_maplin.cpp
index adc8556a7bd..ae0a7d3f286 100644
--- a/src/devices/bus/c64/midi_maplin.cpp
+++ b/src/devices/bus/c64/midi_maplin.cpp
@@ -46,7 +46,7 @@ WRITE_LINE_MEMBER( c64_maplin_midi_cartridge_device::write_acia_clock )
void c64_maplin_midi_cartridge_device::device_add_mconfig(machine_config &config)
{
- ACIA6850(config, m_acia, 0);
+ ACIA6850(config, m_acia);
m_acia->txd_handler().set("mdout", FUNC(midi_port_device::write_txd));
m_acia->irq_handler().set(FUNC(c64_maplin_midi_cartridge_device::acia_irq_w));
@@ -54,7 +54,7 @@ void c64_maplin_midi_cartridge_device::device_add_mconfig(machine_config &config
MIDI_PORT(config, "mdout", midiout_slot, "midiout");
- clock_device &acia_clock(CLOCK(config, "acia_clock", 31250*16));
+ clock_device &acia_clock(CLOCK(config, "acia_clock", XTAL::u(31250*16)));
acia_clock.signal_handler().set(FUNC(c64_maplin_midi_cartridge_device::write_acia_clock));
}
@@ -68,7 +68,7 @@ void c64_maplin_midi_cartridge_device::device_add_mconfig(machine_config &config
// c64_maplin_midi_cartridge_device - constructor
//-------------------------------------------------
-c64_maplin_midi_cartridge_device::c64_maplin_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_maplin_midi_cartridge_device::c64_maplin_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_MIDI_MAPLIN, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this),
m_acia(*this, MC6850_TAG)
diff --git a/src/devices/bus/c64/midi_maplin.h b/src/devices/bus/c64/midi_maplin.h
index d0798d9217f..18e40b9207a 100644
--- a/src/devices/bus/c64/midi_maplin.h
+++ b/src/devices/bus/c64/midi_maplin.h
@@ -26,7 +26,7 @@ class c64_maplin_midi_cartridge_device : public device_t, public device_c64_expa
{
public:
// construction/destruction
- c64_maplin_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_maplin_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/midi_namesoft.cpp b/src/devices/bus/c64/midi_namesoft.cpp
index d4e7c8b59ac..4aef9cf522b 100644
--- a/src/devices/bus/c64/midi_namesoft.cpp
+++ b/src/devices/bus/c64/midi_namesoft.cpp
@@ -46,7 +46,7 @@ WRITE_LINE_MEMBER( c64_namesoft_midi_cartridge_device::write_acia_clock )
void c64_namesoft_midi_cartridge_device::device_add_mconfig(machine_config &config)
{
- ACIA6850(config, m_acia, 0);
+ ACIA6850(config, m_acia);
m_acia->txd_handler().set("mdout", FUNC(midi_port_device::write_txd));
m_acia->irq_handler().set(FUNC(c64_namesoft_midi_cartridge_device::acia_irq_w));
@@ -54,7 +54,7 @@ void c64_namesoft_midi_cartridge_device::device_add_mconfig(machine_config &conf
MIDI_PORT(config, "mdout", midiout_slot, "midiout");
- clock_device &acia_clock(CLOCK(config, "acia_clock", 31250*16));
+ clock_device &acia_clock(CLOCK(config, "acia_clock", XTAL::u(31250*16)));
acia_clock.signal_handler().set(FUNC(c64_namesoft_midi_cartridge_device::write_acia_clock));
}
@@ -68,7 +68,7 @@ void c64_namesoft_midi_cartridge_device::device_add_mconfig(machine_config &conf
// c64_namesoft_midi_cartridge_device - constructor
//-------------------------------------------------
-c64_namesoft_midi_cartridge_device::c64_namesoft_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_namesoft_midi_cartridge_device::c64_namesoft_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_MIDI_NAMESOFT, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this),
m_acia(*this, MC6850_TAG)
diff --git a/src/devices/bus/c64/midi_namesoft.h b/src/devices/bus/c64/midi_namesoft.h
index d2183d271d0..3d66ff6b433 100644
--- a/src/devices/bus/c64/midi_namesoft.h
+++ b/src/devices/bus/c64/midi_namesoft.h
@@ -26,7 +26,7 @@ class c64_namesoft_midi_cartridge_device : public device_t, public device_c64_ex
{
public:
// construction/destruction
- c64_namesoft_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_namesoft_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/midi_passport.cpp b/src/devices/bus/c64/midi_passport.cpp
index 05a3fbb1a36..1e98e2e9417 100644
--- a/src/devices/bus/c64/midi_passport.cpp
+++ b/src/devices/bus/c64/midi_passport.cpp
@@ -60,19 +60,19 @@ WRITE_LINE_MEMBER( c64_passport_midi_cartridge_device::write_acia_clock )
void c64_passport_midi_cartridge_device::device_add_mconfig(machine_config &config)
{
- ACIA6850(config, m_acia, 0);
+ ACIA6850(config, m_acia);
m_acia->txd_handler().set("mdout", FUNC(midi_port_device::write_txd));
m_acia->irq_handler().set(FUNC(c64_passport_midi_cartridge_device::acia_irq_w));
- PTM6840(config, m_ptm, 1021800);
- m_ptm->set_external_clocks(1021800.0f, 1021800.0f, 1021800.0f);
+ PTM6840(config, m_ptm, XTAL::u(1021800));
+ m_ptm->set_external_clocks(XTAL::u(1021800), XTAL::u(1021800), XTAL::u(1021800));
m_ptm->irq_callback().set(FUNC(c64_passport_midi_cartridge_device::ptm_irq_w));
MIDI_PORT(config, "mdin", midiin_slot, "midiin").rxd_handler().set(m_acia, FUNC(acia6850_device::write_rxd));
MIDI_PORT(config, "mdout", midiout_slot, "midiout");
- clock_device &acia_clock(CLOCK(config, "acia_clock", 31250*16)); // TODO: work out if the clock should come from the 6840
+ clock_device &acia_clock(CLOCK(config, "acia_clock", XTAL::u(31250*16))); // TODO: work out if the clock should come from the 6840
acia_clock.signal_handler().set(FUNC(c64_passport_midi_cartridge_device::write_acia_clock));
}
@@ -86,7 +86,7 @@ void c64_passport_midi_cartridge_device::device_add_mconfig(machine_config &conf
// c64_passport_midi_cartridge_device - constructor
//-------------------------------------------------
-c64_passport_midi_cartridge_device::c64_passport_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_passport_midi_cartridge_device::c64_passport_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_MIDI_PASSPORT, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this),
m_acia(*this, MC6850_TAG),
diff --git a/src/devices/bus/c64/midi_passport.h b/src/devices/bus/c64/midi_passport.h
index d6b4cf16eb7..77b4ccc9538 100644
--- a/src/devices/bus/c64/midi_passport.h
+++ b/src/devices/bus/c64/midi_passport.h
@@ -27,7 +27,7 @@ class c64_passport_midi_cartridge_device : public device_t, public device_c64_ex
{
public:
// construction/destruction
- c64_passport_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_passport_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/midi_sci.cpp b/src/devices/bus/c64/midi_sci.cpp
index 14309ee5e7c..62d9fed4fd3 100644
--- a/src/devices/bus/c64/midi_sci.cpp
+++ b/src/devices/bus/c64/midi_sci.cpp
@@ -46,7 +46,7 @@ WRITE_LINE_MEMBER( c64_sequential_midi_cartridge_device::write_acia_clock )
void c64_sequential_midi_cartridge_device::device_add_mconfig(machine_config &config)
{
- ACIA6850(config, m_acia, 0);
+ ACIA6850(config, m_acia);
m_acia->txd_handler().set("mdout", FUNC(midi_port_device::write_txd));
m_acia->irq_handler().set(FUNC(c64_sequential_midi_cartridge_device::acia_irq_w));
@@ -54,7 +54,7 @@ void c64_sequential_midi_cartridge_device::device_add_mconfig(machine_config &co
MIDI_PORT(config, "mdout", midiout_slot, "midiout");
- clock_device &acia_clock(CLOCK(config, "acia_clock", 31250*16));
+ clock_device &acia_clock(CLOCK(config, "acia_clock", XTAL::u(31250*16)));
acia_clock.signal_handler().set(FUNC(c64_sequential_midi_cartridge_device::write_acia_clock));
}
@@ -68,7 +68,7 @@ void c64_sequential_midi_cartridge_device::device_add_mconfig(machine_config &co
// c64_sequential_midi_cartridge_device - constructor
//-------------------------------------------------
-c64_sequential_midi_cartridge_device::c64_sequential_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_sequential_midi_cartridge_device::c64_sequential_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_MIDI_SCI, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this),
m_acia(*this, MC6850_TAG)
diff --git a/src/devices/bus/c64/midi_sci.h b/src/devices/bus/c64/midi_sci.h
index 5ab0d8d45db..66a8623a489 100644
--- a/src/devices/bus/c64/midi_sci.h
+++ b/src/devices/bus/c64/midi_sci.h
@@ -26,7 +26,7 @@ class c64_sequential_midi_cartridge_device : public device_t, public device_c64_
{
public:
// construction/destruction
- c64_sequential_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_sequential_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/midi_siel.cpp b/src/devices/bus/c64/midi_siel.cpp
index eea7a4b333d..d2af8c262a5 100644
--- a/src/devices/bus/c64/midi_siel.cpp
+++ b/src/devices/bus/c64/midi_siel.cpp
@@ -46,7 +46,7 @@ WRITE_LINE_MEMBER( c64_siel_midi_cartridge_device::write_acia_clock )
void c64_siel_midi_cartridge_device::device_add_mconfig(machine_config &config)
{
- ACIA6850(config, m_acia, 0);
+ ACIA6850(config, m_acia);
m_acia->txd_handler().set("mdout", FUNC(midi_port_device::write_txd));
m_acia->irq_handler().set(FUNC(c64_siel_midi_cartridge_device::acia_irq_w));
@@ -54,7 +54,7 @@ void c64_siel_midi_cartridge_device::device_add_mconfig(machine_config &config)
MIDI_PORT(config, "mdout", midiout_slot, "midiout");
- clock_device &acia_clock(CLOCK(config, "acia_clock", 31250*16));
+ clock_device &acia_clock(CLOCK(config, "acia_clock", XTAL::u(31250*16)));
acia_clock.signal_handler().set(FUNC(c64_siel_midi_cartridge_device::write_acia_clock));
}
@@ -68,7 +68,7 @@ void c64_siel_midi_cartridge_device::device_add_mconfig(machine_config &config)
// c64_siel_midi_cartridge_device - constructor
//-------------------------------------------------
-c64_siel_midi_cartridge_device::c64_siel_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_siel_midi_cartridge_device::c64_siel_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_MIDI_SIEL, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this),
m_acia(*this, MC6850_TAG)
diff --git a/src/devices/bus/c64/midi_siel.h b/src/devices/bus/c64/midi_siel.h
index 412d1a224b7..5a84c250e66 100644
--- a/src/devices/bus/c64/midi_siel.h
+++ b/src/devices/bus/c64/midi_siel.h
@@ -26,7 +26,7 @@ class c64_siel_midi_cartridge_device : public device_t, public device_c64_expans
{
public:
// construction/destruction
- c64_siel_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_siel_midi_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/mikro_assembler.cpp b/src/devices/bus/c64/mikro_assembler.cpp
index d6c02be7681..394cf04afcb 100644
--- a/src/devices/bus/c64/mikro_assembler.cpp
+++ b/src/devices/bus/c64/mikro_assembler.cpp
@@ -27,7 +27,7 @@ DEFINE_DEVICE_TYPE(C64_MIKRO_ASSEMBLER, c64_mikro_assembler_cartridge_device, "c
// c64_mikro_assembler_cartridge_device - constructor
//-------------------------------------------------
-c64_mikro_assembler_cartridge_device::c64_mikro_assembler_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_mikro_assembler_cartridge_device::c64_mikro_assembler_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_MIKRO_ASSEMBLER, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this)
{
diff --git a/src/devices/bus/c64/mikro_assembler.h b/src/devices/bus/c64/mikro_assembler.h
index 754a91385d4..0abf97aabe4 100644
--- a/src/devices/bus/c64/mikro_assembler.h
+++ b/src/devices/bus/c64/mikro_assembler.h
@@ -27,7 +27,7 @@ class c64_mikro_assembler_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_mikro_assembler_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_mikro_assembler_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/multiscreen.cpp b/src/devices/bus/c64/multiscreen.cpp
index 890c1a35799..63b6bca4d80 100644
--- a/src/devices/bus/c64/multiscreen.cpp
+++ b/src/devices/bus/c64/multiscreen.cpp
@@ -117,8 +117,8 @@ void c64_multiscreen_cartridge_device::device_add_mconfig(machine_config &config
m6802_cpu_device &cpu(M6802(config, MC6802P_TAG, XTAL(4'000'000)));
cpu.set_addrmap(AS_PROGRAM, &c64_multiscreen_cartridge_device::multiscreen_mem);
- PIA6821(config, MC6821P_0_TAG, 0);
- PIA6821(config, MC6821P_1_TAG, 0);
+ PIA6821(config, MC6821P_0_TAG);
+ PIA6821(config, MC6821P_1_TAG);
}
@@ -130,7 +130,7 @@ void c64_multiscreen_cartridge_device::device_add_mconfig(machine_config &config
// c64_multiscreen_cartridge_device - constructor
//-------------------------------------------------
-c64_multiscreen_cartridge_device::c64_multiscreen_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_multiscreen_cartridge_device::c64_multiscreen_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_MULTISCREEN, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this), m_bank(0)
{
diff --git a/src/devices/bus/c64/multiscreen.h b/src/devices/bus/c64/multiscreen.h
index 619154d18c5..edc07af326a 100644
--- a/src/devices/bus/c64/multiscreen.h
+++ b/src/devices/bus/c64/multiscreen.h
@@ -29,7 +29,7 @@ class c64_multiscreen_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_multiscreen_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_multiscreen_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/music64.cpp b/src/devices/bus/c64/music64.cpp
index 28fa6fc1539..1f8724e64d7 100644
--- a/src/devices/bus/c64/music64.cpp
+++ b/src/devices/bus/c64/music64.cpp
@@ -141,7 +141,7 @@ ioport_constructor c64_music64_cartridge_device::device_input_ports() const
// c64_music64_cartridge_device - constructor
//-------------------------------------------------
-c64_music64_cartridge_device::c64_music64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_music64_cartridge_device::c64_music64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_MUSIC64, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this),
m_exp(*this, "exp"),
diff --git a/src/devices/bus/c64/music64.h b/src/devices/bus/c64/music64.h
index cf494c481b8..7b583e983aa 100644
--- a/src/devices/bus/c64/music64.h
+++ b/src/devices/bus/c64/music64.h
@@ -26,7 +26,7 @@ class c64_music64_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_music64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_music64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/neoram.cpp b/src/devices/bus/c64/neoram.cpp
index c0f292da161..4d70792f337 100644
--- a/src/devices/bus/c64/neoram.cpp
+++ b/src/devices/bus/c64/neoram.cpp
@@ -27,7 +27,7 @@ DEFINE_DEVICE_TYPE(C64_NEORAM, c64_neoram_cartridge_device, "c64_neoram", "C64 N
// c64_neoram_cartridge_device - constructor
//-------------------------------------------------
-c64_neoram_cartridge_device::c64_neoram_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_neoram_cartridge_device::c64_neoram_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_NEORAM, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this),
device_nvram_interface(mconfig, *this),
diff --git a/src/devices/bus/c64/neoram.h b/src/devices/bus/c64/neoram.h
index d54e8e18cc4..63b4149c004 100644
--- a/src/devices/bus/c64/neoram.h
+++ b/src/devices/bus/c64/neoram.h
@@ -28,7 +28,7 @@ class c64_neoram_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_neoram_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_neoram_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/ocean.cpp b/src/devices/bus/c64/ocean.cpp
index 3e134d9449b..dacb5513608 100644
--- a/src/devices/bus/c64/ocean.cpp
+++ b/src/devices/bus/c64/ocean.cpp
@@ -49,7 +49,7 @@ DEFINE_DEVICE_TYPE(C64_OCEAN, c64_ocean_cartridge_device, "c64_ocean", "C64 Ocea
// c64_ocean_cartridge_device - constructor
//-------------------------------------------------
-c64_ocean_cartridge_device::c64_ocean_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_ocean_cartridge_device::c64_ocean_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_OCEAN, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this),
m_bank(0)
diff --git a/src/devices/bus/c64/ocean.h b/src/devices/bus/c64/ocean.h
index 9a78f5e21f9..752fe0eb087 100644
--- a/src/devices/bus/c64/ocean.h
+++ b/src/devices/bus/c64/ocean.h
@@ -27,7 +27,7 @@ class c64_ocean_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_ocean_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_ocean_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/pagefox.cpp b/src/devices/bus/c64/pagefox.cpp
index e33bb4d3d7b..67580e00c2d 100644
--- a/src/devices/bus/c64/pagefox.cpp
+++ b/src/devices/bus/c64/pagefox.cpp
@@ -49,7 +49,7 @@ DEFINE_DEVICE_TYPE(C64_PAGEFOX, c64_pagefox_cartridge_device, "c64_pagefox", "C6
// c64_pagefox_cartridge_device - constructor
//-------------------------------------------------
-c64_pagefox_cartridge_device::c64_pagefox_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_pagefox_cartridge_device::c64_pagefox_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_PAGEFOX, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this),
m_ram(*this, "ram", 0x8000, ENDIANNESS_LITTLE),
diff --git a/src/devices/bus/c64/pagefox.h b/src/devices/bus/c64/pagefox.h
index b0295eb9d0d..f19f7d71653 100644
--- a/src/devices/bus/c64/pagefox.h
+++ b/src/devices/bus/c64/pagefox.h
@@ -27,7 +27,7 @@ class c64_pagefox_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_pagefox_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_pagefox_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/partner.cpp b/src/devices/bus/c64/partner.cpp
index b77cf610d17..851224479b8 100644
--- a/src/devices/bus/c64/partner.cpp
+++ b/src/devices/bus/c64/partner.cpp
@@ -77,7 +77,7 @@ ioport_constructor c64_partner_cartridge_device::device_input_ports() const
// c64_partner_cartridge_device - constructor
//-------------------------------------------------
-c64_partner_cartridge_device::c64_partner_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_partner_cartridge_device::c64_partner_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_PARTNER, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this),
m_ram(*this, "ram", 0x2000, ENDIANNESS_LITTLE),
diff --git a/src/devices/bus/c64/partner.h b/src/devices/bus/c64/partner.h
index 4dd71542571..be3aa3925b6 100644
--- a/src/devices/bus/c64/partner.h
+++ b/src/devices/bus/c64/partner.h
@@ -26,7 +26,7 @@ class c64_partner_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_partner_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_partner_cartridge_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/c64/prophet64.cpp b/src/devices/bus/c64/prophet64.cpp
index ea5e16a3000..d4f2d4ff9cc 100644
--- a/src/devices/bus/c64/prophet64.cpp
+++ b/src/devices/bus/c64/prophet64.cpp
@@ -27,7 +27,7 @@ DEFINE_DEVICE_TYPE(C64_PROPHET64, c64_prophet64_cartridge_device, "c64_prophet64
// c64_prophet64_cartridge_device - constructor
//-------------------------------------------------
-c64_prophet64_cartridge_device::c64_prophet64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_prophet64_cartridge_device::c64_prophet64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_PROPHET64, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this),
m_bank(0)
diff --git a/src/devices/bus/c64/prophet64.h b/src/devices/bus/c64/prophet64.h
index f58ba30b7b7..fc26e74ebab 100644
--- a/src/devices/bus/c64/prophet64.h
+++ b/src/devices/bus/c64/prophet64.h
@@ -26,7 +26,7 @@ class c64_prophet64_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_prophet64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_prophet64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/ps64.cpp b/src/devices/bus/c64/ps64.cpp
index c14008b2c08..fcfd3f02422 100644
--- a/src/devices/bus/c64/ps64.cpp
+++ b/src/devices/bus/c64/ps64.cpp
@@ -67,7 +67,7 @@ DEFINE_DEVICE_TYPE(C64_PS64, c64_ps64_cartridge_device, "c64_ps64", "C64 PS-64")
void c64_ps64_cartridge_device::device_add_mconfig(machine_config &config)
{
//SPEAKER(config, "speaker").front_center();
- //VOTRAX_SC02(config, SSI263_TAG, 2000000).add_route(ALL_OUTPUTS, "mono", 1.00);
+ //VOTRAX_SC02(config, SSI263_TAG, XTAL::u(2000000)).add_route(ALL_OUTPUTS, "mono", 1.00);
}
@@ -80,7 +80,7 @@ void c64_ps64_cartridge_device::device_add_mconfig(machine_config &config)
// c64_ps64_cartridge_device - constructor
//-------------------------------------------------
-c64_ps64_cartridge_device::c64_ps64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_ps64_cartridge_device::c64_ps64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_PS64, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this)
{
diff --git a/src/devices/bus/c64/ps64.h b/src/devices/bus/c64/ps64.h
index 69a9c5b0110..1cb0d113031 100644
--- a/src/devices/bus/c64/ps64.h
+++ b/src/devices/bus/c64/ps64.h
@@ -28,7 +28,7 @@ class c64_ps64_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_ps64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_ps64_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/reu.cpp b/src/devices/bus/c64/reu.cpp
index 0d24a1967fa..09c0cf82bba 100644
--- a/src/devices/bus/c64/reu.cpp
+++ b/src/devices/bus/c64/reu.cpp
@@ -33,7 +33,7 @@ DEFINE_DEVICE_TYPE(C64_REU1764, c64_reu1764_cartridge_device, "c64_1764reu", "17
void c64_reu_cartridge_device::device_add_mconfig(machine_config &config)
{
- MOS8726(config, m_dmac, 1000000); // dummy clock
+ MOS8726(config, m_dmac, XTAL::u(1000000)); // dummy clock
GENERIC_SOCKET(config, m_eprom, generic_linear_slot, nullptr, "bin,rom");
}
@@ -48,7 +48,7 @@ void c64_reu_cartridge_device::device_add_mconfig(machine_config &config)
// c64_reu_cartridge_device - constructor
//-------------------------------------------------
-c64_reu_cartridge_device::c64_reu_cartridge_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, uint32_t variant, int jp1, size_t ram_size) :
+c64_reu_cartridge_device::c64_reu_cartridge_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, uint32_t variant, int jp1, size_t ram_size) :
device_t(mconfig, type, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this),
m_dmac(*this, MOS8726R1_TAG),
@@ -60,13 +60,13 @@ c64_reu_cartridge_device::c64_reu_cartridge_device(const machine_config &mconfig
{
}
-c64_reu1700_cartridge_device::c64_reu1700_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+c64_reu1700_cartridge_device::c64_reu1700_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: c64_reu_cartridge_device(mconfig, C64_REU1700, tag, owner, clock, TYPE_1700, 0, 128 * 1024) { }
-c64_reu1750_cartridge_device::c64_reu1750_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+c64_reu1750_cartridge_device::c64_reu1750_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: c64_reu_cartridge_device(mconfig, C64_REU1750, tag, owner, clock, TYPE_1750, 1, 256 * 1024) { }
-c64_reu1764_cartridge_device::c64_reu1764_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+c64_reu1764_cartridge_device::c64_reu1764_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: c64_reu_cartridge_device(mconfig, C64_REU1764, tag, owner, clock, TYPE_1764, 1, 512 * 1024) { }
diff --git a/src/devices/bus/c64/reu.h b/src/devices/bus/c64/reu.h
index eaa662f38a1..e2197b615d9 100644
--- a/src/devices/bus/c64/reu.h
+++ b/src/devices/bus/c64/reu.h
@@ -37,7 +37,7 @@ protected:
};
// construction/destruction
- c64_reu_cartridge_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, uint32_t variant, int jp1, size_t ram_size);
+ c64_reu_cartridge_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, uint32_t variant, int jp1, size_t ram_size);
// device-level overrides
virtual void device_start() override;
@@ -66,7 +66,7 @@ class c64_reu1700_cartridge_device : public c64_reu_cartridge_device
{
public:
// construction/destruction
- c64_reu1700_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_reu1700_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
};
@@ -76,7 +76,7 @@ class c64_reu1750_cartridge_device : public c64_reu_cartridge_device
{
public:
// construction/destruction
- c64_reu1750_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_reu1750_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
};
// ======================> c64_reu1700_cartridge_device
@@ -85,7 +85,7 @@ class c64_reu1764_cartridge_device : public c64_reu_cartridge_device
{
public:
// construction/destruction
- c64_reu1764_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_reu1764_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
};
diff --git a/src/devices/bus/c64/rex.cpp b/src/devices/bus/c64/rex.cpp
index 97fecd740af..3932cd419a2 100644
--- a/src/devices/bus/c64/rex.cpp
+++ b/src/devices/bus/c64/rex.cpp
@@ -27,7 +27,7 @@ DEFINE_DEVICE_TYPE(C64_REX, c64_rex_cartridge_device, "c64_rex", "C64 Rex cartri
// c64_rex_cartridge_device - constructor
//-------------------------------------------------
-c64_rex_cartridge_device::c64_rex_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_rex_cartridge_device::c64_rex_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_REX, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this)
{
diff --git a/src/devices/bus/c64/rex.h b/src/devices/bus/c64/rex.h
index cc0cccb52da..f7ab9abbe4b 100644
--- a/src/devices/bus/c64/rex.h
+++ b/src/devices/bus/c64/rex.h
@@ -27,7 +27,7 @@ class c64_rex_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_rex_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_rex_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/rex_ep256.cpp b/src/devices/bus/c64/rex_ep256.cpp
index c482e4b2589..2868e1430aa 100644
--- a/src/devices/bus/c64/rex_ep256.cpp
+++ b/src/devices/bus/c64/rex_ep256.cpp
@@ -38,7 +38,7 @@ void c64_rex_ep256_cartridge_device::device_add_mconfig(machine_config &config)
// c64_rex_ep256_cartridge_device - constructor
//-------------------------------------------------
-c64_rex_ep256_cartridge_device::c64_rex_ep256_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_rex_ep256_cartridge_device::c64_rex_ep256_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_REX_EP256, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this),
m_eproms(*this, "rom%u", 1U)
diff --git a/src/devices/bus/c64/rex_ep256.h b/src/devices/bus/c64/rex_ep256.h
index e06a2c71d17..b9c4d53808d 100644
--- a/src/devices/bus/c64/rex_ep256.h
+++ b/src/devices/bus/c64/rex_ep256.h
@@ -29,7 +29,7 @@ class c64_rex_ep256_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_rex_ep256_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_rex_ep256_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/ross.cpp b/src/devices/bus/c64/ross.cpp
index e8703a33bcc..9e0e9c31580 100644
--- a/src/devices/bus/c64/ross.cpp
+++ b/src/devices/bus/c64/ross.cpp
@@ -27,7 +27,7 @@ DEFINE_DEVICE_TYPE(C64_ROSS, c64_ross_cartridge_device, "c64_ross", "C64 Ross ca
// c64_ross_cartridge_device - constructor
//-------------------------------------------------
-c64_ross_cartridge_device::c64_ross_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_ross_cartridge_device::c64_ross_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_ROSS, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this), m_bank(0)
{
diff --git a/src/devices/bus/c64/ross.h b/src/devices/bus/c64/ross.h
index 97f2698fb6c..4374f044b2f 100644
--- a/src/devices/bus/c64/ross.h
+++ b/src/devices/bus/c64/ross.h
@@ -27,7 +27,7 @@ class c64_ross_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_ross_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_ross_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/sfx_sound_expander.cpp b/src/devices/bus/c64/sfx_sound_expander.cpp
index a85b93bccbf..e392e5f6aac 100644
--- a/src/devices/bus/c64/sfx_sound_expander.cpp
+++ b/src/devices/bus/c64/sfx_sound_expander.cpp
@@ -173,7 +173,7 @@ inline offs_t c64_sfx_sound_expander_cartridge_device::get_offset(offs_t offset,
// c64_sfx_sound_expander_cartridge_device - constructor
//-------------------------------------------------
-c64_sfx_sound_expander_cartridge_device::c64_sfx_sound_expander_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_sfx_sound_expander_cartridge_device::c64_sfx_sound_expander_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_SFX_SOUND_EXPANDER, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this),
m_opl(*this, YM3526_TAG),
diff --git a/src/devices/bus/c64/sfx_sound_expander.h b/src/devices/bus/c64/sfx_sound_expander.h
index 52e006ce686..174b4659149 100644
--- a/src/devices/bus/c64/sfx_sound_expander.h
+++ b/src/devices/bus/c64/sfx_sound_expander.h
@@ -27,7 +27,7 @@ class c64_sfx_sound_expander_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_sfx_sound_expander_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_sfx_sound_expander_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/silverrock.cpp b/src/devices/bus/c64/silverrock.cpp
index f52efc569b6..7b411c2020a 100644
--- a/src/devices/bus/c64/silverrock.cpp
+++ b/src/devices/bus/c64/silverrock.cpp
@@ -60,7 +60,7 @@ DEFINE_DEVICE_TYPE(C64_SILVERROCK, c64_silverrock_cartridge_device, "c64_silverr
// c64_silverrock_cartridge_device - constructor
//-------------------------------------------------
-c64_silverrock_cartridge_device::c64_silverrock_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_silverrock_cartridge_device::c64_silverrock_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_SILVERROCK, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this), m_bank(0)
{
diff --git a/src/devices/bus/c64/silverrock.h b/src/devices/bus/c64/silverrock.h
index 3d9c4e015f2..e758dc18c1b 100644
--- a/src/devices/bus/c64/silverrock.h
+++ b/src/devices/bus/c64/silverrock.h
@@ -27,7 +27,7 @@ class c64_silverrock_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_silverrock_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_silverrock_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/simons_basic.cpp b/src/devices/bus/c64/simons_basic.cpp
index 246e67b8b56..57e5a8774b5 100644
--- a/src/devices/bus/c64/simons_basic.cpp
+++ b/src/devices/bus/c64/simons_basic.cpp
@@ -27,7 +27,7 @@ DEFINE_DEVICE_TYPE(C64_SIMONS_BASIC, c64_simons_basic_cartridge_device, "c64_sim
// c64_simons_basic_cartridge_device - constructor
//-------------------------------------------------
-c64_simons_basic_cartridge_device::c64_simons_basic_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_simons_basic_cartridge_device::c64_simons_basic_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_SIMONS_BASIC, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this)
{
diff --git a/src/devices/bus/c64/simons_basic.h b/src/devices/bus/c64/simons_basic.h
index 63d2dfb5cb9..88639532062 100644
--- a/src/devices/bus/c64/simons_basic.h
+++ b/src/devices/bus/c64/simons_basic.h
@@ -27,7 +27,7 @@ class c64_simons_basic_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_simons_basic_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_simons_basic_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/speakeasy.cpp b/src/devices/bus/c64/speakeasy.cpp
index 23caee3488f..1d85625d8b9 100644
--- a/src/devices/bus/c64/speakeasy.cpp
+++ b/src/devices/bus/c64/speakeasy.cpp
@@ -35,7 +35,7 @@ void c64_speakeasy_cartridge_device::device_add_mconfig(machine_config &config)
{
SPEAKER(config, "mono").front_center();
- VOTRAX_SC01(config, m_votrax, 720000).add_route(ALL_OUTPUTS, "mono", 0.85);
+ VOTRAX_SC01(config, m_votrax, XTAL::u(720000)).add_route(ALL_OUTPUTS, "mono", 0.85);
}
@@ -48,7 +48,7 @@ void c64_speakeasy_cartridge_device::device_add_mconfig(machine_config &config)
// c64_speakeasy_cartridge_device - constructor
//-------------------------------------------------
-c64_speakeasy_cartridge_device::c64_speakeasy_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_speakeasy_cartridge_device::c64_speakeasy_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_SPEAKEASY, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this),
m_votrax(*this, SC01A_TAG)
diff --git a/src/devices/bus/c64/speakeasy.h b/src/devices/bus/c64/speakeasy.h
index 0816e4caa2e..bf16973502f 100644
--- a/src/devices/bus/c64/speakeasy.h
+++ b/src/devices/bus/c64/speakeasy.h
@@ -26,7 +26,7 @@ class c64_speakeasy_cartridge_device : public device_t, public device_c64_expans
{
public:
// construction/destruction
- c64_speakeasy_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_speakeasy_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/stardos.cpp b/src/devices/bus/c64/stardos.cpp
index 601ada2778c..c8436020b94 100644
--- a/src/devices/bus/c64/stardos.cpp
+++ b/src/devices/bus/c64/stardos.cpp
@@ -113,7 +113,7 @@ void c64_stardos_cartridge_device::charge_io2_capacitor()
// c64_stardos_cartridge_device - constructor
//-------------------------------------------------
-c64_stardos_cartridge_device::c64_stardos_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_stardos_cartridge_device::c64_stardos_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_STARDOS, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this),
m_io1_charge(0),
diff --git a/src/devices/bus/c64/stardos.h b/src/devices/bus/c64/stardos.h
index 9be9f599957..606eb155a2a 100644
--- a/src/devices/bus/c64/stardos.h
+++ b/src/devices/bus/c64/stardos.h
@@ -28,7 +28,7 @@ class c64_stardos_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_stardos_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_stardos_cartridge_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/c64/std.cpp b/src/devices/bus/c64/std.cpp
index 127f0bf235c..dd4ed8c2b5c 100644
--- a/src/devices/bus/c64/std.cpp
+++ b/src/devices/bus/c64/std.cpp
@@ -27,7 +27,7 @@ DEFINE_DEVICE_TYPE(C64_STD, c64_standard_cartridge_device, "c64_standard", "C64
// c64_standard_cartridge_device - constructor
//-------------------------------------------------
-c64_standard_cartridge_device::c64_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_standard_cartridge_device::c64_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_STD, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this)
{
diff --git a/src/devices/bus/c64/std.h b/src/devices/bus/c64/std.h
index 391e9ac973f..edb034d2717 100644
--- a/src/devices/bus/c64/std.h
+++ b/src/devices/bus/c64/std.h
@@ -27,7 +27,7 @@ class c64_standard_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_standard_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/structured_basic.cpp b/src/devices/bus/c64/structured_basic.cpp
index e7773c772c0..951b997c38a 100644
--- a/src/devices/bus/c64/structured_basic.cpp
+++ b/src/devices/bus/c64/structured_basic.cpp
@@ -27,7 +27,7 @@ DEFINE_DEVICE_TYPE(C64_STRUCTURED_BASIC, c64_structured_basic_cartridge_device,
// c64_structured_basic_cartridge_device - constructor
//-------------------------------------------------
-c64_structured_basic_cartridge_device::c64_structured_basic_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_structured_basic_cartridge_device::c64_structured_basic_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_STRUCTURED_BASIC, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this),
m_bank(0)
diff --git a/src/devices/bus/c64/structured_basic.h b/src/devices/bus/c64/structured_basic.h
index 44d370cdb3f..3811455996c 100644
--- a/src/devices/bus/c64/structured_basic.h
+++ b/src/devices/bus/c64/structured_basic.h
@@ -27,7 +27,7 @@ class c64_structured_basic_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_structured_basic_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_structured_basic_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/super_explode.cpp b/src/devices/bus/c64/super_explode.cpp
index b01e2e25fba..336c0bf4bbe 100644
--- a/src/devices/bus/c64/super_explode.cpp
+++ b/src/devices/bus/c64/super_explode.cpp
@@ -37,7 +37,7 @@ DEFINE_DEVICE_TYPE(C64_SUPER_EXPLODE, c64_super_explode_cartridge_device, "c64_s
// c64_super_explode_cartridge_device - constructor
//-------------------------------------------------
-c64_super_explode_cartridge_device::c64_super_explode_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_super_explode_cartridge_device::c64_super_explode_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_SUPER_EXPLODE, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this), m_bank(0), m_exrom_timer(nullptr)
{
diff --git a/src/devices/bus/c64/super_explode.h b/src/devices/bus/c64/super_explode.h
index b2cedd35c55..37c763ab194 100644
--- a/src/devices/bus/c64/super_explode.h
+++ b/src/devices/bus/c64/super_explode.h
@@ -27,7 +27,7 @@ class c64_super_explode_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_super_explode_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_super_explode_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/super_games.cpp b/src/devices/bus/c64/super_games.cpp
index 610861c360e..f10f5e7b740 100644
--- a/src/devices/bus/c64/super_games.cpp
+++ b/src/devices/bus/c64/super_games.cpp
@@ -27,7 +27,7 @@ DEFINE_DEVICE_TYPE(C64_SUPER_GAMES, c64_super_games_cartridge_device, "c64_super
// c64_super_games_cartridge_device - constructor
//-------------------------------------------------
-c64_super_games_cartridge_device::c64_super_games_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_super_games_cartridge_device::c64_super_games_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_SUPER_GAMES, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this),
m_bank(0)
diff --git a/src/devices/bus/c64/super_games.h b/src/devices/bus/c64/super_games.h
index 11e4b44046a..eda47dcc195 100644
--- a/src/devices/bus/c64/super_games.h
+++ b/src/devices/bus/c64/super_games.h
@@ -27,7 +27,7 @@ class c64_super_games_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_super_games_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_super_games_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/supercpu.cpp b/src/devices/bus/c64/supercpu.cpp
index e0fe2e2a1ea..c9aa032dfdd 100644
--- a/src/devices/bus/c64/supercpu.cpp
+++ b/src/devices/bus/c64/supercpu.cpp
@@ -63,7 +63,7 @@ void c64_supercpu_device::c64_supercpu_map(address_map &map)
void c64_supercpu_device::device_add_mconfig(machine_config &config)
{
- G65816(config, m_maincpu, 1000000);
+ G65816(config, m_maincpu, XTAL::u(1000000));
m_maincpu->set_addrmap(AS_PROGRAM, &c64_supercpu_device::c64_supercpu_map);
C64_EXPANSION_SLOT(config, m_exp, DERIVED_CLOCK(1, 1), c64_expansion_cards, nullptr);
@@ -111,7 +111,7 @@ ioport_constructor c64_supercpu_device::device_input_ports() const
// c64_supercpu_device - constructor
//-------------------------------------------------
-c64_supercpu_device::c64_supercpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_supercpu_device::c64_supercpu_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_SUPERCPU, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this),
m_maincpu(*this, G65816_TAG),
diff --git a/src/devices/bus/c64/supercpu.h b/src/devices/bus/c64/supercpu.h
index 73982328c31..ca82826bc37 100644
--- a/src/devices/bus/c64/supercpu.h
+++ b/src/devices/bus/c64/supercpu.h
@@ -27,7 +27,7 @@ class c64_supercpu_device : public device_t,
{
public:
// construction/destruction
- c64_supercpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_supercpu_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/sw8k.cpp b/src/devices/bus/c64/sw8k.cpp
index 2f55b223797..037363364da 100644
--- a/src/devices/bus/c64/sw8k.cpp
+++ b/src/devices/bus/c64/sw8k.cpp
@@ -72,7 +72,7 @@ ioport_constructor c64_switchable_8k_cartridge_device::device_input_ports() cons
// c64_switchable_8k_cartridge_device - constructor
//-------------------------------------------------
-c64_switchable_8k_cartridge_device::c64_switchable_8k_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_switchable_8k_cartridge_device::c64_switchable_8k_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_SW8K, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this),
m_sw(*this, "SW"), m_bank(0)
diff --git a/src/devices/bus/c64/sw8k.h b/src/devices/bus/c64/sw8k.h
index 186e96792d6..7fae40984f2 100644
--- a/src/devices/bus/c64/sw8k.h
+++ b/src/devices/bus/c64/sw8k.h
@@ -27,7 +27,7 @@ class c64_switchable_8k_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_switchable_8k_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_switchable_8k_cartridge_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/c64/swiftlink.cpp b/src/devices/bus/c64/swiftlink.cpp
index 3855da85ca3..b89eb1d40e3 100644
--- a/src/devices/bus/c64/swiftlink.cpp
+++ b/src/devices/bus/c64/swiftlink.cpp
@@ -40,7 +40,7 @@ DEFINE_DEVICE_TYPE(C64_SWIFTLINK, c64_swiftlink_cartridge_device, "c64_swiftlink
void c64_swiftlink_cartridge_device::device_add_mconfig(machine_config &config)
{
- MOS6551(config, m_acia, 0);
+ MOS6551(config, m_acia);
m_acia->set_xtal(3.6864_MHz_XTAL);
m_acia->irq_handler().set(FUNC(c64_swiftlink_cartridge_device::acia_irq_w));
m_acia->txd_handler().set(RS232_TAG, FUNC(rs232_port_device::write_txd));
@@ -90,7 +90,7 @@ ioport_constructor c64_swiftlink_cartridge_device::device_input_ports() const
// c64_swiftlink_cartridge_device - constructor
//-------------------------------------------------
-c64_swiftlink_cartridge_device::c64_swiftlink_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_swiftlink_cartridge_device::c64_swiftlink_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_SWIFTLINK, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this),
m_acia(*this, MOS6551_TAG),
diff --git a/src/devices/bus/c64/swiftlink.h b/src/devices/bus/c64/swiftlink.h
index 409cfafa33a..63309c6e395 100644
--- a/src/devices/bus/c64/swiftlink.h
+++ b/src/devices/bus/c64/swiftlink.h
@@ -29,7 +29,7 @@ class c64_swiftlink_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_swiftlink_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_swiftlink_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/system3.cpp b/src/devices/bus/c64/system3.cpp
index f02ef692b3b..26aa73719d4 100644
--- a/src/devices/bus/c64/system3.cpp
+++ b/src/devices/bus/c64/system3.cpp
@@ -27,7 +27,7 @@ DEFINE_DEVICE_TYPE(C64_SYSTEM3, c64_system3_cartridge_device, "c64_system3", "C6
// c64_system3_cartridge_device - constructor
//-------------------------------------------------
-c64_system3_cartridge_device::c64_system3_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_system3_cartridge_device::c64_system3_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_SYSTEM3, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this),
m_bank(0)
diff --git a/src/devices/bus/c64/system3.h b/src/devices/bus/c64/system3.h
index 024798fc77e..43c2e151c86 100644
--- a/src/devices/bus/c64/system3.h
+++ b/src/devices/bus/c64/system3.h
@@ -27,7 +27,7 @@ class c64_system3_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_system3_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_system3_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/tdos.cpp b/src/devices/bus/c64/tdos.cpp
index 5f8a9a4c456..47734a24368 100644
--- a/src/devices/bus/c64/tdos.cpp
+++ b/src/devices/bus/c64/tdos.cpp
@@ -193,7 +193,7 @@ ioport_constructor c64_tdos_cartridge_device::device_input_ports() const
// c64_tdos_cartridge_device - constructor
//-------------------------------------------------
-c64_tdos_cartridge_device::c64_tdos_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_tdos_cartridge_device::c64_tdos_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_TDOS, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this),
m_ssda(*this, MC68A52P_TAG),
diff --git a/src/devices/bus/c64/tdos.h b/src/devices/bus/c64/tdos.h
index 49c1b07651c..d12420536ba 100644
--- a/src/devices/bus/c64/tdos.h
+++ b/src/devices/bus/c64/tdos.h
@@ -27,7 +27,7 @@ class c64_tdos_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_tdos_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_tdos_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/turbo232.cpp b/src/devices/bus/c64/turbo232.cpp
index f9113bed1c5..789a17e0717 100644
--- a/src/devices/bus/c64/turbo232.cpp
+++ b/src/devices/bus/c64/turbo232.cpp
@@ -39,7 +39,7 @@ DEFINE_DEVICE_TYPE(C64_TURBO232, c64_turbo232_cartridge_device, "c64_turbo232",
void c64_turbo232_cartridge_device::device_add_mconfig(machine_config &config)
{
- MOS6551(config, m_acia, 0);
+ MOS6551(config, m_acia);
m_acia->set_xtal(3.6864_MHz_XTAL);
m_acia->irq_handler().set(FUNC(c64_turbo232_cartridge_device::acia_irq_w));
m_acia->txd_handler().set(RS232_TAG, FUNC(rs232_port_device::write_txd));
@@ -89,7 +89,7 @@ ioport_constructor c64_turbo232_cartridge_device::device_input_ports() const
// c64_turbo232_cartridge_device - constructor
//-------------------------------------------------
-c64_turbo232_cartridge_device::c64_turbo232_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_turbo232_cartridge_device::c64_turbo232_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_TURBO232, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this),
m_acia(*this, MOS6551_TAG),
diff --git a/src/devices/bus/c64/turbo232.h b/src/devices/bus/c64/turbo232.h
index 4f5638f88fa..77bf4daa929 100644
--- a/src/devices/bus/c64/turbo232.h
+++ b/src/devices/bus/c64/turbo232.h
@@ -29,7 +29,7 @@ class c64_turbo232_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_turbo232_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_turbo232_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/vizastar.cpp b/src/devices/bus/c64/vizastar.cpp
index 443c232bde7..ab154609b8f 100644
--- a/src/devices/bus/c64/vizastar.cpp
+++ b/src/devices/bus/c64/vizastar.cpp
@@ -59,7 +59,7 @@ DEFINE_DEVICE_TYPE(C64_VIZASTAR, c64_vizastar_cartridge_device, "c64_vizastar",
// c64_vizastar_cartridge_device - constructor
//-------------------------------------------------
-c64_vizastar_cartridge_device::c64_vizastar_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_vizastar_cartridge_device::c64_vizastar_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_VIZASTAR, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this)
{
diff --git a/src/devices/bus/c64/vizastar.h b/src/devices/bus/c64/vizastar.h
index 26ec63cd46b..b1d98340aee 100644
--- a/src/devices/bus/c64/vizastar.h
+++ b/src/devices/bus/c64/vizastar.h
@@ -27,7 +27,7 @@ class c64_vizastar_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_vizastar_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_vizastar_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/vw64.cpp b/src/devices/bus/c64/vw64.cpp
index 81a56e478b8..521b397e1a9 100644
--- a/src/devices/bus/c64/vw64.cpp
+++ b/src/devices/bus/c64/vw64.cpp
@@ -67,7 +67,7 @@ DEFINE_DEVICE_TYPE(C64_VW64, c64_vizawrite_cartridge_device, "c64_vizawrite", "V
// c64_vizawrite_cartridge_device - constructor
//-------------------------------------------------
-c64_vizawrite_cartridge_device::c64_vizawrite_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_vizawrite_cartridge_device::c64_vizawrite_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_VW64, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this), m_game_timer(nullptr)
{
diff --git a/src/devices/bus/c64/vw64.h b/src/devices/bus/c64/vw64.h
index 00b94969413..4e88e8e5401 100644
--- a/src/devices/bus/c64/vw64.h
+++ b/src/devices/bus/c64/vw64.h
@@ -27,7 +27,7 @@ class c64_vizawrite_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_vizawrite_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_vizawrite_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/warp_speed.cpp b/src/devices/bus/c64/warp_speed.cpp
index ff485c05277..a43f1e78796 100644
--- a/src/devices/bus/c64/warp_speed.cpp
+++ b/src/devices/bus/c64/warp_speed.cpp
@@ -86,7 +86,7 @@ ioport_constructor c64_warp_speed_cartridge_device::device_input_ports() const
// c64_warp_speed_cartridge_device - constructor
//-------------------------------------------------
-c64_warp_speed_cartridge_device::c64_warp_speed_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_warp_speed_cartridge_device::c64_warp_speed_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_WARP_SPEED, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this)
{
diff --git a/src/devices/bus/c64/warp_speed.h b/src/devices/bus/c64/warp_speed.h
index d5c61f50f49..58385a85253 100644
--- a/src/devices/bus/c64/warp_speed.h
+++ b/src/devices/bus/c64/warp_speed.h
@@ -27,7 +27,7 @@ class c64_warp_speed_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_warp_speed_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_warp_speed_cartridge_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/c64/westermann.cpp b/src/devices/bus/c64/westermann.cpp
index 57a752c8fe2..134fc29f4a9 100644
--- a/src/devices/bus/c64/westermann.cpp
+++ b/src/devices/bus/c64/westermann.cpp
@@ -27,7 +27,7 @@ DEFINE_DEVICE_TYPE(C64_WESTERMANN, c64_westermann_cartridge_device, "c64_westerm
// c64_westermann_cartridge_device - constructor
//-------------------------------------------------
-c64_westermann_cartridge_device::c64_westermann_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_westermann_cartridge_device::c64_westermann_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_WESTERMANN, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this)
{
diff --git a/src/devices/bus/c64/westermann.h b/src/devices/bus/c64/westermann.h
index 4b7b2e4389f..4ed2983a529 100644
--- a/src/devices/bus/c64/westermann.h
+++ b/src/devices/bus/c64/westermann.h
@@ -27,7 +27,7 @@ class c64_westermann_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_westermann_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_westermann_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/xl80.cpp b/src/devices/bus/c64/xl80.cpp
index 3f467c7ade3..97053865531 100644
--- a/src/devices/bus/c64/xl80.cpp
+++ b/src/devices/bus/c64/xl80.cpp
@@ -151,7 +151,7 @@ void c64_xl80_device::device_add_mconfig(machine_config &config)
// c64_xl80_device - constructor
//-------------------------------------------------
-c64_xl80_device::c64_xl80_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_xl80_device::c64_xl80_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_XL80, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this),
m_crtc(*this, HD46505SP_TAG),
diff --git a/src/devices/bus/c64/xl80.h b/src/devices/bus/c64/xl80.h
index 6d5ca071262..3131696503f 100644
--- a/src/devices/bus/c64/xl80.h
+++ b/src/devices/bus/c64/xl80.h
@@ -29,7 +29,7 @@ class c64_xl80_device : public device_t,
{
public:
// construction/destruction
- c64_xl80_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_xl80_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/z80videopak.cpp b/src/devices/bus/c64/z80videopak.cpp
index fc6c3544b2c..26d7a7daf98 100644
--- a/src/devices/bus/c64/z80videopak.cpp
+++ b/src/devices/bus/c64/z80videopak.cpp
@@ -124,7 +124,7 @@ void c64_z80videopak_device::device_add_mconfig(machine_config &config)
// c64_z80videopak_device - constructor
//-------------------------------------------------
-c64_z80videopak_device::c64_z80videopak_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock) :
+c64_z80videopak_device::c64_z80videopak_device(const machine_config& mconfig, const char* tag, device_t* owner, const XTAL &clock) :
c64_cpm_cartridge_device(mconfig, C64_Z80VIDEOPAK, tag, owner, clock),
m_crtc(*this, HD46505SP_TAG),
m_palette(*this, "palette"),
diff --git a/src/devices/bus/c64/z80videopak.h b/src/devices/bus/c64/z80videopak.h
index 0e563518ca9..496df621094 100644
--- a/src/devices/bus/c64/z80videopak.h
+++ b/src/devices/bus/c64/z80videopak.h
@@ -28,7 +28,7 @@ class c64_z80videopak_device : public c64_cpm_cartridge_device
{
public:
// construction/destruction
- c64_z80videopak_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_z80videopak_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/c64/zaxxon.cpp b/src/devices/bus/c64/zaxxon.cpp
index d63b05da095..c8f3a2329ff 100644
--- a/src/devices/bus/c64/zaxxon.cpp
+++ b/src/devices/bus/c64/zaxxon.cpp
@@ -27,7 +27,7 @@ DEFINE_DEVICE_TYPE(C64_ZAXXON, c64_zaxxon_cartridge_device, "c64_zaxxon", "C64 Z
// c64_zaxxon_cartridge_device - constructor
//-------------------------------------------------
-c64_zaxxon_cartridge_device::c64_zaxxon_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c64_zaxxon_cartridge_device::c64_zaxxon_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, C64_ZAXXON, tag, owner, clock),
device_c64_expansion_card_interface(mconfig, *this),
m_bank(0)
diff --git a/src/devices/bus/c64/zaxxon.h b/src/devices/bus/c64/zaxxon.h
index 8e47d4caff7..ee33945b798 100644
--- a/src/devices/bus/c64/zaxxon.h
+++ b/src/devices/bus/c64/zaxxon.h
@@ -27,7 +27,7 @@ class c64_zaxxon_cartridge_device : public device_t,
{
public:
// construction/destruction
- c64_zaxxon_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_zaxxon_cartridge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides