summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/pet
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/pet')
-rw-r--r--src/devices/bus/pet/2joysnd.cpp4
-rw-r--r--src/devices/bus/pet/2joysnd.h2
-rw-r--r--src/devices/bus/pet/64k.cpp2
-rw-r--r--src/devices/bus/pet/64k.h2
-rw-r--r--src/devices/bus/pet/c2n.cpp8
-rw-r--r--src/devices/bus/pet/c2n.h8
-rw-r--r--src/devices/bus/pet/cass.cpp2
-rw-r--r--src/devices/bus/pet/cass.h4
-rw-r--r--src/devices/bus/pet/cb2snd.cpp4
-rw-r--r--src/devices/bus/pet/cb2snd.h2
-rw-r--r--src/devices/bus/pet/diag.cpp2
-rw-r--r--src/devices/bus/pet/diag.h2
-rw-r--r--src/devices/bus/pet/diag264_lb_tape.cpp2
-rw-r--r--src/devices/bus/pet/diag264_lb_tape.h2
-rw-r--r--src/devices/bus/pet/exp.cpp2
-rw-r--r--src/devices/bus/pet/exp.h4
-rw-r--r--src/devices/bus/pet/hsg.cpp10
-rw-r--r--src/devices/bus/pet/hsg.h6
-rw-r--r--src/devices/bus/pet/petuja.cpp2
-rw-r--r--src/devices/bus/pet/petuja.h2
-rw-r--r--src/devices/bus/pet/superpet.cpp4
-rw-r--r--src/devices/bus/pet/superpet.h2
-rw-r--r--src/devices/bus/pet/user.cpp2
-rw-r--r--src/devices/bus/pet/user.h4
24 files changed, 42 insertions, 42 deletions
diff --git a/src/devices/bus/pet/2joysnd.cpp b/src/devices/bus/pet/2joysnd.cpp
index 6d65b70542a..0e20f4a7e5c 100644
--- a/src/devices/bus/pet/2joysnd.cpp
+++ b/src/devices/bus/pet/2joysnd.cpp
@@ -95,7 +95,7 @@ ioport_constructor pet_userport_joystick_and_sound_device::device_input_ports()
void pet_userport_joystick_and_sound_device::device_add_mconfig(machine_config &config)
{
SPEAKER(config, "speaker").front_center();
- DAC_1BIT(config, m_dac, 0).add_route(ALL_OUTPUTS, "speaker", 0.99);
+ DAC_1BIT(config, m_dac).add_route(ALL_OUTPUTS, "speaker", 0.99);
}
//**************************************************************************
@@ -106,7 +106,7 @@ void pet_userport_joystick_and_sound_device::device_add_mconfig(machine_config &
// pet_user_port_dual_joystick_and_sound_device - constructor
//-------------------------------------------------
-pet_userport_joystick_and_sound_device::pet_userport_joystick_and_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+pet_userport_joystick_and_sound_device::pet_userport_joystick_and_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, PET_USERPORT_JOYSTICK_AND_SOUND_DEVICE, tag, owner, clock),
device_pet_user_port_interface(mconfig, *this),
m_dac(*this, "dac"),
diff --git a/src/devices/bus/pet/2joysnd.h b/src/devices/bus/pet/2joysnd.h
index 644d64fc564..6822c3a4bef 100644
--- a/src/devices/bus/pet/2joysnd.h
+++ b/src/devices/bus/pet/2joysnd.h
@@ -26,7 +26,7 @@ class pet_userport_joystick_and_sound_device : public device_t, public device_pe
{
public:
// construction/destruction
- pet_userport_joystick_and_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ pet_userport_joystick_and_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
virtual DECLARE_WRITE_LINE_MEMBER( input_m ) override;
diff --git a/src/devices/bus/pet/64k.cpp b/src/devices/bus/pet/64k.cpp
index 7e335ba97ff..b03a0802217 100644
--- a/src/devices/bus/pet/64k.cpp
+++ b/src/devices/bus/pet/64k.cpp
@@ -76,7 +76,7 @@ inline void pet_64k_expansion_device::write_ram(offs_t offset, uint8_t data)
// pet_64k_expansion_device - constructor
//-------------------------------------------------
-pet_64k_expansion_device::pet_64k_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+pet_64k_expansion_device::pet_64k_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, PET_64K, tag, owner, clock),
device_pet_expansion_card_interface(mconfig, *this),
m_ram(*this, "ram", 0x10000, ENDIANNESS_LITTLE),
diff --git a/src/devices/bus/pet/64k.h b/src/devices/bus/pet/64k.h
index 6b55cc3098e..02e30d1ab2c 100644
--- a/src/devices/bus/pet/64k.h
+++ b/src/devices/bus/pet/64k.h
@@ -25,7 +25,7 @@ class pet_64k_expansion_device : public device_t, public device_pet_expansion_ca
{
public:
// construction/destruction
- pet_64k_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ pet_64k_expansion_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/pet/c2n.cpp b/src/devices/bus/pet/c2n.cpp
index 94f0dc4dca3..665102fedbc 100644
--- a/src/devices/bus/pet/c2n.cpp
+++ b/src/devices/bus/pet/c2n.cpp
@@ -42,7 +42,7 @@ void c2n_device::device_add_mconfig(machine_config &config)
// c2n_device - constructor
//-------------------------------------------------
-c2n_device::c2n_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+c2n_device::c2n_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_pet_datassette_port_interface(mconfig, *this)
, m_cassette(*this, "cassette")
@@ -51,7 +51,7 @@ c2n_device::c2n_device(const machine_config &mconfig, device_type type, const ch
{
}
-c2n_device::c2n_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+c2n_device::c2n_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: c2n_device(mconfig, C2N, tag, owner, clock)
{
}
@@ -61,7 +61,7 @@ c2n_device::c2n_device(const machine_config &mconfig, const char *tag, device_t
// c1530_device - constructor
//-------------------------------------------------
-c1530_device::c1530_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+c1530_device::c1530_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: c2n_device(mconfig, C1530, tag, owner, clock)
{
}
@@ -71,7 +71,7 @@ c1530_device::c1530_device(const machine_config &mconfig, const char *tag, devic
// c1531_device - constructor
//-------------------------------------------------
-c1531_device::c1531_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+c1531_device::c1531_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: c2n_device(mconfig, C1531, tag, owner, clock)
{
}
diff --git a/src/devices/bus/pet/c2n.h b/src/devices/bus/pet/c2n.h
index 86d8e5df288..67824fc2977 100644
--- a/src/devices/bus/pet/c2n.h
+++ b/src/devices/bus/pet/c2n.h
@@ -28,10 +28,10 @@ class c2n_device : public device_t,
{
public:
// construction/destruction
- c2n_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c2n_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- c2n_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ c2n_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;
@@ -63,7 +63,7 @@ class c1530_device : public c2n_device
{
public:
// construction/destruction
- c1530_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c1530_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
};
@@ -73,7 +73,7 @@ class c1531_device : public c2n_device
{
public:
// construction/destruction
- c1531_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ c1531_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
};
diff --git a/src/devices/bus/pet/cass.cpp b/src/devices/bus/pet/cass.cpp
index 301633e6d73..bea32856dfe 100644
--- a/src/devices/bus/pet/cass.cpp
+++ b/src/devices/bus/pet/cass.cpp
@@ -52,7 +52,7 @@ device_pet_datassette_port_interface::~device_pet_datassette_port_interface()
// pet_datassette_port_device - constructor
//-------------------------------------------------
-pet_datassette_port_device::pet_datassette_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+pet_datassette_port_device::pet_datassette_port_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, PET_DATASSETTE_PORT, tag, owner, clock),
device_single_card_slot_interface<device_pet_datassette_port_interface>(mconfig, *this),
m_read_handler(*this), m_cart(nullptr)
diff --git a/src/devices/bus/pet/cass.h b/src/devices/bus/pet/cass.h
index a6a6eac11f9..2c6f484822d 100644
--- a/src/devices/bus/pet/cass.h
+++ b/src/devices/bus/pet/cass.h
@@ -44,7 +44,7 @@ class pet_datassette_port_device : public device_t, public device_single_card_sl
public:
template <typename T>
pet_datassette_port_device(const machine_config &mconfig, const char *tag, device_t *owner, T &&opts, const char *dflt)
- : pet_datassette_port_device(mconfig, tag, owner, 0)
+ : pet_datassette_port_device(mconfig, tag, owner)
{
option_reset();
opts(*this);
@@ -52,7 +52,7 @@ public:
set_fixed(false);
}
- pet_datassette_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ pet_datassette_port_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL());
virtual ~pet_datassette_port_device();
// static configuration helpers
diff --git a/src/devices/bus/pet/cb2snd.cpp b/src/devices/bus/pet/cb2snd.cpp
index b80d2efcce8..70e30bb10eb 100644
--- a/src/devices/bus/pet/cb2snd.cpp
+++ b/src/devices/bus/pet/cb2snd.cpp
@@ -28,7 +28,7 @@ DEFINE_DEVICE_TYPE(PET_USERPORT_CB2_SOUND_DEVICE, pet_userport_cb2_sound_device,
void pet_userport_cb2_sound_device::device_add_mconfig(machine_config &config)
{
SPEAKER(config, "speaker").front_center();
- DAC_1BIT(config, m_dac, 0).add_route(ALL_OUTPUTS, "speaker", 0.99);
+ DAC_1BIT(config, m_dac).add_route(ALL_OUTPUTS, "speaker", 0.99);
}
//**************************************************************************
@@ -39,7 +39,7 @@ void pet_userport_cb2_sound_device::device_add_mconfig(machine_config &config)
// pet_userport_cb2_sound_device - constructor
//-------------------------------------------------
-pet_userport_cb2_sound_device::pet_userport_cb2_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+pet_userport_cb2_sound_device::pet_userport_cb2_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, PET_USERPORT_CB2_SOUND_DEVICE, tag, owner, clock),
device_pet_user_port_interface(mconfig, *this),
m_dac(*this, "dac")
diff --git a/src/devices/bus/pet/cb2snd.h b/src/devices/bus/pet/cb2snd.h
index cd39cc5bbb8..c5b08100514 100644
--- a/src/devices/bus/pet/cb2snd.h
+++ b/src/devices/bus/pet/cb2snd.h
@@ -23,7 +23,7 @@ class pet_userport_cb2_sound_device : public device_t,
{
public:
// construction/destruction
- pet_userport_cb2_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ pet_userport_cb2_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
virtual DECLARE_WRITE_LINE_MEMBER( input_m ) override;
diff --git a/src/devices/bus/pet/diag.cpp b/src/devices/bus/pet/diag.cpp
index 42e915e6d19..db40d342b5d 100644
--- a/src/devices/bus/pet/diag.cpp
+++ b/src/devices/bus/pet/diag.cpp
@@ -27,7 +27,7 @@ DEFINE_DEVICE_TYPE(PET_USERPORT_DIAGNOSTIC_CONNECTOR, pet_userport_diagnostic_co
// pet_userport_diagnostic_connector_t - constructor
//-------------------------------------------------
-pet_userport_diagnostic_connector_device::pet_userport_diagnostic_connector_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+pet_userport_diagnostic_connector_device::pet_userport_diagnostic_connector_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, PET_USERPORT_DIAGNOSTIC_CONNECTOR, tag, owner, clock),
device_pet_user_port_interface(mconfig, *this)
{
diff --git a/src/devices/bus/pet/diag.h b/src/devices/bus/pet/diag.h
index 8bcf1bfd415..98fcf2721b1 100644
--- a/src/devices/bus/pet/diag.h
+++ b/src/devices/bus/pet/diag.h
@@ -25,7 +25,7 @@ class pet_userport_diagnostic_connector_device : public device_t, public device_
{
public:
// construction/destruction
- pet_userport_diagnostic_connector_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ pet_userport_diagnostic_connector_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
// device_pet_user_port_interface overrides
virtual DECLARE_WRITE_LINE_MEMBER( input_2 ) override { output_b(state); }
diff --git a/src/devices/bus/pet/diag264_lb_tape.cpp b/src/devices/bus/pet/diag264_lb_tape.cpp
index afe5efab4dd..38345feb7f2 100644
--- a/src/devices/bus/pet/diag264_lb_tape.cpp
+++ b/src/devices/bus/pet/diag264_lb_tape.cpp
@@ -27,7 +27,7 @@ DEFINE_DEVICE_TYPE(DIAG264_CASSETTE_LOOPBACK, diag264_cassette_loopback_device,
// diag264_cassette_loopback_device - constructor
//-------------------------------------------------
-diag264_cassette_loopback_device::diag264_cassette_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+diag264_cassette_loopback_device::diag264_cassette_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, DIAG264_CASSETTE_LOOPBACK, tag, owner, clock)
, device_pet_datassette_port_interface(mconfig, *this)
, m_read(1)
diff --git a/src/devices/bus/pet/diag264_lb_tape.h b/src/devices/bus/pet/diag264_lb_tape.h
index 6eb11fd395d..4ac7756986b 100644
--- a/src/devices/bus/pet/diag264_lb_tape.h
+++ b/src/devices/bus/pet/diag264_lb_tape.h
@@ -26,7 +26,7 @@ class diag264_cassette_loopback_device : public device_t,
{
public:
// construction/destruction
- diag264_cassette_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ diag264_cassette_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/pet/exp.cpp b/src/devices/bus/pet/exp.cpp
index aef8c5dfbf4..cc2409b9860 100644
--- a/src/devices/bus/pet/exp.cpp
+++ b/src/devices/bus/pet/exp.cpp
@@ -35,7 +35,7 @@ DEFINE_DEVICE_TYPE(PET_EXPANSION_SLOT, pet_expansion_slot_device, "pet_expansion
// pet_expansion_slot_device - constructor
//-------------------------------------------------
-pet_expansion_slot_device::pet_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+pet_expansion_slot_device::pet_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, PET_EXPANSION_SLOT, tag, owner, clock),
device_single_card_slot_interface<device_pet_expansion_card_interface>(mconfig, *this),
m_card(nullptr),
diff --git a/src/devices/bus/pet/exp.h b/src/devices/bus/pet/exp.h
index e8018bdd732..b2a3b6f5669 100644
--- a/src/devices/bus/pet/exp.h
+++ b/src/devices/bus/pet/exp.h
@@ -29,7 +29,7 @@ class pet_expansion_slot_device : public device_t,
{
public:
template <typename T>
- pet_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, T &&opts, const char *dflt)
+ pet_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock, T &&opts, const char *dflt)
: pet_expansion_slot_device(mconfig, tag, owner, clock)
{
option_reset();
@@ -38,7 +38,7 @@ public:
set_fixed(false);
}
- pet_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ pet_expansion_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
virtual ~pet_expansion_slot_device();
auto dma_read_callback() { return m_read_dma.bind(); }
diff --git a/src/devices/bus/pet/hsg.cpp b/src/devices/bus/pet/hsg.cpp
index 7c6e7c657d6..894f4e46b3b 100644
--- a/src/devices/bus/pet/hsg.cpp
+++ b/src/devices/bus/pet/hsg.cpp
@@ -100,7 +100,7 @@ void cbm8000_hsg_a_device::device_add_mconfig(machine_config &config)
screen.set_refresh_hz(25);
PALETTE(config, "palette", palette_device::MONOCHROME);
- EF9365(config, m_gdc, 1750000);
+ EF9365(config, m_gdc, XTAL::u(1750000));
m_gdc->set_screen(SCREEN_TAG);
m_gdc->set_addrmap(0, &cbm8000_hsg_a_device::hsg_a_map);
m_gdc->set_palette_tag("palette");
@@ -117,7 +117,7 @@ void cbm8000_hsg_b_device::device_add_mconfig(machine_config &config)
screen.set_refresh_hz(50);
PALETTE(config, "palette", palette_device::MONOCHROME);
- EF9365(config, m_gdc, 1750000); //EF9366
+ EF9365(config, m_gdc, XTAL::u(1750000)); //EF9366
m_gdc->set_screen(SCREEN_TAG);
m_gdc->set_addrmap(0, &cbm8000_hsg_b_device::hsg_b_map);
m_gdc->set_palette_tag("palette");
@@ -135,7 +135,7 @@ void cbm8000_hsg_b_device::device_add_mconfig(machine_config &config)
// cbm8000_hsg_device - constructor
//-------------------------------------------------
-cbm8000_hsg_device::cbm8000_hsg_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+cbm8000_hsg_device::cbm8000_hsg_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_pet_expansion_card_interface(mconfig, *this),
m_gdc(*this, EF9365_TAG),
@@ -144,12 +144,12 @@ cbm8000_hsg_device::cbm8000_hsg_device(const machine_config &mconfig, device_typ
{
}
-cbm8000_hsg_a_device::cbm8000_hsg_a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+cbm8000_hsg_a_device::cbm8000_hsg_a_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
cbm8000_hsg_device(mconfig, CBM8000_HSG_A, tag, owner, clock)
{
}
-cbm8000_hsg_b_device::cbm8000_hsg_b_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+cbm8000_hsg_b_device::cbm8000_hsg_b_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
cbm8000_hsg_device(mconfig, CBM8000_HSG_B, tag, owner, clock)
{
}
diff --git a/src/devices/bus/pet/hsg.h b/src/devices/bus/pet/hsg.h
index e86cb101ac3..62696045338 100644
--- a/src/devices/bus/pet/hsg.h
+++ b/src/devices/bus/pet/hsg.h
@@ -26,7 +26,7 @@ class cbm8000_hsg_device : public device_t, public device_pet_expansion_card_int
{
protected:
// construction/destruction
- cbm8000_hsg_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ cbm8000_hsg_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;
@@ -54,7 +54,7 @@ class cbm8000_hsg_a_device : public cbm8000_hsg_device
{
public:
// construction/destruction
- cbm8000_hsg_a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ cbm8000_hsg_a_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// optional information overrides
@@ -71,7 +71,7 @@ class cbm8000_hsg_b_device : public cbm8000_hsg_device
{
public:
// construction/destruction
- cbm8000_hsg_b_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ cbm8000_hsg_b_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// optional information overrides
diff --git a/src/devices/bus/pet/petuja.cpp b/src/devices/bus/pet/petuja.cpp
index aee8c2a1f0f..63eeed343c0 100644
--- a/src/devices/bus/pet/petuja.cpp
+++ b/src/devices/bus/pet/petuja.cpp
@@ -60,7 +60,7 @@ ioport_constructor pet_userport_joystick_adapter_device::device_input_ports() co
// pet_userport_joystick_adapter_device - constructor
//-------------------------------------------------
-pet_userport_joystick_adapter_device::pet_userport_joystick_adapter_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+pet_userport_joystick_adapter_device::pet_userport_joystick_adapter_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, PET_USERPORT_JOYSTICK_ADAPTER, tag, owner, clock),
device_pet_user_port_interface(mconfig, *this),
m_up1(1),
diff --git a/src/devices/bus/pet/petuja.h b/src/devices/bus/pet/petuja.h
index b268c0d1519..a4a9c0e54c5 100644
--- a/src/devices/bus/pet/petuja.h
+++ b/src/devices/bus/pet/petuja.h
@@ -27,7 +27,7 @@ class pet_userport_joystick_adapter_device : public device_t,
{
public:
// construction/destruction
- pet_userport_joystick_adapter_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ pet_userport_joystick_adapter_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/pet/superpet.cpp b/src/devices/bus/pet/superpet.cpp
index df5c0071600..c6e3a626693 100644
--- a/src/devices/bus/pet/superpet.cpp
+++ b/src/devices/bus/pet/superpet.cpp
@@ -77,7 +77,7 @@ void superpet_device::device_add_mconfig(machine_config &config)
MOS6702(config, m_dongle, 16_MHz_XTAL / 16);
- MOS6551(config, m_acia, 0);
+ MOS6551(config, m_acia);
m_acia->set_xtal(1.8432_MHz_XTAL);
m_acia->irq_handler().set(FUNC(superpet_device::acia_irq_w));
m_acia->txd_handler().set(RS232_TAG, FUNC(rs232_port_device::write_txd));
@@ -166,7 +166,7 @@ inline bool superpet_device::is_ram_writable()
// superpet_device - constructor
//-------------------------------------------------
-superpet_device::superpet_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+superpet_device::superpet_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, SUPERPET, tag, owner, clock),
device_pet_expansion_card_interface(mconfig, *this),
m_maincpu(*this, M6809_TAG),
diff --git a/src/devices/bus/pet/superpet.h b/src/devices/bus/pet/superpet.h
index 56c07df525f..9077ada1f88 100644
--- a/src/devices/bus/pet/superpet.h
+++ b/src/devices/bus/pet/superpet.h
@@ -28,7 +28,7 @@ class superpet_device : public device_t,
{
public:
// construction/destruction
- superpet_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ superpet_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/pet/user.cpp b/src/devices/bus/pet/user.cpp
index 574c6c9afe9..03ec82d699e 100644
--- a/src/devices/bus/pet/user.cpp
+++ b/src/devices/bus/pet/user.cpp
@@ -13,7 +13,7 @@
DEFINE_DEVICE_TYPE(PET_USER_PORT, pet_user_port_device, "pet_user_port", "PET user port")
-pet_user_port_device::pet_user_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+pet_user_port_device::pet_user_port_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, PET_USER_PORT, tag, owner, clock),
device_slot_interface(mconfig, *this),
m_2_handler(*this),
diff --git a/src/devices/bus/pet/user.h b/src/devices/bus/pet/user.h
index 4a6a64c3081..e907a2022ba 100644
--- a/src/devices/bus/pet/user.h
+++ b/src/devices/bus/pet/user.h
@@ -38,14 +38,14 @@ class pet_user_port_device : public device_t, public device_slot_interface
public:
template <typename T>
pet_user_port_device(const machine_config &mconfig, const char *tag, device_t *owner, T &&opts, const char *dflt)
- : pet_user_port_device(mconfig, tag, owner, 0)
+ : pet_user_port_device(mconfig, tag, owner)
{
option_reset();
opts(*this);
set_default_option(dflt);
set_fixed(false);
}
- pet_user_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ pet_user_port_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL());
auto p2_handler() { return m_2_handler.bind(); }
auto p3_handler() { return m_3_handler.bind(); }