summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/cbmiec
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/cbmiec
parent5c14bcdfcb4aefb71b5b62387c4ad05dbeb3814e (diff)
full xtal conversionxtal
Diffstat (limited to 'src/devices/bus/cbmiec')
-rw-r--r--src/devices/bus/cbmiec/c1526.cpp6
-rw-r--r--src/devices/bus/cbmiec/c1526.h6
-rw-r--r--src/devices/bus/cbmiec/c1541.cpp46
-rw-r--r--src/devices/bus/cbmiec/c1541.h40
-rw-r--r--src/devices/bus/cbmiec/c1571.cpp16
-rw-r--r--src/devices/bus/cbmiec/c1571.h10
-rw-r--r--src/devices/bus/cbmiec/c1581.cpp6
-rw-r--r--src/devices/bus/cbmiec/c1581.h6
-rw-r--r--src/devices/bus/cbmiec/c64_nl10.cpp2
-rw-r--r--src/devices/bus/cbmiec/c64_nl10.h2
-rw-r--r--src/devices/bus/cbmiec/cbmiec.cpp4
-rw-r--r--src/devices/bus/cbmiec/cbmiec.h8
-rw-r--r--src/devices/bus/cbmiec/cmdhd.cpp10
-rw-r--r--src/devices/bus/cbmiec/cmdhd.h2
-rw-r--r--src/devices/bus/cbmiec/diag264_lb_iec.cpp2
-rw-r--r--src/devices/bus/cbmiec/diag264_lb_iec.h2
-rw-r--r--src/devices/bus/cbmiec/fd2000.cpp6
-rw-r--r--src/devices/bus/cbmiec/fd2000.h6
-rw-r--r--src/devices/bus/cbmiec/interpod.cpp10
-rw-r--r--src/devices/bus/cbmiec/interpod.h2
-rw-r--r--src/devices/bus/cbmiec/serialbox.cpp2
-rw-r--r--src/devices/bus/cbmiec/serialbox.h2
-rw-r--r--src/devices/bus/cbmiec/vic1515.cpp2
-rw-r--r--src/devices/bus/cbmiec/vic1515.h2
-rw-r--r--src/devices/bus/cbmiec/vic1520.cpp2
-rw-r--r--src/devices/bus/cbmiec/vic1520.h2
26 files changed, 102 insertions, 102 deletions
diff --git a/src/devices/bus/cbmiec/c1526.cpp b/src/devices/bus/cbmiec/c1526.cpp
index 45e4540e236..1c6584a6368 100644
--- a/src/devices/bus/cbmiec/c1526.cpp
+++ b/src/devices/bus/cbmiec/c1526.cpp
@@ -151,7 +151,7 @@ ioport_constructor c4023_device::device_input_ports() const
// c1526_device_base - constructor
//-------------------------------------------------
-c1526_device_base::c1526_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+c1526_device_base::c1526_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, type, tag, owner, clock)
{
}
@@ -161,7 +161,7 @@ c1526_device_base::c1526_device_base(const machine_config &mconfig, device_type
// c1526_device - constructor
//-------------------------------------------------
-c1526_device::c1526_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c1526_device::c1526_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
c1526_device_base(mconfig, C1526, tag, owner, clock),
device_cbm_iec_interface(mconfig, *this)
{
@@ -172,7 +172,7 @@ c1526_device::c1526_device(const machine_config &mconfig, const char *tag, devic
// c4023_device - constructor
//-------------------------------------------------
-c4023_device::c4023_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+c4023_device::c4023_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
c1526_device_base(mconfig, C4023, tag, owner, clock),
device_ieee488_interface(mconfig, *this)
{
diff --git a/src/devices/bus/cbmiec/c1526.h b/src/devices/bus/cbmiec/c1526.h
index d5042f283f1..40acefc91eb 100644
--- a/src/devices/bus/cbmiec/c1526.h
+++ b/src/devices/bus/cbmiec/c1526.h
@@ -27,7 +27,7 @@ class c1526_device_base : public device_t
{
protected:
// construction/destruction
- c1526_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ c1526_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
// device-level overrides
virtual void device_start() override;
@@ -42,7 +42,7 @@ class c1526_device : public c1526_device_base, public device_cbm_iec_interface
{
public:
// construction/destruction
- c1526_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c1526_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// optional information overrides
@@ -63,7 +63,7 @@ class c4023_device : public c1526_device_base, public device_ieee488_interface
{
public:
// construction/destruction
- c4023_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c4023_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// optional information overrides
diff --git a/src/devices/bus/cbmiec/c1541.cpp b/src/devices/bus/cbmiec/c1541.cpp
index a547fc6f208..1120ca40399 100644
--- a/src/devices/bus/cbmiec/c1541.cpp
+++ b/src/devices/bus/cbmiec/c1541.cpp
@@ -990,7 +990,7 @@ void c1541_device_base::device_add_mconfig(machine_config &config)
m_ga->atn_callback().set(FUNC(c1541_device_base::atn_w));
m_ga->byte_callback().set(FUNC(c1541_device_base::byte_w));
- floppy_connector &connector(FLOPPY_CONNECTOR(config, C64H156_TAG":0", 0));
+ floppy_connector &connector(FLOPPY_CONNECTOR(config, C64H156_TAG":0"));
connector.option_add("525ssqd", ALPS_3255190X);
connector.set_default_option("525ssqd");
connector.set_fixed(true);
@@ -1025,7 +1025,7 @@ void c1541_prologic_dos_classic_device::device_add_mconfig(machine_config &confi
m_maincpu->set_addrmap(AS_PROGRAM, &c1541_prologic_dos_classic_device::c1541pdc_mem);
- PIA6821(config, m_pia, 0);
+ PIA6821(config, m_pia);
m_pia->readpb_handler().set(FUNC(c1541_prologic_dos_classic_device::pia_pb_r));
m_pia->writepa_handler().set(FUNC(c1541_prologic_dos_classic_device::pia_pa_w));
m_pia->writepb_handler().set(FUNC(c1541_prologic_dos_classic_device::pia_pb_w));
@@ -1034,7 +1034,7 @@ void c1541_prologic_dos_classic_device::device_add_mconfig(machine_config &confi
centronics_device &centronics(CENTRONICS(config, CENTRONICS_TAG, centronics_devices, "printer"));
centronics.ack_handler().set(MC6821_TAG, FUNC(pia6821_device::ca1_w));
- output_latch_device &cent_data_out(OUTPUT_LATCH(config, "cent_data_out", 0));
+ output_latch_device &cent_data_out(OUTPUT_LATCH(config, "cent_data_out"));
centronics.set_output_latch(cent_data_out);
}
@@ -1089,7 +1089,7 @@ inline void c1541_device_base::set_iec_data()
// c1541_device_base - constructor
//-------------------------------------------------
-c1541_device_base::c1541_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) :
+c1541_device_base::c1541_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, type, tag, owner, clock),
device_cbm_iec_interface(mconfig, *this),
device_c64_floppy_parallel_interface(mconfig, *this),
@@ -1111,7 +1111,7 @@ c1541_device_base::c1541_device_base(const machine_config &mconfig, device_type
// c1540_device - constructor
//-------------------------------------------------
-c1540_device::c1540_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+c1540_device::c1540_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: c1541_device_base(mconfig, C1540, tag, owner, clock) { }
@@ -1119,7 +1119,7 @@ c1540_device::c1540_device(const machine_config &mconfig, const char *tag, devic
// c1541_device - constructor
//-------------------------------------------------
-c1541_device::c1541_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+c1541_device::c1541_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: c1541_device_base(mconfig, C1541, tag, owner, clock) { }
@@ -1127,7 +1127,7 @@ c1541_device::c1541_device(const machine_config &mconfig, const char *tag, devic
// c1541c_device - constructor
//-------------------------------------------------
-c1541c_device::c1541c_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+c1541c_device::c1541c_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: c1541_device_base(mconfig, C1541C, tag, owner, clock) { }
@@ -1135,7 +1135,7 @@ c1541c_device::c1541c_device(const machine_config &mconfig, const char *tag, dev
// c1541ii_device - constructor
//-------------------------------------------------
-c1541ii_device::c1541ii_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+c1541ii_device::c1541ii_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: c1541_device_base(mconfig, C1541II, tag, owner, clock) { }
@@ -1143,7 +1143,7 @@ c1541ii_device::c1541ii_device(const machine_config &mconfig, const char *tag, d
// sx1541_device - constructor
//-------------------------------------------------
-sx1541_device::sx1541_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+sx1541_device::sx1541_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: c1541_device_base(mconfig, SX1541, tag, owner, clock) { }
@@ -1151,7 +1151,7 @@ sx1541_device::sx1541_device(const machine_config &mconfig, const char *tag, dev
// fsd1_device - constructor
//-------------------------------------------------
-fsd1_device::fsd1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+fsd1_device::fsd1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: c1541_device_base(mconfig, FSD1, tag, owner, clock) { }
@@ -1159,7 +1159,7 @@ fsd1_device::fsd1_device(const machine_config &mconfig, const char *tag, device_
// fsd2_device - constructor
//-------------------------------------------------
-fsd2_device::fsd2_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+fsd2_device::fsd2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: c1541_device_base(mconfig, FSD2, tag, owner, clock) { }
@@ -1167,7 +1167,7 @@ fsd2_device::fsd2_device(const machine_config &mconfig, const char *tag, device_
// csd1_device - constructor
//-------------------------------------------------
-csd1_device::csd1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+csd1_device::csd1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: c1541_device_base(mconfig, CSD1, tag, owner, clock) { }
@@ -1175,7 +1175,7 @@ csd1_device::csd1_device(const machine_config &mconfig, const char *tag, device_
// c1541_dolphin_dos_device - constructor
//-------------------------------------------------
-c1541_dolphin_dos_device::c1541_dolphin_dos_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+c1541_dolphin_dos_device::c1541_dolphin_dos_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: c1541_device_base(mconfig, C1541_DOLPHIN_DOS, tag, owner, clock) { }
@@ -1183,7 +1183,7 @@ c1541_dolphin_dos_device::c1541_dolphin_dos_device(const machine_config &mconfig
// c1541_professional_dos_v1_device - constructor
//-------------------------------------------------
-c1541_professional_dos_v1_device::c1541_professional_dos_v1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+c1541_professional_dos_v1_device::c1541_professional_dos_v1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: c1541_device_base(mconfig, C1541_PROFESSIONAL_DOS_V1, tag, owner, clock) { }
@@ -1191,7 +1191,7 @@ c1541_professional_dos_v1_device::c1541_professional_dos_v1_device(const machine
// c1541_prologic_dos_classic_device - constructor
//-------------------------------------------------
-c1541_prologic_dos_classic_device::c1541_prologic_dos_classic_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+c1541_prologic_dos_classic_device::c1541_prologic_dos_classic_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: c1541_device_base(mconfig, C1541_PROLOGIC_DOS_CLASSIC, tag, owner, clock),
m_pia(*this, MC6821_TAG),
m_cent_data_out(*this, "cent_data_out"),
@@ -1204,7 +1204,7 @@ c1541_prologic_dos_classic_device::c1541_prologic_dos_classic_device(const machi
// indus_gt_device - constructor
//-------------------------------------------------
-indus_gt_device::indus_gt_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+indus_gt_device::indus_gt_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: c1541_device_base(mconfig, INDUS_GT, tag, owner, clock) { }
@@ -1212,7 +1212,7 @@ indus_gt_device::indus_gt_device(const machine_config &mconfig, const char *tag,
// technica_device - constructor
//-------------------------------------------------
-technica_device::technica_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+technica_device::technica_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: c1541_device_base(mconfig, TECHNICA, tag, owner, clock) { }
@@ -1220,7 +1220,7 @@ technica_device::technica_device(const machine_config &mconfig, const char *tag,
// blue_chip_device - constructor
//-------------------------------------------------
-blue_chip_device::blue_chip_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+blue_chip_device::blue_chip_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: c1541_device_base(mconfig, BLUE_CHIP, tag, owner, clock) { }
@@ -1228,7 +1228,7 @@ blue_chip_device::blue_chip_device(const machine_config &mconfig, const char *ta
// commander_c2_device - constructor
//-------------------------------------------------
-commander_c2_device::commander_c2_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+commander_c2_device::commander_c2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: c1541_device_base(mconfig, COMMANDER_C2, tag, owner, clock) { }
@@ -1236,7 +1236,7 @@ commander_c2_device::commander_c2_device(const machine_config &mconfig, const ch
// enhancer_2000_device - constructor
//-------------------------------------------------
-enhancer_2000_device::enhancer_2000_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+enhancer_2000_device::enhancer_2000_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: c1541_device_base(mconfig, ENHANCER_2000, tag, owner, clock) { }
@@ -1244,7 +1244,7 @@ enhancer_2000_device::enhancer_2000_device(const machine_config &mconfig, const
// fd148_device - constructor
//-------------------------------------------------
-fd148_device::fd148_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+fd148_device::fd148_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: c1541_device_base(mconfig, FD148, tag, owner, clock) { }
@@ -1252,7 +1252,7 @@ fd148_device::fd148_device(const machine_config &mconfig, const char *tag, devic
// msd_sd1_device - constructor
//-------------------------------------------------
-msd_sd1_device::msd_sd1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+msd_sd1_device::msd_sd1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: c1541_device_base(mconfig, MSD_SD1, tag, owner, clock) { }
@@ -1260,7 +1260,7 @@ msd_sd1_device::msd_sd1_device(const machine_config &mconfig, const char *tag, d
// msd_sd2_device - constructor
//-------------------------------------------------
-msd_sd2_device::msd_sd2_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+msd_sd2_device::msd_sd2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: c1541_device_base(mconfig, MSD_SD2, tag, owner, clock) { }
diff --git a/src/devices/bus/cbmiec/c1541.h b/src/devices/bus/cbmiec/c1541.h
index de79cc95f90..44fe91a16dd 100644
--- a/src/devices/bus/cbmiec/c1541.h
+++ b/src/devices/bus/cbmiec/c1541.h
@@ -33,7 +33,7 @@ class c1541_device_base : public device_t,
{
protected:
// construction/destruction
- c1541_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock);
+ c1541_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
// device-level overrides
virtual void device_start() override;
@@ -103,7 +103,7 @@ class c1540_device : public c1541_device_base
{
public:
// construction/destruction
- c1540_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ c1540_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// optional information overrides
@@ -117,7 +117,7 @@ class c1541_device : public c1541_device_base
{
public:
// construction/destruction
- c1541_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ c1541_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// optional information overrides
@@ -131,7 +131,7 @@ class c1541c_device : public c1541_device_base
{
public:
// construction/destruction
- c1541c_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ c1541c_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// optional information overrides
@@ -149,7 +149,7 @@ class c1541ii_device : public c1541_device_base
{
public:
// construction/destruction
- c1541ii_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ c1541ii_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// optional information overrides
@@ -163,7 +163,7 @@ class sx1541_device : public c1541_device_base
{
public:
// construction/destruction
- sx1541_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ sx1541_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// optional information overrides
@@ -177,7 +177,7 @@ class fsd1_device : public c1541_device_base
{
public:
// construction/destruction
- fsd1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ fsd1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// optional information overrides
@@ -191,7 +191,7 @@ class fsd2_device : public c1541_device_base
{
public:
// construction/destruction
- fsd2_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ fsd2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// optional information overrides
@@ -208,7 +208,7 @@ class csd1_device : public c1541_device_base
{
public:
// construction/destruction
- csd1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ csd1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// optional information overrides
@@ -222,7 +222,7 @@ class c1541_dolphin_dos_device : public c1541_device_base
{
public:
// construction/destruction
- c1541_dolphin_dos_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ c1541_dolphin_dos_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// optional information overrides
@@ -237,7 +237,7 @@ class c1541_professional_dos_v1_device : public c1541_device_base
{
public:
// construction/destruction
- c1541_professional_dos_v1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ c1541_professional_dos_v1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// optional information overrides
@@ -252,7 +252,7 @@ class c1541_prologic_dos_classic_device : public c1541_device_base
{
public:
// construction/destruction
- c1541_prologic_dos_classic_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ c1541_prologic_dos_classic_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// optional information overrides
@@ -282,7 +282,7 @@ class indus_gt_device : public c1541_device_base
{
public:
// construction/destruction
- indus_gt_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ indus_gt_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// optional information overrides
@@ -296,7 +296,7 @@ class technica_device : public c1541_device_base
{
public:
// construction/destruction
- technica_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ technica_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// optional information overrides
@@ -310,7 +310,7 @@ class blue_chip_device : public c1541_device_base
{
public:
// construction/destruction
- blue_chip_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ blue_chip_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// optional information overrides
@@ -324,7 +324,7 @@ class commander_c2_device : public c1541_device_base
{
public:
// construction/destruction
- commander_c2_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ commander_c2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// optional information overrides
@@ -338,7 +338,7 @@ class enhancer_2000_device : public c1541_device_base
{
public:
// construction/destruction
- enhancer_2000_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ enhancer_2000_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// optional information overrides
@@ -352,7 +352,7 @@ class fd148_device : public c1541_device_base
{
public:
// construction/destruction
- fd148_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ fd148_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// optional information overrides
@@ -366,7 +366,7 @@ class msd_sd1_device : public c1541_device_base
{
public:
// construction/destruction
- msd_sd1_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ msd_sd1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// optional information overrides
@@ -380,7 +380,7 @@ class msd_sd2_device : public c1541_device_base
{
public:
// construction/destruction
- msd_sd2_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ msd_sd2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// optional information overrides
diff --git a/src/devices/bus/cbmiec/c1571.cpp b/src/devices/bus/cbmiec/c1571.cpp
index f2d41120f5e..f12e0635c92 100644
--- a/src/devices/bus/cbmiec/c1571.cpp
+++ b/src/devices/bus/cbmiec/c1571.cpp
@@ -622,7 +622,7 @@ void c1571_device::add_base_mconfig(machine_config &config)
C64H156(config, m_ga, 16_MHz_XTAL);
m_ga->byte_callback().set(FUNC(c1571_device::byte_w));
- floppy_connector &connector(FLOPPY_CONNECTOR(config, C64H156_TAG":0", 0));
+ floppy_connector &connector(FLOPPY_CONNECTOR(config, C64H156_TAG":0"));
connector.option_add("525qd", FLOPPY_525_QD);
connector.set_default_option("525qd");
connector.set_fixed(true);
@@ -673,10 +673,10 @@ void mini_chief_device::device_add_mconfig(machine_config &config)
m_maincpu->set_addrmap(AS_PROGRAM, &mini_chief_device::mini_chief_mem);
- isa8_device &isa8(ISA8(config, ISA_BUS_TAG, 0));
+ isa8_device &isa8(ISA8(config, ISA_BUS_TAG));
isa8.set_memspace(m_maincpu, AS_PROGRAM);
isa8.set_iospace(m_maincpu, AS_PROGRAM);
- ISA8_SLOT(config, "isa1", 0, ISA_BUS_TAG, mini_chief_isa8_cards, "wd1002a_wx1", false);
+ ISA8_SLOT(config, "isa1", ISA_BUS_TAG, mini_chief_isa8_cards, "wd1002a_wx1", false);
}
@@ -713,7 +713,7 @@ ioport_constructor c1571_device::device_input_ports() const
// c1571_device - constructor
//-------------------------------------------------
-c1571_device::c1571_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+c1571_device::c1571_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_cbm_iec_interface(mconfig, *this),
device_c64_floppy_parallel_interface(mconfig, *this),
@@ -737,7 +737,7 @@ c1571_device::c1571_device(const machine_config &mconfig, device_type type, cons
{
}
-c1571_device::c1571_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+c1571_device::c1571_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: c1571_device(mconfig, C1571, tag, owner, clock)
{
}
@@ -747,7 +747,7 @@ c1571_device::c1571_device(const machine_config &mconfig, const char *tag, devic
// c1570_device - constructor
//-------------------------------------------------
-c1570_device::c1570_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+c1570_device::c1570_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: c1571_device(mconfig, C1570, tag, owner, clock)
{
}
@@ -757,7 +757,7 @@ c1570_device::c1570_device(const machine_config &mconfig, const char *tag, devic
// c1571cr_device - constructor
//-------------------------------------------------
-c1571cr_device::c1571cr_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+c1571cr_device::c1571cr_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: c1571_device(mconfig, C1571CR, tag, owner, clock)
{
}
@@ -767,7 +767,7 @@ c1571cr_device::c1571cr_device(const machine_config &mconfig, const char *tag, d
// mini_chief_device - constructor
//-------------------------------------------------
-mini_chief_device::mini_chief_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+mini_chief_device::mini_chief_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: c1571_device(mconfig, MINI_CHIEF, tag, owner, clock)
{
}
diff --git a/src/devices/bus/cbmiec/c1571.h b/src/devices/bus/cbmiec/c1571.h
index 103da690a2c..c25433a4148 100644
--- a/src/devices/bus/cbmiec/c1571.h
+++ b/src/devices/bus/cbmiec/c1571.h
@@ -41,7 +41,7 @@ class c1571_device : public device_t, public device_cbm_iec_interface, public de
{
public:
// construction/destruction
- c1571_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c1571_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
DECLARE_WRITE_LINE_MEMBER( via0_irq_w );
uint8_t via0_pa_r();
@@ -70,7 +70,7 @@ public:
void c1571_mem(address_map &map);
protected:
- c1571_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ c1571_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;
@@ -134,7 +134,7 @@ class c1570_device : public c1571_device
{
public:
// construction/destruction
- c1570_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c1570_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// optional information overrides
@@ -149,7 +149,7 @@ class c1571cr_device : public c1571_device
{
public:
// construction/destruction
- c1571cr_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c1571cr_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// optional information overrides
@@ -168,7 +168,7 @@ class mini_chief_device : public c1571_device
{
public:
// construction/destruction
- mini_chief_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ mini_chief_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// optional information overrides
diff --git a/src/devices/bus/cbmiec/c1581.cpp b/src/devices/bus/cbmiec/c1581.cpp
index b139a272266..8a4a167a44b 100644
--- a/src/devices/bus/cbmiec/c1581.cpp
+++ b/src/devices/bus/cbmiec/c1581.cpp
@@ -320,7 +320,7 @@ ioport_constructor c1581_device::device_input_ports() const
// c1581_device - constructor
//-------------------------------------------------
-c1581_device::c1581_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+c1581_device::c1581_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_cbm_iec_interface(mconfig, *this),
m_maincpu(*this, M6502_TAG),
@@ -337,7 +337,7 @@ c1581_device::c1581_device(const machine_config &mconfig, device_type type, cons
{
}
-c1581_device::c1581_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+c1581_device::c1581_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: c1581_device(mconfig, C1581, tag, owner, clock)
{
}
@@ -347,7 +347,7 @@ c1581_device::c1581_device(const machine_config &mconfig, const char *tag, devic
// c1563_device - constructor
//-------------------------------------------------
-c1563_device::c1563_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+c1563_device::c1563_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: c1581_device(mconfig, C1563, tag, owner, clock) { }
diff --git a/src/devices/bus/cbmiec/c1581.h b/src/devices/bus/cbmiec/c1581.h
index 1fef8579460..3fbe5615b3d 100644
--- a/src/devices/bus/cbmiec/c1581.h
+++ b/src/devices/bus/cbmiec/c1581.h
@@ -38,10 +38,10 @@ class c1581_device : public device_t, public device_cbm_iec_interface
{
public:
// construction/destruction
- c1581_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c1581_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- c1581_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ c1581_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;
@@ -99,7 +99,7 @@ class c1563_device : public c1581_device
{
public:
// construction/destruction
- c1563_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c1563_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/cbmiec/c64_nl10.cpp b/src/devices/bus/cbmiec/c64_nl10.cpp
index d4ed3467016..a287fec53ac 100644
--- a/src/devices/bus/cbmiec/c64_nl10.cpp
+++ b/src/devices/bus/cbmiec/c64_nl10.cpp
@@ -47,7 +47,7 @@ const tiny_rom_entry *c64_nl10_interface_device::device_rom_region() const
// c64_nl10_interface_device - constructor
//-------------------------------------------------
-c64_nl10_interface_device::c64_nl10_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+c64_nl10_interface_device::c64_nl10_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, C64_NL10_INTERFACE, tag, owner, clock)
, device_cbm_iec_interface(mconfig, *this)
{
diff --git a/src/devices/bus/cbmiec/c64_nl10.h b/src/devices/bus/cbmiec/c64_nl10.h
index 68f9f135c91..9c38233050d 100644
--- a/src/devices/bus/cbmiec/c64_nl10.h
+++ b/src/devices/bus/cbmiec/c64_nl10.h
@@ -25,7 +25,7 @@ class c64_nl10_interface_device : public device_t, public device_cbm_iec_interfa
{
public:
// construction/destruction
- c64_nl10_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c64_nl10_interface_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
// optional information overrides
virtual const tiny_rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/cbmiec/cbmiec.cpp b/src/devices/bus/cbmiec/cbmiec.cpp
index 03b9837779f..6415a4e203c 100644
--- a/src/devices/bus/cbmiec/cbmiec.cpp
+++ b/src/devices/bus/cbmiec/cbmiec.cpp
@@ -246,7 +246,7 @@ device_cbm_iec_interface::~device_cbm_iec_interface()
// cbm_iec_slot_device - constructor
//-------------------------------------------------
-cbm_iec_slot_device::cbm_iec_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+cbm_iec_slot_device::cbm_iec_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, CBM_IEC_SLOT, tag, owner, clock),
device_slot_interface(mconfig, *this), m_address(0)
{
@@ -281,7 +281,7 @@ void cbm_iec_slot_device::device_start()
// cbm_iec_device - constructor
//-------------------------------------------------
-cbm_iec_device::cbm_iec_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+cbm_iec_device::cbm_iec_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, CBM_IEC, tag, owner, clock),
m_write_srq(*this),
m_write_atn(*this),
diff --git a/src/devices/bus/cbmiec/cbmiec.h b/src/devices/bus/cbmiec/cbmiec.h
index 0683a98b4f8..fe00416c9c3 100644
--- a/src/devices/bus/cbmiec/cbmiec.h
+++ b/src/devices/bus/cbmiec/cbmiec.h
@@ -39,7 +39,7 @@ class cbm_iec_device : public device_t
{
public:
// construction/destruction
- cbm_iec_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ cbm_iec_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL());
auto srq_callback() { return m_write_srq.bind(); }
auto atn_callback() { return m_write_atn.bind(); }
@@ -124,7 +124,7 @@ public:
// construction/destruction
template <typename T>
cbm_iec_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, int address, T &&opts, char const *dflt)
- : cbm_iec_slot_device(mconfig, tag, owner, (uint32_t)0)
+ : cbm_iec_slot_device(mconfig, tag, owner)
{
option_reset();
opts(*this);
@@ -132,7 +132,7 @@ public:
set_fixed(false);
set_address(address);
}
- cbm_iec_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ cbm_iec_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL());
template <typename T> static void add(machine_config &config, T &&_bus_tag, const char *_default_drive)
{
@@ -142,7 +142,7 @@ public:
CBM_IEC_SLOT(config, "iec10", 10, cbm_iec_devices, nullptr);
CBM_IEC_SLOT(config, "iec11", 11, cbm_iec_devices, nullptr);
- CBM_IEC(config, std::forward<T>(_bus_tag), 0);
+ CBM_IEC(config, std::forward<T>(_bus_tag));
}
void set_address(int address) { m_address = address; }
diff --git a/src/devices/bus/cbmiec/cmdhd.cpp b/src/devices/bus/cbmiec/cmdhd.cpp
index 104b0eb456e..e7badebec3b 100644
--- a/src/devices/bus/cbmiec/cmdhd.cpp
+++ b/src/devices/bus/cbmiec/cmdhd.cpp
@@ -75,12 +75,12 @@ void cmd_hd_device::mem_map(address_map &map)
void cmd_hd_device::device_add_mconfig(machine_config &config)
{
- M6502(config, m_maincpu, 2000000);
+ M6502(config, m_maincpu, XTAL::u(2000000));
m_maincpu->set_addrmap(AS_PROGRAM, &cmd_hd_device::mem_map);
- MOS6522(config, M6522_1_TAG, 2000000);
- MOS6522(config, M6522_2_TAG, 2000000);
- I8255A(config, I8255A_TAG, 0);
+ MOS6522(config, M6522_1_TAG, XTAL::u(2000000));
+ MOS6522(config, M6522_2_TAG, XTAL::u(2000000));
+ I8255A(config, I8255A_TAG);
RTC72421(config, RTC72421A_TAG, XTAL(32'768));
SCSI_PORT(config, m_scsibus);
@@ -97,7 +97,7 @@ void cmd_hd_device::device_add_mconfig(machine_config &config)
// cmd_hd_device - constructor
//-------------------------------------------------
-cmd_hd_device::cmd_hd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+cmd_hd_device::cmd_hd_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, CMD_HD, tag, owner, clock),
device_cbm_iec_interface(mconfig, *this),
m_maincpu(*this, M6502_TAG),
diff --git a/src/devices/bus/cbmiec/cmdhd.h b/src/devices/bus/cbmiec/cmdhd.h
index 8c6836f36bf..431d8582109 100644
--- a/src/devices/bus/cbmiec/cmdhd.h
+++ b/src/devices/bus/cbmiec/cmdhd.h
@@ -30,7 +30,7 @@ class cmd_hd_device : public device_t, public device_cbm_iec_interface
{
public:
// construction/destruction
- cmd_hd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ cmd_hd_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/cbmiec/diag264_lb_iec.cpp b/src/devices/bus/cbmiec/diag264_lb_iec.cpp
index 8852f997285..188488c6d7d 100644
--- a/src/devices/bus/cbmiec/diag264_lb_iec.cpp
+++ b/src/devices/bus/cbmiec/diag264_lb_iec.cpp
@@ -27,7 +27,7 @@ DEFINE_DEVICE_TYPE(DIAG264_SERIAL_LOOPBACK, diag264_serial_loopback_device, "dia
// diag264_serial_loopback_device - constructor
//-------------------------------------------------
-diag264_serial_loopback_device::diag264_serial_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+diag264_serial_loopback_device::diag264_serial_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, DIAG264_SERIAL_LOOPBACK, tag, owner, clock)
, device_cbm_iec_interface(mconfig, *this)
{
diff --git a/src/devices/bus/cbmiec/diag264_lb_iec.h b/src/devices/bus/cbmiec/diag264_lb_iec.h
index 6611fee413d..3d7faf9a2a8 100644
--- a/src/devices/bus/cbmiec/diag264_lb_iec.h
+++ b/src/devices/bus/cbmiec/diag264_lb_iec.h
@@ -26,7 +26,7 @@ class diag264_serial_loopback_device : public device_t,
{
public:
// construction/destruction
- diag264_serial_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ diag264_serial_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/cbmiec/fd2000.cpp b/src/devices/bus/cbmiec/fd2000.cpp
index 34e06d70dbf..912bf9c78ec 100644
--- a/src/devices/bus/cbmiec/fd2000.cpp
+++ b/src/devices/bus/cbmiec/fd2000.cpp
@@ -251,12 +251,12 @@ void fd4000_device::device_add_mconfig(machine_config &config)
// fd2000_device - constructor
//-------------------------------------------------
-fd2000_device::fd2000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+fd2000_device::fd2000_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: fd2000_device(mconfig, FD2000, tag, owner, clock)
{
}
-fd2000_device::fd2000_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+fd2000_device::fd2000_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_cbm_iec_interface(mconfig, *this)
, m_maincpu(*this, G65SC02PI2_TAG)
@@ -270,7 +270,7 @@ fd2000_device::fd2000_device(const machine_config &mconfig, device_type type, co
// fd4000_device - constructor
//-------------------------------------------------
-fd4000_device::fd4000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+fd4000_device::fd4000_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: fd2000_device(mconfig, FD4000, tag, owner, clock)
{
m_maincpu.set_tag(*this, R65C02P4_TAG);
diff --git a/src/devices/bus/cbmiec/fd2000.h b/src/devices/bus/cbmiec/fd2000.h
index 0b247405e7e..b7ddd71bab4 100644
--- a/src/devices/bus/cbmiec/fd2000.h
+++ b/src/devices/bus/cbmiec/fd2000.h
@@ -31,7 +31,7 @@ class fd2000_device : public device_t,
{
public:
// construction/destruction
- fd2000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ fd2000_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
uint8_t via_pa_r();
void via_pa_w(uint8_t data);
@@ -41,7 +41,7 @@ public:
//static void floppy_formats(format_registration &fr);
protected:
- fd2000_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ fd2000_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;
@@ -74,7 +74,7 @@ class fd4000_device : public fd2000_device
{
public:
// construction/destruction
- fd4000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ fd4000_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
virtual const tiny_rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/cbmiec/interpod.cpp b/src/devices/bus/cbmiec/interpod.cpp
index c5479a30b18..9e5fec201a4 100644
--- a/src/devices/bus/cbmiec/interpod.cpp
+++ b/src/devices/bus/cbmiec/interpod.cpp
@@ -125,14 +125,14 @@ void cbm_interpod_device::interpod_mem(address_map &map)
void cbm_interpod_device::device_add_mconfig(machine_config &config)
{
- M6502(config, m_maincpu, 1000000);
+ M6502(config, m_maincpu, XTAL::u(1000000));
m_maincpu->set_addrmap(AS_PROGRAM, &cbm_interpod_device::interpod_mem);
- MOS6522(config, m_via, 1000000);
+ MOS6522(config, m_via, XTAL::u(1000000));
- MOS6532_NEW(config, m_riot, 1000000);
+ MOS6532_NEW(config, m_riot, XTAL::u(1000000));
- ACIA6850(config, m_acia, 0);
+ ACIA6850(config, m_acia);
ieee488_device::add_cbm_devices(config, nullptr);
@@ -149,7 +149,7 @@ void cbm_interpod_device::device_add_mconfig(machine_config &config)
// cbm_interpod_device - constructor
//-------------------------------------------------
-cbm_interpod_device::cbm_interpod_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+cbm_interpod_device::cbm_interpod_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, CBM_INTERPOD, tag, owner, clock),
device_cbm_iec_interface(mconfig, *this),
m_maincpu(*this, R6502_TAG),
diff --git a/src/devices/bus/cbmiec/interpod.h b/src/devices/bus/cbmiec/interpod.h
index 823ab0c64e7..1b3debfce6f 100644
--- a/src/devices/bus/cbmiec/interpod.h
+++ b/src/devices/bus/cbmiec/interpod.h
@@ -32,7 +32,7 @@ class cbm_interpod_device : public device_t,
{
public:
// construction/destruction
- cbm_interpod_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ cbm_interpod_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/cbmiec/serialbox.cpp b/src/devices/bus/cbmiec/serialbox.cpp
index 9d9dcc114cf..a3e5e5ba2f1 100644
--- a/src/devices/bus/cbmiec/serialbox.cpp
+++ b/src/devices/bus/cbmiec/serialbox.cpp
@@ -85,7 +85,7 @@ void cbm_serial_box_device::device_add_mconfig(machine_config &config)
// cbm_serial_box_device - constructor
//-------------------------------------------------
-cbm_serial_box_device::cbm_serial_box_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+cbm_serial_box_device::cbm_serial_box_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, CBM_SERIAL_BOX, tag, owner, clock),
device_cbm_iec_interface(mconfig, *this),
m_maincpu(*this, M6502_TAG)
diff --git a/src/devices/bus/cbmiec/serialbox.h b/src/devices/bus/cbmiec/serialbox.h
index 16cb099e247..53a3613dd7f 100644
--- a/src/devices/bus/cbmiec/serialbox.h
+++ b/src/devices/bus/cbmiec/serialbox.h
@@ -26,7 +26,7 @@ class cbm_serial_box_device : public device_t, public device_cbm_iec_interface
{
public:
// construction/destruction
- cbm_serial_box_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ cbm_serial_box_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/cbmiec/vic1515.cpp b/src/devices/bus/cbmiec/vic1515.cpp
index 5accd8b6858..959a7ee5dcf 100644
--- a/src/devices/bus/cbmiec/vic1515.cpp
+++ b/src/devices/bus/cbmiec/vic1515.cpp
@@ -101,7 +101,7 @@ ioport_constructor vic1515_device::device_input_ports() const
// vic1515_device - constructor
//-------------------------------------------------
-vic1515_device::vic1515_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+vic1515_device::vic1515_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, VIC1515, tag, owner, clock),
device_cbm_iec_interface(mconfig, *this)
{
diff --git a/src/devices/bus/cbmiec/vic1515.h b/src/devices/bus/cbmiec/vic1515.h
index 1b84636e6d3..0b8c9b5eeb1 100644
--- a/src/devices/bus/cbmiec/vic1515.h
+++ b/src/devices/bus/cbmiec/vic1515.h
@@ -26,7 +26,7 @@ class vic1515_device : public device_t, public device_cbm_iec_interface
{
public:
// construction/destruction
- vic1515_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ vic1515_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/cbmiec/vic1520.cpp b/src/devices/bus/cbmiec/vic1520.cpp
index c77175fb83b..7d5f028956a 100644
--- a/src/devices/bus/cbmiec/vic1520.cpp
+++ b/src/devices/bus/cbmiec/vic1520.cpp
@@ -112,7 +112,7 @@ ioport_constructor vic1520_device::device_input_ports() const
// vic1520_device - constructor
//-------------------------------------------------
-vic1520_device::vic1520_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+vic1520_device::vic1520_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, VIC1520, tag, owner, clock)
, device_cbm_iec_interface(mconfig, *this)
, m_mcu(*this, "mcu")
diff --git a/src/devices/bus/cbmiec/vic1520.h b/src/devices/bus/cbmiec/vic1520.h
index 37659c19942..4348613cf92 100644
--- a/src/devices/bus/cbmiec/vic1520.h
+++ b/src/devices/bus/cbmiec/vic1520.h
@@ -26,7 +26,7 @@ class vic1520_device : public device_t, public device_cbm_iec_interface
{
public:
// construction/destruction
- vic1520_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ vic1520_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides