summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/a2bus
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/a2bus')
-rw-r--r--src/devices/bus/a2bus/4play.cpp8
-rw-r--r--src/devices/bus/a2bus/a2alfam2.cpp22
-rw-r--r--src/devices/bus/a2bus/a2applicard.cpp10
-rw-r--r--src/devices/bus/a2bus/a2arcadebd.cpp10
-rw-r--r--src/devices/bus/a2bus/a2bus.cpp8
-rw-r--r--src/devices/bus/a2bus/a2bus.h12
-rw-r--r--src/devices/bus/a2bus/a2cffa.cpp12
-rw-r--r--src/devices/bus/a2bus/a2corvus.cpp6
-rw-r--r--src/devices/bus/a2bus/a2corvus.h4
-rw-r--r--src/devices/bus/a2bus/a2diskiing.cpp8
-rw-r--r--src/devices/bus/a2bus/a2diskiing.h8
-rw-r--r--src/devices/bus/a2bus/a2dx1.cpp12
-rw-r--r--src/devices/bus/a2bus/a2eauxslot.cpp8
-rw-r--r--src/devices/bus/a2bus/a2eauxslot.h10
-rw-r--r--src/devices/bus/a2bus/a2echoii.cpp10
-rw-r--r--src/devices/bus/a2bus/a2eext80col.cpp4
-rw-r--r--src/devices/bus/a2bus/a2eext80col.h4
-rw-r--r--src/devices/bus/a2bus/a2eramworks3.cpp8
-rw-r--r--src/devices/bus/a2bus/a2eramworks3.h8
-rw-r--r--src/devices/bus/a2bus/a2estd80col.cpp4
-rw-r--r--src/devices/bus/a2bus/a2estd80col.h4
-rw-r--r--src/devices/bus/a2bus/a2hsscsi.cpp4
-rw-r--r--src/devices/bus/a2bus/a2hsscsi.h4
-rw-r--r--src/devices/bus/a2bus/a2iwm.cpp6
-rw-r--r--src/devices/bus/a2bus/a2iwm.h6
-rw-r--r--src/devices/bus/a2bus/a2mcms.cpp12
-rw-r--r--src/devices/bus/a2bus/a2mcms.h10
-rw-r--r--src/devices/bus/a2bus/a2memexp.cpp12
-rw-r--r--src/devices/bus/a2bus/a2midi.cpp16
-rw-r--r--src/devices/bus/a2bus/a2mockingboard.cpp46
-rw-r--r--src/devices/bus/a2bus/a2parprn.cpp4
-rw-r--r--src/devices/bus/a2bus/a2pic.cpp4
-rw-r--r--src/devices/bus/a2bus/a2sam.cpp4
-rw-r--r--src/devices/bus/a2bus/a2scsi.cpp4
-rw-r--r--src/devices/bus/a2bus/a2scsi.h4
-rw-r--r--src/devices/bus/a2bus/a2sd.cpp8
-rw-r--r--src/devices/bus/a2bus/a2sd.h4
-rw-r--r--src/devices/bus/a2bus/a2softcard.cpp4
-rw-r--r--src/devices/bus/a2bus/a2softcard.h4
-rw-r--r--src/devices/bus/a2bus/a2ssc.cpp14
-rw-r--r--src/devices/bus/a2bus/a2superdrive.cpp8
-rw-r--r--src/devices/bus/a2bus/a2swyft.cpp8
-rw-r--r--src/devices/bus/a2bus/a2themill.cpp6
-rw-r--r--src/devices/bus/a2bus/a2themill.h4
-rw-r--r--src/devices/bus/a2bus/a2thunderclock.cpp8
-rw-r--r--src/devices/bus/a2bus/a2ultraterm.cpp12
-rw-r--r--src/devices/bus/a2bus/a2videoterm.cpp24
-rw-r--r--src/devices/bus/a2bus/a2vulcan.cpp16
-rw-r--r--src/devices/bus/a2bus/a2zipdrive.cpp12
-rw-r--r--src/devices/bus/a2bus/ace2x00.cpp6
-rw-r--r--src/devices/bus/a2bus/ace2x00.h6
-rw-r--r--src/devices/bus/a2bus/agat7langcard.cpp4
-rw-r--r--src/devices/bus/a2bus/agat7langcard.h4
-rw-r--r--src/devices/bus/a2bus/agat7ports.cpp6
-rw-r--r--src/devices/bus/a2bus/agat7ports.h4
-rw-r--r--src/devices/bus/a2bus/agat7ram.cpp4
-rw-r--r--src/devices/bus/a2bus/agat7ram.h4
-rw-r--r--src/devices/bus/a2bus/agat840k_hle.cpp4
-rw-r--r--src/devices/bus/a2bus/agat840k_hle.h4
-rw-r--r--src/devices/bus/a2bus/agat_fdc.cpp4
-rw-r--r--src/devices/bus/a2bus/agat_fdc.h4
-rw-r--r--src/devices/bus/a2bus/booti.cpp10
-rw-r--r--src/devices/bus/a2bus/byte8251.cpp6
-rw-r--r--src/devices/bus/a2bus/ccs7710.cpp2
-rw-r--r--src/devices/bus/a2bus/ccs7710.h2
-rw-r--r--src/devices/bus/a2bus/cmsscsi.cpp4
-rw-r--r--src/devices/bus/a2bus/cmsscsi.h4
-rw-r--r--src/devices/bus/a2bus/computereyes2.cpp8
-rw-r--r--src/devices/bus/a2bus/corvfdc01.cpp4
-rw-r--r--src/devices/bus/a2bus/corvfdc01.h4
-rw-r--r--src/devices/bus/a2bus/corvfdc02.cpp4
-rw-r--r--src/devices/bus/a2bus/corvfdc02.h4
-rw-r--r--src/devices/bus/a2bus/excel9.cpp6
-rw-r--r--src/devices/bus/a2bus/excel9.h4
-rw-r--r--src/devices/bus/a2bus/ezcgi.cpp24
-rw-r--r--src/devices/bus/a2bus/grafex.cpp8
-rw-r--r--src/devices/bus/a2bus/grappler.cpp24
-rw-r--r--src/devices/bus/a2bus/lancegs.cpp10
-rw-r--r--src/devices/bus/a2bus/laser128.cpp6
-rw-r--r--src/devices/bus/a2bus/laser128.h6
-rw-r--r--src/devices/bus/a2bus/mouse.cpp12
-rw-r--r--src/devices/bus/a2bus/nippelclock.cpp4
-rw-r--r--src/devices/bus/a2bus/nippelclock.h4
-rw-r--r--src/devices/bus/a2bus/pc_xporter.cpp14
-rw-r--r--src/devices/bus/a2bus/prodosromdrive.cpp8
-rw-r--r--src/devices/bus/a2bus/q68.cpp6
-rw-r--r--src/devices/bus/a2bus/q68.h6
-rw-r--r--src/devices/bus/a2bus/ramcard128k.cpp4
-rw-r--r--src/devices/bus/a2bus/ramcard128k.h4
-rw-r--r--src/devices/bus/a2bus/ramcard16k.cpp4
-rw-r--r--src/devices/bus/a2bus/ramcard16k.h4
-rw-r--r--src/devices/bus/a2bus/sider.cpp6
-rw-r--r--src/devices/bus/a2bus/sider.h6
-rw-r--r--src/devices/bus/a2bus/softcard3.cpp4
-rw-r--r--src/devices/bus/a2bus/softcard3.h4
-rw-r--r--src/devices/bus/a2bus/ssbapple.cpp10
-rw-r--r--src/devices/bus/a2bus/ssprite.cpp12
-rw-r--r--src/devices/bus/a2bus/suprterminal.cpp8
-rw-r--r--src/devices/bus/a2bus/timemasterho.cpp12
-rw-r--r--src/devices/bus/a2bus/titan3plus2.cpp4
-rw-r--r--src/devices/bus/a2bus/titan3plus2.h4
-rw-r--r--src/devices/bus/a2bus/transwarp.cpp4
-rw-r--r--src/devices/bus/a2bus/transwarp.h4
-rw-r--r--src/devices/bus/a2bus/uniprint.cpp4
-rw-r--r--src/devices/bus/a2bus/uthernet.cpp4
105 files changed, 399 insertions, 399 deletions
diff --git a/src/devices/bus/a2bus/4play.cpp b/src/devices/bus/a2bus/4play.cpp
index c51ef306cff..cfa261a3235 100644
--- a/src/devices/bus/a2bus/4play.cpp
+++ b/src/devices/bus/a2bus/4play.cpp
@@ -25,10 +25,10 @@ class a2bus_4play_device:
{
public:
// construction/destruction
- a2bus_4play_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_4play_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- a2bus_4play_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_4play_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual ioport_constructor device_input_ports() const override;
@@ -93,12 +93,12 @@ ioport_constructor a2bus_4play_device::device_input_ports() const
// LIVE DEVICE
//**************************************************************************
-a2bus_4play_device::a2bus_4play_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_4play_device::a2bus_4play_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_4play_device(mconfig, A2BUS_4PLAY, tag, owner, clock)
{
}
-a2bus_4play_device::a2bus_4play_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_4play_device::a2bus_4play_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_a2bus_card_interface(mconfig, *this),
m_p1(*this, "p1"),
diff --git a/src/devices/bus/a2bus/a2alfam2.cpp b/src/devices/bus/a2bus/a2alfam2.cpp
index 72815dcce53..5b6288b8313 100644
--- a/src/devices/bus/a2bus/a2alfam2.cpp
+++ b/src/devices/bus/a2bus/a2alfam2.cpp
@@ -30,14 +30,14 @@ class a2bus_alfam2_device:
public device_a2bus_card_interface
{
public:
- a2bus_alfam2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+ a2bus_alfam2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_alfam2_device(mconfig, A2BUS_ALFAM2, tag, owner, clock)
{
}
protected:
// construction/destruction
- a2bus_alfam2_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_alfam2_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
@@ -60,7 +60,7 @@ private:
class a2bus_aesms_device : public a2bus_alfam2_device
{
public:
- a2bus_aesms_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+ a2bus_aesms_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_alfam2_device(mconfig, A2BUS_AESMS, tag, owner, clock)
{
}
@@ -92,14 +92,14 @@ void a2bus_alfam2_device::device_add_mconfig(machine_config &config)
SPEAKER(config, "alf_l").front_left();
SPEAKER(config, "alf_r").front_right();
- SN76489(config, m_sn1, 1020484);
+ SN76489(config, m_sn1, XTAL::u(1020484));
m_sn1->add_route(ALL_OUTPUTS, "alf_l", 0.50);
- SN76489(config, m_sn2, 1020484);
+ SN76489(config, m_sn2, XTAL::u(1020484));
m_sn2->add_route(ALL_OUTPUTS, "alf_l", 0.50);
m_sn2->add_route(ALL_OUTPUTS, "alf_r", 0.50);
- SN76489(config, m_sn3, 1020484);
+ SN76489(config, m_sn3, XTAL::u(1020484));
m_sn3->add_route(ALL_OUTPUTS, "alf_r", 0.50);
}
@@ -108,17 +108,17 @@ void a2bus_aesms_device::device_add_mconfig(machine_config &config)
SPEAKER(config, "alf_l").front_left();
SPEAKER(config, "alf_r").front_right();
- SN76489(config, m_sn1, 1020484);
+ SN76489(config, m_sn1, XTAL::u(1020484));
m_sn1->add_route(ALL_OUTPUTS, "alf_l", 0.50);
- SN76489(config, m_sn2, 1020484);
+ SN76489(config, m_sn2, XTAL::u(1020484));
m_sn2->add_route(ALL_OUTPUTS, "alf_l", 0.50);
m_sn2->add_route(ALL_OUTPUTS, "alf_r", 0.50);
- SN76489(config, m_sn3, 1020484);
+ SN76489(config, m_sn3, XTAL::u(1020484));
m_sn3->add_route(ALL_OUTPUTS, "alf_r", 0.50);
- SN76489(config, m_sn4, 1020484);
+ SN76489(config, m_sn4, XTAL::u(1020484));
m_sn4->add_route(ALL_OUTPUTS, "alf_l", 0.50);
m_sn4->add_route(ALL_OUTPUTS, "alf_r", 0.50);
}
@@ -127,7 +127,7 @@ void a2bus_aesms_device::device_add_mconfig(machine_config &config)
// LIVE DEVICE
//**************************************************************************
-a2bus_alfam2_device::a2bus_alfam2_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_alfam2_device::a2bus_alfam2_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_a2bus_card_interface(mconfig, *this),
m_sn1(*this, SN1_TAG),
diff --git a/src/devices/bus/a2bus/a2applicard.cpp b/src/devices/bus/a2bus/a2applicard.cpp
index 5395295a207..b9d13751658 100644
--- a/src/devices/bus/a2bus/a2applicard.cpp
+++ b/src/devices/bus/a2bus/a2applicard.cpp
@@ -41,13 +41,13 @@ class a2bus_applicard_device:
{
public:
// construction/destruction
- a2bus_applicard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_applicard_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
uint8_t z80_io_r(offs_t offset);
void z80_io_w(offs_t offset, uint8_t data);
protected:
- a2bus_applicard_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_applicard_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
@@ -95,7 +95,7 @@ void a2bus_applicard_device::z80_io(address_map &map)
void a2bus_applicard_device::device_add_mconfig(machine_config &config)
{
- Z80(config, m_z80, 6000000); // Z80 runs at 6 MHz
+ Z80(config, m_z80, XTAL::u(6000000)); // Z80 runs at 6 MHz
m_z80->set_addrmap(AS_PROGRAM, &a2bus_applicard_device::z80_mem);
m_z80->set_addrmap(AS_IO, &a2bus_applicard_device::z80_io);
}
@@ -113,7 +113,7 @@ const tiny_rom_entry *a2bus_applicard_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_applicard_device::a2bus_applicard_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_applicard_device::a2bus_applicard_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_a2bus_card_interface(mconfig, *this),
m_z80(*this, Z80_TAG),
@@ -122,7 +122,7 @@ a2bus_applicard_device::a2bus_applicard_device(const machine_config &mconfig, de
{
}
-a2bus_applicard_device::a2bus_applicard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_applicard_device::a2bus_applicard_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_applicard_device(mconfig, A2BUS_APPLICARD, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/a2arcadebd.cpp b/src/devices/bus/a2bus/a2arcadebd.cpp
index 85c0cfc02d2..2c338cc6cd3 100644
--- a/src/devices/bus/a2bus/a2arcadebd.cpp
+++ b/src/devices/bus/a2bus/a2arcadebd.cpp
@@ -42,10 +42,10 @@ class a2bus_arcboard_device:
{
public:
// construction/destruction
- a2bus_arcboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_arcboard_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- a2bus_arcboard_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_arcboard_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
@@ -74,19 +74,19 @@ void a2bus_arcboard_device::device_add_mconfig(machine_config &config)
SCREEN(config, SCREEN_TAG, SCREEN_TYPE_RASTER);
SPEAKER(config, "mono").front_center();
- AY8910(config, m_ay, 1022727).add_route(ALL_OUTPUTS, "mono", 1.0);
+ AY8910(config, m_ay, XTAL::u(1022727)).add_route(ALL_OUTPUTS, "mono", 1.0);
}
//**************************************************************************
// LIVE DEVICE
//**************************************************************************
-a2bus_arcboard_device::a2bus_arcboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_arcboard_device::a2bus_arcboard_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_arcboard_device(mconfig, A2BUS_ARCADEBOARD, tag, owner, clock)
{
}
-a2bus_arcboard_device::a2bus_arcboard_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_arcboard_device::a2bus_arcboard_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_a2bus_card_interface(mconfig, *this),
m_tms(*this, TMS_TAG),
diff --git a/src/devices/bus/a2bus/a2bus.cpp b/src/devices/bus/a2bus/a2bus.cpp
index deb322f67a8..7f374924973 100644
--- a/src/devices/bus/a2bus/a2bus.cpp
+++ b/src/devices/bus/a2bus/a2bus.cpp
@@ -91,12 +91,12 @@ template class device_finder<device_a2bus_card_interface, true>;
//-------------------------------------------------
// a2bus_slot_device - constructor
//-------------------------------------------------
-a2bus_slot_device::a2bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+a2bus_slot_device::a2bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: a2bus_slot_device(mconfig, A2BUS_SLOT, tag, owner, clock)
{
}
-a2bus_slot_device::a2bus_slot_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+a2bus_slot_device::a2bus_slot_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_single_card_slot_interface<device_a2bus_card_interface>(mconfig, *this)
, m_a2bus(*this, finder_base::DUMMY_TAG)
@@ -132,12 +132,12 @@ DEFINE_DEVICE_TYPE(A2BUS, a2bus_device, "a2bus", "Apple II Bus")
// a2bus_device - constructor
//-------------------------------------------------
-a2bus_device::a2bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+a2bus_device::a2bus_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: a2bus_device(mconfig, A2BUS, tag, owner, clock)
{
}
-a2bus_device::a2bus_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+a2bus_device::a2bus_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, type, tag, owner, clock)
, m_maincpu_space(*this, finder_base::DUMMY_TAG, -1)
, m_out_irq_cb(*this)
diff --git a/src/devices/bus/a2bus/a2bus.h b/src/devices/bus/a2bus/a2bus.h
index 5a10f06de39..625c12d31e0 100644
--- a/src/devices/bus/a2bus/a2bus.h
+++ b/src/devices/bus/a2bus/a2bus.h
@@ -26,7 +26,7 @@
#define INH_WRITE 0x02
// 7M = XTAL(14'318'181) / 2 or XTAL(28'636'363) / 4 (for IIgs)
-static constexpr uint32_t A2BUS_7M_CLOCK = 7159090;
+static constexpr XTAL A2BUS_7M_CLOCK = XTAL(14'318'181) / 2;
//**************************************************************************
// TYPE DEFINITIONS
@@ -45,7 +45,7 @@ public:
{
}
template <typename T, typename U>
- a2bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, T &&a2bus_tag, U &&opts, const char *dflt)
+ a2bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock, T &&a2bus_tag, U &&opts, const char *dflt)
: a2bus_slot_device(mconfig, tag, owner, clock)
{
option_reset();
@@ -54,10 +54,10 @@ public:
set_fixed(false);
m_a2bus.set_tag(std::forward<T>(a2bus_tag));
}
- a2bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = A2BUS_7M_CLOCK);
+ a2bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = A2BUS_7M_CLOCK);
protected:
- a2bus_slot_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_slot_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
// device-level overrides
virtual void device_resolve_objects() override;
@@ -78,7 +78,7 @@ class a2bus_device : public device_t
friend class a2bus_mcms2_device;
public:
// construction/destruction
- a2bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
// inline configuration
template <typename T> void set_space(T &&tag, int spacenum) { m_maincpu_space.set_tag(std::forward<T>(tag), spacenum); }
@@ -103,7 +103,7 @@ public:
DECLARE_WRITE_LINE_MEMBER( nmi_w );
protected:
- a2bus_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
// device-level overrides
virtual void device_resolve_objects() override;
diff --git a/src/devices/bus/a2bus/a2cffa.cpp b/src/devices/bus/a2bus/a2cffa.cpp
index 3839b338ae1..43c4ddd8c51 100644
--- a/src/devices/bus/a2bus/a2cffa.cpp
+++ b/src/devices/bus/a2bus/a2cffa.cpp
@@ -45,7 +45,7 @@ class a2bus_cffa2000_device:
{
protected:
// construction/destruction
- a2bus_cffa2000_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_cffa2000_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
@@ -73,7 +73,7 @@ private:
class a2bus_cffa2_device : public a2bus_cffa2000_device, public device_nvram_interface
{
public:
- a2bus_cffa2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_cffa2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device_config_nvram_interface overrides
@@ -85,7 +85,7 @@ protected:
class a2bus_cffa2_6502_device : public a2bus_cffa2000_device, public device_nvram_interface
{
public:
- a2bus_cffa2_6502_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_cffa2_6502_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
virtual const tiny_rom_entry *device_rom_region() const override;
protected:
@@ -130,7 +130,7 @@ const tiny_rom_entry *a2bus_cffa2_6502_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_cffa2000_device::a2bus_cffa2000_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_cffa2000_device::a2bus_cffa2000_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_a2bus_card_interface(mconfig, *this),
m_ata(*this, CFFA2_ATA_TAG),
@@ -139,13 +139,13 @@ a2bus_cffa2000_device::a2bus_cffa2000_device(const machine_config &mconfig, devi
{
}
-a2bus_cffa2_device::a2bus_cffa2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_cffa2_device::a2bus_cffa2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_cffa2000_device(mconfig, A2BUS_CFFA2, tag, owner, clock),
device_nvram_interface(mconfig, *this)
{
}
-a2bus_cffa2_6502_device::a2bus_cffa2_6502_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_cffa2_6502_device::a2bus_cffa2_6502_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_cffa2000_device(mconfig, A2BUS_CFFA2_6502, tag, owner, clock),
device_nvram_interface(mconfig, *this)
{
diff --git a/src/devices/bus/a2bus/a2corvus.cpp b/src/devices/bus/a2bus/a2corvus.cpp
index b2e845f3d2c..9430356844f 100644
--- a/src/devices/bus/a2bus/a2corvus.cpp
+++ b/src/devices/bus/a2bus/a2corvus.cpp
@@ -73,7 +73,7 @@ ROM_END
void a2bus_corvus_device::device_add_mconfig(machine_config &config)
{
- CORVUS_HDC(config, m_corvushd, 0);
+ CORVUS_HDC(config, m_corvushd);
HARDDISK(config, "harddisk1", "corvus_hdd");
HARDDISK(config, "harddisk2", "corvus_hdd");
HARDDISK(config, "harddisk3", "corvus_hdd");
@@ -93,14 +93,14 @@ const tiny_rom_entry *a2bus_corvus_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_corvus_device::a2bus_corvus_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_corvus_device::a2bus_corvus_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_a2bus_card_interface(mconfig, *this),
m_corvushd(*this, CORVUS_HD_TAG), m_rom(nullptr)
{
}
-a2bus_corvus_device::a2bus_corvus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_corvus_device::a2bus_corvus_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_corvus_device(mconfig, A2BUS_CORVUS, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/a2corvus.h b/src/devices/bus/a2bus/a2corvus.h
index a6d1a232eee..028dc89f43c 100644
--- a/src/devices/bus/a2bus/a2corvus.h
+++ b/src/devices/bus/a2bus/a2corvus.h
@@ -27,10 +27,10 @@ class a2bus_corvus_device:
{
public:
// construction/destruction
- a2bus_corvus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_corvus_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- a2bus_corvus_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_corvus_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
diff --git a/src/devices/bus/a2bus/a2diskiing.cpp b/src/devices/bus/a2bus/a2diskiing.cpp
index f6c4808462a..4549beb4c39 100644
--- a/src/devices/bus/a2bus/a2diskiing.cpp
+++ b/src/devices/bus/a2bus/a2diskiing.cpp
@@ -129,7 +129,7 @@ const tiny_rom_entry *a2bus_agat9flop_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-diskiing_device::diskiing_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+diskiing_device::diskiing_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_a2bus_card_interface(mconfig, *this),
m_wozfdc(*this, WOZFDC_TAG),
@@ -138,17 +138,17 @@ diskiing_device::diskiing_device(const machine_config &mconfig, device_type type
{
}
-a2bus_diskiing_device::a2bus_diskiing_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_diskiing_device::a2bus_diskiing_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
diskiing_device(mconfig, A2BUS_DISKIING, tag, owner, clock)
{
}
-a2bus_diskiing13_device::a2bus_diskiing13_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_diskiing13_device::a2bus_diskiing13_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
diskiing_device(mconfig, A2BUS_DISKIING13, tag, owner, clock)
{
}
-a2bus_applesurance_device::a2bus_applesurance_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_applesurance_device::a2bus_applesurance_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
diskiing_device(mconfig, A2BUS_APPLESURANCE, tag, owner, clock),
m_c800_bank(1)
{
diff --git a/src/devices/bus/a2bus/a2diskiing.h b/src/devices/bus/a2bus/a2diskiing.h
index 1d6e2f93f99..6f246eea8c9 100644
--- a/src/devices/bus/a2bus/a2diskiing.h
+++ b/src/devices/bus/a2bus/a2diskiing.h
@@ -32,7 +32,7 @@ class diskiing_device:
{
protected:
// construction/destruction
- diskiing_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ diskiing_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
@@ -56,13 +56,13 @@ private:
class a2bus_diskiing_device: public diskiing_device
{
public:
- a2bus_diskiing_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_diskiing_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
};
class a2bus_diskiing13_device: public diskiing_device
{
public:
- a2bus_diskiing13_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_diskiing13_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
virtual void device_add_mconfig(machine_config &config) override;
@@ -75,7 +75,7 @@ private:
class a2bus_applesurance_device: public diskiing_device
{
public:
- a2bus_applesurance_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_applesurance_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/a2bus/a2dx1.cpp b/src/devices/bus/a2bus/a2dx1.cpp
index ae8f80091b1..4395471f94d 100644
--- a/src/devices/bus/a2bus/a2dx1.cpp
+++ b/src/devices/bus/a2bus/a2dx1.cpp
@@ -28,10 +28,10 @@ class a2bus_dx1_device:
{
public:
// construction/destruction
- a2bus_dx1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_dx1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- a2bus_dx1_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_dx1_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_add_mconfig(machine_config &config) override;
@@ -56,8 +56,8 @@ protected:
void a2bus_dx1_device::device_add_mconfig(machine_config &config)
{
SPEAKER(config, "speaker").front_center();
- DAC_8BIT_R2R(config, m_dac, 0).add_route(ALL_OUTPUTS, "speaker", 0.5); // unknown DAC
- DAC_8BIT_R2R(config, m_dacvol, 0)
+ DAC_8BIT_R2R(config, m_dac).add_route(ALL_OUTPUTS, "speaker", 0.5); // unknown DAC
+ DAC_8BIT_R2R(config, m_dacvol)
.set_output_range(0, 1)
.add_route(0, "dac", 1.0, DAC_INPUT_RANGE_HI)
.add_route(0, "dac", -1.0, DAC_INPUT_RANGE_LO); // unknown DAC
@@ -67,7 +67,7 @@ void a2bus_dx1_device::device_add_mconfig(machine_config &config)
// LIVE DEVICE
//**************************************************************************
-a2bus_dx1_device::a2bus_dx1_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_dx1_device::a2bus_dx1_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_a2bus_card_interface(mconfig, *this),
m_dac(*this, "dac"),
@@ -75,7 +75,7 @@ a2bus_dx1_device::a2bus_dx1_device(const machine_config &mconfig, device_type ty
{
}
-a2bus_dx1_device::a2bus_dx1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_dx1_device::a2bus_dx1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_dx1_device(mconfig, A2BUS_DX1, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/a2eauxslot.cpp b/src/devices/bus/a2bus/a2eauxslot.cpp
index 36b99cbe6aa..25147f0f3f5 100644
--- a/src/devices/bus/a2bus/a2eauxslot.cpp
+++ b/src/devices/bus/a2bus/a2eauxslot.cpp
@@ -24,12 +24,12 @@ DEFINE_DEVICE_TYPE(A2EAUXSLOT_SLOT, a2eauxslot_slot_device, "a2eauxslot_slot", "
//-------------------------------------------------
// a2eauxslot_slot_device - constructor
//-------------------------------------------------
-a2eauxslot_slot_device::a2eauxslot_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+a2eauxslot_slot_device::a2eauxslot_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: a2eauxslot_slot_device(mconfig, A2EAUXSLOT_SLOT, tag, owner, clock)
{
}
-a2eauxslot_slot_device::a2eauxslot_slot_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+a2eauxslot_slot_device::a2eauxslot_slot_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_single_card_slot_interface<device_a2eauxslot_card_interface>(mconfig, *this)
, m_a2eauxslot(*this, finder_base::DUMMY_TAG)
@@ -57,12 +57,12 @@ DEFINE_DEVICE_TYPE(A2EAUXSLOT, a2eauxslot_device, "a2eauxslot", "Apple IIe AUX B
// a2eauxslot_device - constructor
//-------------------------------------------------
-a2eauxslot_device::a2eauxslot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+a2eauxslot_device::a2eauxslot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: a2eauxslot_device(mconfig, A2EAUXSLOT, tag, owner, clock)
{
}
-a2eauxslot_device::a2eauxslot_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+a2eauxslot_device::a2eauxslot_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, type, tag, owner, clock)
, m_space(*this, finder_base::DUMMY_TAG, -1)
, m_out_irq_cb(*this)
diff --git a/src/devices/bus/a2bus/a2eauxslot.h b/src/devices/bus/a2bus/a2eauxslot.h
index 0eefe28db1d..e4b53cfbd2e 100644
--- a/src/devices/bus/a2bus/a2eauxslot.h
+++ b/src/devices/bus/a2bus/a2eauxslot.h
@@ -31,7 +31,7 @@ public:
// construction/destruction
template <typename T, typename U>
a2eauxslot_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, T &&slottag, U &&opts, char const *dflt)
- : a2eauxslot_slot_device(mconfig, tag, owner, 0)
+ : a2eauxslot_slot_device(mconfig, tag, owner)
{
option_reset();
opts(*this);
@@ -40,14 +40,14 @@ public:
m_a2eauxslot.set_tag(std::forward<T>(slottag));
}
- a2eauxslot_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
+ a2eauxslot_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL());
// device-level overrides
virtual void device_resolve_objects() override;
virtual void device_start() override { }
protected:
- a2eauxslot_slot_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2eauxslot_slot_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
// configuration
required_device<a2eauxslot_device> m_a2eauxslot;
@@ -62,7 +62,7 @@ class a2eauxslot_device : public device_t
{
public:
// construction/destruction
- a2eauxslot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2eauxslot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
// inline configuration
template <typename T> void set_space(T &&tag, int spacenum) { m_space.set_tag(std::forward<T>(tag), spacenum); }
@@ -79,7 +79,7 @@ public:
DECLARE_WRITE_LINE_MEMBER( nmi_w );
protected:
- a2eauxslot_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2eauxslot_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
// device-level overrides
virtual void device_resolve_objects() override;
diff --git a/src/devices/bus/a2bus/a2echoii.cpp b/src/devices/bus/a2bus/a2echoii.cpp
index 604dc7ae1c6..cbd3710e3d8 100644
--- a/src/devices/bus/a2bus/a2echoii.cpp
+++ b/src/devices/bus/a2bus/a2echoii.cpp
@@ -53,12 +53,12 @@ class a2bus_echoii_device:
{
public:
// construction/destruction
- a2bus_echoii_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_echoii_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
required_device<tms5220_device> m_tms;
protected:
- a2bus_echoii_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_echoii_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
@@ -88,7 +88,7 @@ private:
void a2bus_echoii_device::device_add_mconfig(machine_config &config)
{
SPEAKER(config, "echoii").front_center();
- tms5220_device &tms(TMS5220(config, TMS_TAG, 640000));
+ tms5220_device &tms(TMS5220(config, TMS_TAG, XTAL::u(640000)));
// Note the Echo II card has an R/C circuit (and sometimes a 'FREQ' potentiometer) to control the tms5220[c]'s clock frequency; 640khz is
// the nominal '8khz' value according to the TMS5220 datasheet.
// The EchoIIb card however has a 74LS92 which divides the apple2's Q3 ((14.318/7)MHz asymmetrical) clock by 6 to produce a 681.809khz/2
@@ -107,14 +107,14 @@ void a2bus_echoii_device::device_add_mconfig(machine_config &config)
// LIVE DEVICE
//**************************************************************************
-a2bus_echoii_device::a2bus_echoii_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_echoii_device::a2bus_echoii_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_a2bus_card_interface(mconfig, *this),
m_tms(*this, TMS_TAG)
{
}
-a2bus_echoii_device::a2bus_echoii_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_echoii_device::a2bus_echoii_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_echoii_device(mconfig, A2BUS_ECHOII, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/a2eext80col.cpp b/src/devices/bus/a2bus/a2eext80col.cpp
index 1c7a4fe77b3..f779425e9db 100644
--- a/src/devices/bus/a2bus/a2eext80col.cpp
+++ b/src/devices/bus/a2bus/a2eext80col.cpp
@@ -26,12 +26,12 @@ DEFINE_DEVICE_TYPE(A2EAUX_EXT80COL, a2eaux_ext80col_device, "a2eext80", "Apple I
// LIVE DEVICE
//**************************************************************************
-a2eaux_ext80col_device::a2eaux_ext80col_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2eaux_ext80col_device::a2eaux_ext80col_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2eaux_ext80col_device(mconfig, A2EAUX_EXT80COL, tag, owner, clock)
{
}
-a2eaux_ext80col_device::a2eaux_ext80col_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+a2eaux_ext80col_device::a2eaux_ext80col_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_a2eauxslot_card_interface(mconfig, *this)
{
diff --git a/src/devices/bus/a2bus/a2eext80col.h b/src/devices/bus/a2bus/a2eext80col.h
index 239a22e1484..9cc494a4c2a 100644
--- a/src/devices/bus/a2bus/a2eext80col.h
+++ b/src/devices/bus/a2bus/a2eext80col.h
@@ -25,10 +25,10 @@ class a2eaux_ext80col_device:
{
public:
// construction/destruction
- a2eaux_ext80col_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2eaux_ext80col_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- a2eaux_ext80col_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2eaux_ext80col_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
diff --git a/src/devices/bus/a2bus/a2eramworks3.cpp b/src/devices/bus/a2bus/a2eramworks3.cpp
index 11dcf3cae68..a72c3ba70a4 100644
--- a/src/devices/bus/a2bus/a2eramworks3.cpp
+++ b/src/devices/bus/a2bus/a2eramworks3.cpp
@@ -30,24 +30,24 @@ DEFINE_DEVICE_TYPE(A2EAUX_FRANKLIN512, a2eaux_franklin512_device, "a2ef512", "Fr
// LIVE DEVICE
//**************************************************************************
-a2eaux_ramworks3_device::a2eaux_ramworks3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2eaux_ramworks3_device::a2eaux_ramworks3_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2eaux_ramworks3_device(mconfig, A2EAUX_RAMWORKS3, tag, owner, clock)
{
}
-a2eaux_ramworks3_device::a2eaux_ramworks3_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+a2eaux_ramworks3_device::a2eaux_ramworks3_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_a2eauxslot_card_interface(mconfig, *this),
m_bank(0)
{
}
-a2eaux_franklin384_device::a2eaux_franklin384_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2eaux_franklin384_device::a2eaux_franklin384_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2eaux_ramworks3_device(mconfig, A2EAUX_FRANKLIN384, tag, owner, clock)
{
}
-a2eaux_franklin512_device::a2eaux_franklin512_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2eaux_franklin512_device::a2eaux_franklin512_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2eaux_ramworks3_device(mconfig, A2EAUX_FRANKLIN512, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/a2eramworks3.h b/src/devices/bus/a2bus/a2eramworks3.h
index fc083445e3c..693b12ea226 100644
--- a/src/devices/bus/a2bus/a2eramworks3.h
+++ b/src/devices/bus/a2bus/a2eramworks3.h
@@ -23,10 +23,10 @@ class a2eaux_ramworks3_device:
{
public:
// construction/destruction
- a2eaux_ramworks3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2eaux_ramworks3_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- a2eaux_ramworks3_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2eaux_ramworks3_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
@@ -48,7 +48,7 @@ private:
class a2eaux_franklin384_device: public a2eaux_ramworks3_device
{
public:
- a2eaux_franklin384_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2eaux_franklin384_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
virtual void write_c07x(u8 offset, u8 data) override;
@@ -57,7 +57,7 @@ protected:
class a2eaux_franklin512_device: public a2eaux_ramworks3_device
{
public:
- a2eaux_franklin512_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2eaux_franklin512_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
virtual void write_c07x(u8 offset, u8 data) override;
diff --git a/src/devices/bus/a2bus/a2estd80col.cpp b/src/devices/bus/a2bus/a2estd80col.cpp
index ab5d4bc48d1..7642b7211c6 100644
--- a/src/devices/bus/a2bus/a2estd80col.cpp
+++ b/src/devices/bus/a2bus/a2estd80col.cpp
@@ -21,12 +21,12 @@ DEFINE_DEVICE_TYPE(A2EAUX_STD80COL, a2eaux_std80col_device, "a2estd80", "Apple I
// LIVE DEVICE
//**************************************************************************
-a2eaux_std80col_device::a2eaux_std80col_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2eaux_std80col_device::a2eaux_std80col_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2eaux_std80col_device(mconfig, A2EAUX_STD80COL, tag, owner, clock)
{
}
-a2eaux_std80col_device::a2eaux_std80col_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+a2eaux_std80col_device::a2eaux_std80col_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_a2eauxslot_card_interface(mconfig, *this)
{
diff --git a/src/devices/bus/a2bus/a2estd80col.h b/src/devices/bus/a2bus/a2estd80col.h
index d66a42a7495..78bdbd1b25f 100644
--- a/src/devices/bus/a2bus/a2estd80col.h
+++ b/src/devices/bus/a2bus/a2estd80col.h
@@ -25,10 +25,10 @@ class a2eaux_std80col_device:
{
public:
// construction/destruction
- a2eaux_std80col_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2eaux_std80col_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- a2eaux_std80col_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2eaux_std80col_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
diff --git a/src/devices/bus/a2bus/a2hsscsi.cpp b/src/devices/bus/a2bus/a2hsscsi.cpp
index b2043c20f30..d4779082092 100644
--- a/src/devices/bus/a2bus/a2hsscsi.cpp
+++ b/src/devices/bus/a2bus/a2hsscsi.cpp
@@ -97,7 +97,7 @@ const tiny_rom_entry *a2bus_hsscsi_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_hsscsi_device::a2bus_hsscsi_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_hsscsi_device::a2bus_hsscsi_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_a2bus_card_interface(mconfig, *this),
m_ncr5380(*this, SCSI_5380_TAG),
@@ -106,7 +106,7 @@ a2bus_hsscsi_device::a2bus_hsscsi_device(const machine_config &mconfig, device_t
{
}
-a2bus_hsscsi_device::a2bus_hsscsi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_hsscsi_device::a2bus_hsscsi_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_hsscsi_device(mconfig, A2BUS_HSSCSI, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/a2hsscsi.h b/src/devices/bus/a2bus/a2hsscsi.h
index be200ccde0d..55c97948bb9 100644
--- a/src/devices/bus/a2bus/a2hsscsi.h
+++ b/src/devices/bus/a2bus/a2hsscsi.h
@@ -26,14 +26,14 @@ class a2bus_hsscsi_device:
{
public:
// construction/destruction
- a2bus_hsscsi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_hsscsi_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
static constexpr feature_type unemulated_features() { return feature::DISK; }
DECLARE_WRITE_LINE_MEMBER( drq_w );
protected:
- a2bus_hsscsi_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_hsscsi_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
diff --git a/src/devices/bus/a2bus/a2iwm.cpp b/src/devices/bus/a2bus/a2iwm.cpp
index 74adc23ffa8..81bb8a5323c 100644
--- a/src/devices/bus/a2bus/a2iwm.cpp
+++ b/src/devices/bus/a2bus/a2iwm.cpp
@@ -59,7 +59,7 @@ const tiny_rom_entry *a2bus_iwm_card_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_iwm_device::a2bus_iwm_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_iwm_device::a2bus_iwm_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_a2bus_card_interface(mconfig, *this),
m_iwm(*this, "iwm"),
@@ -67,12 +67,12 @@ a2bus_iwm_device::a2bus_iwm_device(const machine_config &mconfig, device_type ty
{
}
-a2bus_iwm_int_device::a2bus_iwm_int_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_iwm_int_device::a2bus_iwm_int_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_iwm_device(mconfig, A2BUS_IWM, tag, owner, clock)
{
}
-a2bus_iwm_card_device::a2bus_iwm_card_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_iwm_card_device::a2bus_iwm_card_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_iwm_device(mconfig, A2BUS_IWM_CARD, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/a2iwm.h b/src/devices/bus/a2bus/a2iwm.h
index 3f0fe974d3a..d7249565dc6 100644
--- a/src/devices/bus/a2bus/a2iwm.h
+++ b/src/devices/bus/a2bus/a2iwm.h
@@ -29,7 +29,7 @@ class a2bus_iwm_device:
{
protected:
// construction/destruction
- a2bus_iwm_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_iwm_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
@@ -50,13 +50,13 @@ private:
class a2bus_iwm_int_device: public a2bus_iwm_device
{
public:
- a2bus_iwm_int_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_iwm_int_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
};
class a2bus_iwm_card_device: public a2bus_iwm_device
{
public:
- a2bus_iwm_card_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_iwm_card_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual const tiny_rom_entry *device_rom_region() const override;
diff --git a/src/devices/bus/a2bus/a2mcms.cpp b/src/devices/bus/a2bus/a2mcms.cpp
index f23a647f4a8..362e3843820 100644
--- a/src/devices/bus/a2bus/a2mcms.cpp
+++ b/src/devices/bus/a2bus/a2mcms.cpp
@@ -52,7 +52,7 @@ void a2bus_mcms1_device::device_add_mconfig(machine_config &config)
SPEAKER(config, "mcms_l").front_left();
SPEAKER(config, "mcms_r").front_right();
- MCMS(config, m_mcms, 1000000);
+ MCMS(config, m_mcms, XTAL::u(1000000));
m_mcms->irq_cb().set(FUNC(a2bus_mcms1_device::irq_w));
m_mcms->add_route(0, "mcms_l", 1.0);
m_mcms->add_route(1, "mcms_r", 1.0);
@@ -62,14 +62,14 @@ void a2bus_mcms1_device::device_add_mconfig(machine_config &config)
// LIVE DEVICE - Card 1
//**************************************************************************
-a2bus_mcms1_device::a2bus_mcms1_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_mcms1_device::a2bus_mcms1_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_a2bus_card_interface(mconfig, *this),
m_mcms(*this, ENGINE_TAG)
{
}
-a2bus_mcms1_device::a2bus_mcms1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_mcms1_device::a2bus_mcms1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_mcms1_device(mconfig, A2BUS_MCMS1, tag, owner, clock)
{
}
@@ -139,13 +139,13 @@ WRITE_LINE_MEMBER(a2bus_mcms1_device::irq_w)
// LIVE DEVICE - Card 2
//**************************************************************************
-a2bus_mcms2_device::a2bus_mcms2_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_mcms2_device::a2bus_mcms2_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_a2bus_card_interface(mconfig, *this), m_card1(nullptr), m_engine(nullptr)
{
}
-a2bus_mcms2_device::a2bus_mcms2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_mcms2_device::a2bus_mcms2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_mcms2_device(mconfig, A2BUS_MCMS2, tag, owner, clock)
{
}
@@ -196,7 +196,7 @@ void a2bus_mcms2_device::write_cnxx(uint8_t offset, uint8_t data)
Sound device implementation
*/
-mcms_device::mcms_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+mcms_device::mcms_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, MCMS, tag, owner, clock),
device_sound_interface(mconfig, *this),
m_write_irq(*this), m_stream(nullptr), m_timer(nullptr), m_clrtimer(nullptr), m_pBusDevice(nullptr), m_enabled(false), m_mastervol(0), m_rand(0)
diff --git a/src/devices/bus/a2bus/a2mcms.h b/src/devices/bus/a2bus/a2mcms.h
index 371c74c54fa..3340fdcbc1d 100644
--- a/src/devices/bus/a2bus/a2mcms.h
+++ b/src/devices/bus/a2bus/a2mcms.h
@@ -25,7 +25,7 @@ class mcms_device : public device_t, public device_sound_interface
{
public:
// construction/destruction
- mcms_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ mcms_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
void voiceregs_w(offs_t offset, uint8_t data);
void control_w(offs_t offset, uint8_t data);
@@ -67,7 +67,7 @@ class a2bus_mcms1_device:
{
public:
// construction/destruction
- a2bus_mcms1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_mcms1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
// comms from card 2 (oscillator parameter writes)
mcms_device *get_engine(void);
@@ -75,7 +75,7 @@ public:
required_device<mcms_device> m_mcms;
protected:
- a2bus_mcms1_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_mcms1_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
@@ -98,10 +98,10 @@ class a2bus_mcms2_device:
{
public:
// construction/destruction
- a2bus_mcms2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_mcms2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- a2bus_mcms2_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_mcms2_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
diff --git a/src/devices/bus/a2bus/a2memexp.cpp b/src/devices/bus/a2bus/a2memexp.cpp
index 4c10de81848..1984b00c13a 100644
--- a/src/devices/bus/a2bus/a2memexp.cpp
+++ b/src/devices/bus/a2bus/a2memexp.cpp
@@ -48,7 +48,7 @@ public:
protected:
// construction/destruction
- a2bus_memexp_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_memexp_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
@@ -71,13 +71,13 @@ private:
class a2bus_memexpapple_device : public a2bus_memexp_device
{
public:
- a2bus_memexpapple_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_memexpapple_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
};
class a2bus_ramfactor_device : public a2bus_memexp_device
{
public:
- a2bus_ramfactor_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_ramfactor_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;
@@ -113,7 +113,7 @@ const tiny_rom_entry *a2bus_ramfactor_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_memexp_device::a2bus_memexp_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_memexp_device::a2bus_memexp_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_a2bus_card_interface(mconfig, *this), m_isramfactor(false), m_bankhior(0), m_addrmask(0),
m_rom(*this, MEMEXP_ROM_REGION),
@@ -121,7 +121,7 @@ a2bus_memexp_device::a2bus_memexp_device(const machine_config &mconfig, device_t
{
}
-a2bus_memexpapple_device::a2bus_memexpapple_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_memexpapple_device::a2bus_memexpapple_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_memexp_device(mconfig, A2BUS_MEMEXP, tag, owner, clock)
{
m_isramfactor = false;
@@ -129,7 +129,7 @@ a2bus_memexpapple_device::a2bus_memexpapple_device(const machine_config &mconfig
m_addrmask = 0xfffff;
}
-a2bus_ramfactor_device::a2bus_ramfactor_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_ramfactor_device::a2bus_ramfactor_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_memexp_device(mconfig, A2BUS_RAMFACTOR, tag, owner, clock)
{
m_isramfactor = true;
diff --git a/src/devices/bus/a2bus/a2midi.cpp b/src/devices/bus/a2bus/a2midi.cpp
index f1cc7ecb2a6..392fea79bae 100644
--- a/src/devices/bus/a2bus/a2midi.cpp
+++ b/src/devices/bus/a2bus/a2midi.cpp
@@ -37,10 +37,10 @@ class a2bus_midi_device:
{
public:
// construction/destruction
- a2bus_midi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_midi_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- a2bus_midi_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_midi_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
@@ -66,11 +66,11 @@ private:
void a2bus_midi_device::device_add_mconfig(machine_config &config)
{
- 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(a2bus_midi_device::ptm_irq_w));
- 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(a2bus_midi_device::acia_irq_w));
@@ -78,7 +78,7 @@ void a2bus_midi_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(a2bus_midi_device::write_acia_clock));
}
@@ -86,12 +86,12 @@ void a2bus_midi_device::device_add_mconfig(machine_config &config)
// LIVE DEVICE
//**************************************************************************
-a2bus_midi_device::a2bus_midi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_midi_device::a2bus_midi_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_midi_device(mconfig, A2BUS_MIDI, tag, owner, clock)
{
}
-a2bus_midi_device::a2bus_midi_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_midi_device::a2bus_midi_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_a2bus_card_interface(mconfig, *this),
m_ptm(*this, MIDI_PTM_TAG),
diff --git a/src/devices/bus/a2bus/a2mockingboard.cpp b/src/devices/bus/a2bus/a2mockingboard.cpp
index 0968d55c9a0..56c956950ab 100644
--- a/src/devices/bus/a2bus/a2mockingboard.cpp
+++ b/src/devices/bus/a2bus/a2mockingboard.cpp
@@ -54,7 +54,7 @@ public:
protected:
// construction/destruction
- a2bus_ayboard_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_ayboard_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
@@ -80,7 +80,7 @@ protected:
class a2bus_mockingboard_device : public a2bus_ayboard_device
{
public:
- a2bus_mockingboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_mockingboard_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
virtual void via1_out_b(u8 data) override;
protected:
@@ -99,7 +99,7 @@ private:
class a2bus_phasor_device : public a2bus_ayboard_device
{
public:
- a2bus_phasor_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_phasor_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
void via1_out_b(u8 data) override;
void via2_out_b(u8 data) override;
@@ -124,7 +124,7 @@ private:
class a2bus_echoplus_device : public a2bus_ayboard_device
{
public:
- a2bus_echoplus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_echoplus_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
virtual void device_add_mconfig(machine_config &config) override;
@@ -145,13 +145,13 @@ protected:
void a2bus_ayboard_device::add_common_devices(machine_config &config)
{
- MOS6522(config, m_via1, 1022727);
+ MOS6522(config, m_via1, XTAL::u(1022727));
m_via1->readpa_handler().set(FUNC(a2bus_ayboard_device::via1_in_a));
m_via1->writepa_handler().set(FUNC(a2bus_ayboard_device::via1_out_a));
m_via1->writepb_handler().set(FUNC(a2bus_ayboard_device::via1_out_b));
m_via1->irq_handler().set(FUNC(a2bus_ayboard_device::via1_irq_w));
- MOS6522(config, m_via2, 1022727);
+ MOS6522(config, m_via2, XTAL::u(1022727));
m_via2->readpa_handler().set(FUNC(a2bus_ayboard_device::via2_in_a));
m_via2->writepa_handler().set(FUNC(a2bus_ayboard_device::via2_out_a));
m_via2->writepb_handler().set(FUNC(a2bus_ayboard_device::via2_out_b));
@@ -159,7 +159,7 @@ void a2bus_ayboard_device::add_common_devices(machine_config &config)
SPEAKER(config, "lspeaker").front_left();
SPEAKER(config, "rspeaker").front_right();
- AY8913(config, m_ay1, 1022727);
+ AY8913(config, m_ay1, XTAL::u(1022727));
m_ay1->add_route(ALL_OUTPUTS, "lspeaker", 0.5);
}
@@ -167,7 +167,7 @@ void a2bus_ayboard_device::device_add_mconfig(machine_config &config)
{
add_common_devices(config);
- AY8913(config, m_ay2, 1022727);
+ AY8913(config, m_ay2, XTAL::u(1022727));
m_ay2->add_route(ALL_OUTPUTS, "rspeaker", 0.5);
}
@@ -178,10 +178,10 @@ void a2bus_mockingboard_device::device_add_mconfig(machine_config &config)
m_via1->writepb_handler().set(FUNC(a2bus_mockingboard_device::via1_out_b));
m_via1->cb2_handler().set(FUNC(a2bus_mockingboard_device::write_via1_cb2));
- AY8913(config, m_ay2, 1022727);
+ AY8913(config, m_ay2, XTAL::u(1022727));
m_ay2->add_route(ALL_OUTPUTS, "rspeaker", 0.5);
- VOTRAX_SC01(config, m_sc01, 1022727);
+ VOTRAX_SC01(config, m_sc01, XTAL::u(1022727));
m_sc01->ar_callback().set(m_via1, FUNC(via6522_device::write_cb1));
m_sc01->add_route(ALL_OUTPUTS, "lspeaker", 1.0);
m_sc01->add_route(ALL_OUTPUTS, "rspeaker", 1.0);
@@ -196,9 +196,9 @@ void a2bus_phasor_device::device_add_mconfig(machine_config &config)
SPEAKER(config, "lspeaker2").front_left();
SPEAKER(config, "rspeaker2").front_right();
- AY8913(config, m_ay2, 1022727);
- AY8913(config, m_ay3, 1022727);
- AY8913(config, m_ay4, 1022727);
+ AY8913(config, m_ay2, XTAL::u(1022727));
+ AY8913(config, m_ay3, XTAL::u(1022727));
+ AY8913(config, m_ay4, XTAL::u(1022727));
m_ay2->add_route(ALL_OUTPUTS, "lspeaker2", 0.5);
m_ay3->add_route(ALL_OUTPUTS, "rspeaker", 0.5);
m_ay4->add_route(ALL_OUTPUTS, "rspeaker2", 0.5);
@@ -211,11 +211,11 @@ void a2bus_echoplus_device::device_add_mconfig(machine_config &config)
config.device_remove(VIA2_TAG);
m_via1->writepb_handler().set(FUNC(a2bus_ayboard_device::via1_out_b));
- AY8913(config, m_ay2, 1022727);
+ AY8913(config, m_ay2, XTAL::u(1022727));
m_ay2->add_route(ALL_OUTPUTS, "rspeaker", 0.5);
SPEAKER(config, "echosp").front_center();
- TMS5220(config, m_tms, 640000);
+ TMS5220(config, m_tms, XTAL::u(640000));
// echo+ has a TSP5220C soldered down on it
m_tms->add_route(ALL_OUTPUTS, "echosp", 1.0);
}
@@ -224,7 +224,7 @@ void a2bus_echoplus_device::device_add_mconfig(machine_config &config)
// LIVE DEVICE
//**************************************************************************
-a2bus_ayboard_device::a2bus_ayboard_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_ayboard_device::a2bus_ayboard_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_a2bus_card_interface(mconfig, *this),
m_via1(*this, VIA1_TAG),
@@ -236,13 +236,13 @@ a2bus_ayboard_device::a2bus_ayboard_device(const machine_config &mconfig, device
{
}
-a2bus_mockingboard_device::a2bus_mockingboard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_mockingboard_device::a2bus_mockingboard_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_ayboard_device(mconfig, A2BUS_MOCKINGBOARD, tag, owner, clock),
m_sc01(*this, "sc01")
{
}
-a2bus_phasor_device::a2bus_phasor_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_phasor_device::a2bus_phasor_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_ayboard_device(mconfig, A2BUS_PHASOR, tag, owner, clock),
m_ay3(*this, AY3_TAG),
m_ay4(*this, AY4_TAG),
@@ -250,7 +250,7 @@ a2bus_phasor_device::a2bus_phasor_device(const machine_config &mconfig, const ch
{
}
-a2bus_echoplus_device::a2bus_echoplus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_echoplus_device::a2bus_echoplus_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_ayboard_device(mconfig, A2BUS_ECHOPLUS, tag, owner, clock),
m_tms(*this, E2P_TMS_TAG)
{
@@ -628,10 +628,10 @@ void a2bus_phasor_device::set_clocks()
}
else
{
- m_ay1->set_clock(1022727);
- m_ay2->set_clock(1022727);
- m_ay3->set_clock(1022727);
- m_ay4->set_clock(1022727);
+ m_ay1->set_clock(XTAL::u(1022727));
+ m_ay2->set_clock(XTAL::u(1022727));
+ m_ay3->set_clock(XTAL::u(1022727));
+ m_ay4->set_clock(XTAL::u(1022727));
}
}
diff --git a/src/devices/bus/a2bus/a2parprn.cpp b/src/devices/bus/a2bus/a2parprn.cpp
index c79f04f6da8..4acbf05bac6 100644
--- a/src/devices/bus/a2bus/a2parprn.cpp
+++ b/src/devices/bus/a2bus/a2parprn.cpp
@@ -14,7 +14,7 @@ namespace {
class a2bus_parprn_device : public device_t, public device_a2bus_card_interface
{
public:
- a2bus_parprn_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock);
+ a2bus_parprn_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock);
// device_a2bus_card_interface implementation
virtual u8 read_c0nx(u8 offset) override;
@@ -104,7 +104,7 @@ INPUT_PORTS_END
-a2bus_parprn_device::a2bus_parprn_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock) :
+a2bus_parprn_device::a2bus_parprn_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, A2BUS_PARPRN, tag, owner, clock),
device_a2bus_card_interface(mconfig, *this),
m_printer_conn(*this, "prn"),
diff --git a/src/devices/bus/a2bus/a2pic.cpp b/src/devices/bus/a2bus/a2pic.cpp
index 537abe313ad..f4f311e22b0 100644
--- a/src/devices/bus/a2bus/a2pic.cpp
+++ b/src/devices/bus/a2bus/a2pic.cpp
@@ -14,7 +14,7 @@ namespace {
class a2bus_pic_device : public device_t, public device_a2bus_card_interface
{
public:
- a2bus_pic_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock);
+ a2bus_pic_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock);
// DIP switch/jumper handlers
DECLARE_INPUT_CHANGED_MEMBER(sw1_strobe);
@@ -126,7 +126,7 @@ INPUT_PORTS_END
-a2bus_pic_device::a2bus_pic_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock) :
+a2bus_pic_device::a2bus_pic_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, A2BUS_PIC, tag, owner, clock),
device_a2bus_card_interface(mconfig, *this),
m_printer_conn(*this, "prn"),
diff --git a/src/devices/bus/a2bus/a2sam.cpp b/src/devices/bus/a2bus/a2sam.cpp
index ecedc1eaa61..03921c099b8 100644
--- a/src/devices/bus/a2bus/a2sam.cpp
+++ b/src/devices/bus/a2bus/a2sam.cpp
@@ -28,7 +28,7 @@ class a2bus_sam_device:
{
public:
// construction/destruction
- a2bus_sam_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+ a2bus_sam_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, A2BUS_SAM, tag, owner, clock),
device_a2bus_card_interface(mconfig, *this),
m_dac(*this, "dac")
@@ -54,7 +54,7 @@ protected:
void a2bus_sam_device::device_add_mconfig(machine_config &config)
{
SPEAKER(config, "speaker").front_center();
- DAC_8BIT_R2R(config, m_dac, 0).add_route(ALL_OUTPUTS, "speaker", 0.5); // unknown DAC
+ DAC_8BIT_R2R(config, m_dac).add_route(ALL_OUTPUTS, "speaker", 0.5); // unknown DAC
}
} // anonymous namespace
diff --git a/src/devices/bus/a2bus/a2scsi.cpp b/src/devices/bus/a2bus/a2scsi.cpp
index fb3e7e8e222..b5cfdb65903 100644
--- a/src/devices/bus/a2bus/a2scsi.cpp
+++ b/src/devices/bus/a2bus/a2scsi.cpp
@@ -90,7 +90,7 @@ const tiny_rom_entry *a2bus_scsi_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_scsi_device::a2bus_scsi_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_scsi_device::a2bus_scsi_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_a2bus_card_interface(mconfig, *this),
m_ncr5380(*this, SCSI_5380_TAG),
@@ -98,7 +98,7 @@ a2bus_scsi_device::a2bus_scsi_device(const machine_config &mconfig, device_type
{
}
-a2bus_scsi_device::a2bus_scsi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_scsi_device::a2bus_scsi_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_scsi_device(mconfig, A2BUS_SCSI, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/a2scsi.h b/src/devices/bus/a2bus/a2scsi.h
index 098e7848563..06a49fd9115 100644
--- a/src/devices/bus/a2bus/a2scsi.h
+++ b/src/devices/bus/a2bus/a2scsi.h
@@ -26,12 +26,12 @@ class a2bus_scsi_device:
{
public:
// construction/destruction
- a2bus_scsi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_scsi_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
DECLARE_WRITE_LINE_MEMBER( drq_w );
protected:
- a2bus_scsi_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_scsi_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
diff --git a/src/devices/bus/a2bus/a2sd.cpp b/src/devices/bus/a2bus/a2sd.cpp
index c5f1e743d0f..f20c57acfdc 100644
--- a/src/devices/bus/a2bus/a2sd.cpp
+++ b/src/devices/bus/a2bus/a2sd.cpp
@@ -62,9 +62,9 @@ ROM_END
//-------------------------------------------------
void a2bus_a2sd_device::device_add_mconfig(machine_config &config)
{
- AT28C64B(config, m_flash, 0);
+ AT28C64B(config, m_flash);
- SPI_SDCARD(config, m_sdcard, 0);
+ SPI_SDCARD(config, m_sdcard);
m_sdcard->spi_miso_callback().set(FUNC(a2bus_a2sd_device::spi_miso_w));
}
@@ -81,7 +81,7 @@ const tiny_rom_entry *a2bus_a2sd_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_a2sd_device::a2bus_a2sd_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_a2sd_device::a2bus_a2sd_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_a2bus_card_interface(mconfig, *this),
m_flash(*this, "flash"),
@@ -90,7 +90,7 @@ a2bus_a2sd_device::a2bus_a2sd_device(const machine_config &mconfig, device_type
{
}
-a2bus_a2sd_device::a2bus_a2sd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_a2sd_device::a2bus_a2sd_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_a2sd_device(mconfig, A2BUS_A2SD, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/a2sd.h b/src/devices/bus/a2bus/a2sd.h
index 88414ec39d3..fe0730e11d2 100644
--- a/src/devices/bus/a2bus/a2sd.h
+++ b/src/devices/bus/a2bus/a2sd.h
@@ -27,10 +27,10 @@ class a2bus_a2sd_device:
{
public:
// construction/destruction
- a2bus_a2sd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_a2sd_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- a2bus_a2sd_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_a2sd_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
diff --git a/src/devices/bus/a2bus/a2softcard.cpp b/src/devices/bus/a2bus/a2softcard.cpp
index bab2ea728f8..24a16a650b8 100644
--- a/src/devices/bus/a2bus/a2softcard.cpp
+++ b/src/devices/bus/a2bus/a2softcard.cpp
@@ -47,14 +47,14 @@ void a2bus_softcard_device::device_add_mconfig(machine_config &config)
// LIVE DEVICE
//**************************************************************************
-a2bus_softcard_device::a2bus_softcard_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_softcard_device::a2bus_softcard_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_a2bus_card_interface(mconfig, *this),
m_z80(*this, Z80_TAG), m_bEnabled(false), m_FirstZ80Boot(false)
{
}
-a2bus_softcard_device::a2bus_softcard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_softcard_device::a2bus_softcard_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_softcard_device(mconfig, A2BUS_SOFTCARD, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/a2softcard.h b/src/devices/bus/a2bus/a2softcard.h
index de2ee0e220b..2767f6b73f7 100644
--- a/src/devices/bus/a2bus/a2softcard.h
+++ b/src/devices/bus/a2bus/a2softcard.h
@@ -23,10 +23,10 @@ class a2bus_softcard_device:
{
public:
// construction/destruction
- a2bus_softcard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_softcard_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- a2bus_softcard_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_softcard_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
diff --git a/src/devices/bus/a2bus/a2ssc.cpp b/src/devices/bus/a2bus/a2ssc.cpp
index 61ab1efc30b..1c77983e713 100644
--- a/src/devices/bus/a2bus/a2ssc.cpp
+++ b/src/devices/bus/a2bus/a2ssc.cpp
@@ -32,10 +32,10 @@ class a2bus_ssc_device:
{
public:
// construction/destruction
- a2bus_ssc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_ssc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- a2bus_ssc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_ssc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
@@ -63,7 +63,7 @@ class apricorn_ssi_device : public a2bus_ssc_device
{
public:
// construction/destruction
- apricorn_ssi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ apricorn_ssi_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
virtual void device_start() override;
@@ -269,7 +269,7 @@ ioport_constructor apricorn_ssi_device::device_input_ports() const
void a2bus_ssc_device::device_add_mconfig(machine_config &config)
{
- MOS6551(config, m_acia, 0);
+ MOS6551(config, m_acia);
m_acia->set_xtal(1.8432_MHz_XTAL);
m_acia->irq_handler().set(FUNC(a2bus_ssc_device::acia_irq_w));
m_acia->txd_handler().set("rs232", FUNC(rs232_port_device::write_txd));
@@ -301,12 +301,12 @@ const tiny_rom_entry *apricorn_ssi_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_ssc_device::a2bus_ssc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_ssc_device::a2bus_ssc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_ssc_device(mconfig, A2BUS_SSC, tag, owner, clock)
{
}
-a2bus_ssc_device::a2bus_ssc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_ssc_device::a2bus_ssc_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_a2bus_card_interface(mconfig, *this),
m_dsw1(*this, "DSW1"),
@@ -317,7 +317,7 @@ a2bus_ssc_device::a2bus_ssc_device(const machine_config &mconfig, device_type ty
{
}
-apricorn_ssi_device::apricorn_ssi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+apricorn_ssi_device::apricorn_ssi_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_ssc_device(mconfig, APRICORN_SSI, tag, owner, clock),
m_alt_bank(false)
{
diff --git a/src/devices/bus/a2bus/a2superdrive.cpp b/src/devices/bus/a2bus/a2superdrive.cpp
index 7fb5820caa9..285d6dd0e80 100644
--- a/src/devices/bus/a2bus/a2superdrive.cpp
+++ b/src/devices/bus/a2bus/a2superdrive.cpp
@@ -55,10 +55,10 @@ class a2bus_superdrive_device:
{
public:
// construction/destruction
- a2bus_superdrive_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_superdrive_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- a2bus_superdrive_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_superdrive_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
@@ -138,7 +138,7 @@ void a2bus_superdrive_device::device_add_mconfig(machine_config &config)
-a2bus_superdrive_device::a2bus_superdrive_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_superdrive_device::a2bus_superdrive_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_a2bus_card_interface(mconfig, *this),
m_65c02(*this, "superdrive_65c02"),
@@ -149,7 +149,7 @@ a2bus_superdrive_device::a2bus_superdrive_device(const machine_config &mconfig,
m_side(0)
{ }
-a2bus_superdrive_device::a2bus_superdrive_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock):
+a2bus_superdrive_device::a2bus_superdrive_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock):
a2bus_superdrive_device(mconfig, A2BUS_SUPERDRIVE, tag, owner, clock)
{ }
diff --git a/src/devices/bus/a2bus/a2swyft.cpp b/src/devices/bus/a2bus/a2swyft.cpp
index 6d9701d3a04..ac10b27924e 100644
--- a/src/devices/bus/a2bus/a2swyft.cpp
+++ b/src/devices/bus/a2bus/a2swyft.cpp
@@ -37,12 +37,12 @@ class a2bus_swyft_device:
{
public:
// construction/destruction
- a2bus_swyft_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_swyft_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
virtual const tiny_rom_entry *device_rom_region() const override;
protected:
- a2bus_swyft_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_swyft_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
@@ -73,12 +73,12 @@ const tiny_rom_entry *a2bus_swyft_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_swyft_device::a2bus_swyft_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_swyft_device::a2bus_swyft_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_swyft_device(mconfig, A2BUS_SWYFT, tag, owner, clock)
{
}
-a2bus_swyft_device::a2bus_swyft_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_swyft_device::a2bus_swyft_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_a2bus_card_interface(mconfig, *this),
m_rom(*this, SWYFT_ROM_REGION)
diff --git a/src/devices/bus/a2bus/a2themill.cpp b/src/devices/bus/a2bus/a2themill.cpp
index 44925c4c68b..837f0a584c6 100644
--- a/src/devices/bus/a2bus/a2themill.cpp
+++ b/src/devices/bus/a2bus/a2themill.cpp
@@ -68,7 +68,7 @@ ioport_constructor a2bus_themill_device::device_input_ports() const
void a2bus_themill_device::device_add_mconfig(machine_config &config)
{
- MC6809E(config, m_6809, 1021800); // 6809E runs at ~1 MHz as per Stellation Two's print ads
+ MC6809E(config, m_6809, XTAL::u(1021800)); // 6809E runs at ~1 MHz as per Stellation Two's print ads
m_6809->set_addrmap(AS_PROGRAM, &a2bus_themill_device::m6809_mem);
}
@@ -76,7 +76,7 @@ void a2bus_themill_device::device_add_mconfig(machine_config &config)
// LIVE DEVICE
//**************************************************************************
-a2bus_themill_device::a2bus_themill_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+a2bus_themill_device::a2bus_themill_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_a2bus_card_interface(mconfig, *this)
, m_6809(*this, "m6809")
@@ -88,7 +88,7 @@ a2bus_themill_device::a2bus_themill_device(const machine_config &mconfig, device
{
}
-a2bus_themill_device::a2bus_themill_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_themill_device::a2bus_themill_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_themill_device(mconfig, A2BUS_THEMILL, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/a2themill.h b/src/devices/bus/a2bus/a2themill.h
index 59f0c2316d1..71285642c3d 100644
--- a/src/devices/bus/a2bus/a2themill.h
+++ b/src/devices/bus/a2bus/a2themill.h
@@ -25,10 +25,10 @@ class a2bus_themill_device:
{
public:
// construction/destruction
- a2bus_themill_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_themill_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- a2bus_themill_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_themill_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
diff --git a/src/devices/bus/a2bus/a2thunderclock.cpp b/src/devices/bus/a2bus/a2thunderclock.cpp
index c109be5c276..260de5c5d4b 100644
--- a/src/devices/bus/a2bus/a2thunderclock.cpp
+++ b/src/devices/bus/a2bus/a2thunderclock.cpp
@@ -55,10 +55,10 @@ class a2bus_thunderclock_device:
{
public:
// construction/destruction
- a2bus_thunderclock_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_thunderclock_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- a2bus_thunderclock_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_thunderclock_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
@@ -107,7 +107,7 @@ const tiny_rom_entry *a2bus_thunderclock_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_thunderclock_device::a2bus_thunderclock_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_thunderclock_device::a2bus_thunderclock_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_a2bus_card_interface(mconfig, *this),
m_upd1990ac(*this, THUNDERCLOCK_UPD1990_TAG),
@@ -116,7 +116,7 @@ a2bus_thunderclock_device::a2bus_thunderclock_device(const machine_config &mconf
{
}
-a2bus_thunderclock_device::a2bus_thunderclock_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_thunderclock_device::a2bus_thunderclock_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_thunderclock_device(mconfig, A2BUS_THUNDERCLOCK, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/a2ultraterm.cpp b/src/devices/bus/a2bus/a2ultraterm.cpp
index 468c7402c46..fea8fa92aa1 100644
--- a/src/devices/bus/a2bus/a2ultraterm.cpp
+++ b/src/devices/bus/a2bus/a2ultraterm.cpp
@@ -104,7 +104,7 @@ class a2bus_videx160_device:
{
protected:
// construction/destruction
- a2bus_videx160_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_videx160_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
@@ -135,7 +135,7 @@ private:
class a2bus_ultraterm_device : public a2bus_videx160_device
{
public:
- a2bus_ultraterm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_ultraterm_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
virtual const tiny_rom_entry *device_rom_region() const override;
};
@@ -143,7 +143,7 @@ public:
class a2bus_ultratermenh_device : public a2bus_videx160_device
{
public:
- a2bus_ultratermenh_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_ultratermenh_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
virtual const tiny_rom_entry *device_rom_region() const override;
};
@@ -188,7 +188,7 @@ const tiny_rom_entry *a2bus_ultratermenh_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_videx160_device::a2bus_videx160_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_videx160_device::a2bus_videx160_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_a2bus_card_interface(mconfig, *this),
m_framecnt(0), m_ctrl1(0), m_ctrl2(0),
@@ -199,12 +199,12 @@ a2bus_videx160_device::a2bus_videx160_device(const machine_config &mconfig, devi
{
}
-a2bus_ultraterm_device::a2bus_ultraterm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_ultraterm_device::a2bus_ultraterm_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_videx160_device(mconfig, A2BUS_ULTRATERM, tag, owner, clock)
{
}
-a2bus_ultratermenh_device::a2bus_ultratermenh_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_ultratermenh_device::a2bus_ultratermenh_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_videx160_device(mconfig, A2BUS_ULTRATERMENH, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/a2videoterm.cpp b/src/devices/bus/a2bus/a2videoterm.cpp
index c5c75fc3323..3b17a680593 100644
--- a/src/devices/bus/a2bus/a2videoterm.cpp
+++ b/src/devices/bus/a2bus/a2videoterm.cpp
@@ -106,7 +106,7 @@ class a2bus_videx80_device:
{
protected:
// construction/destruction
- a2bus_videx80_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_videx80_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
@@ -134,7 +134,7 @@ protected:
class a2bus_videoterm_device : public a2bus_videx80_device
{
public:
- a2bus_videoterm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_videoterm_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
virtual const tiny_rom_entry *device_rom_region() const override;
};
@@ -142,7 +142,7 @@ public:
class a2bus_ap16_device : public a2bus_videx80_device
{
public:
- a2bus_ap16_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_ap16_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_add_mconfig(machine_config &config) override;
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -155,7 +155,7 @@ protected:
class a2bus_ap16alt_device : public a2bus_videx80_device
{
public:
- a2bus_ap16alt_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_ap16alt_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_add_mconfig(machine_config &config) override;
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -167,7 +167,7 @@ protected:
class a2bus_vtc1_device : public a2bus_videx80_device
{
public:
- a2bus_vtc1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_vtc1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_add_mconfig(machine_config &config) override;
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -176,7 +176,7 @@ public:
class a2bus_aevm80_device : public a2bus_videx80_device
{
public:
- a2bus_aevm80_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_aevm80_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_add_mconfig(machine_config &config) override;
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -275,7 +275,7 @@ const tiny_rom_entry *a2bus_aevm80_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_videx80_device::a2bus_videx80_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_videx80_device::a2bus_videx80_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_a2bus_card_interface(mconfig, *this),
m_crtc(*this, VIDEOTERM_MC6845_NAME),
@@ -286,28 +286,28 @@ a2bus_videx80_device::a2bus_videx80_device(const machine_config &mconfig, device
{
}
-a2bus_videoterm_device::a2bus_videoterm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_videoterm_device::a2bus_videoterm_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_videx80_device(mconfig, A2BUS_VIDEOTERM, tag, owner, clock)
{
}
-a2bus_ap16_device::a2bus_ap16_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_ap16_device::a2bus_ap16_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_videx80_device(mconfig, A2BUS_IBSAP16, tag, owner, clock)
{
}
-a2bus_ap16alt_device::a2bus_ap16alt_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_ap16alt_device::a2bus_ap16alt_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_videx80_device(mconfig, A2BUS_IBSAP16ALT, tag, owner, clock)
{
}
-a2bus_vtc1_device::a2bus_vtc1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_vtc1_device::a2bus_vtc1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_videx80_device(mconfig, A2BUS_VTC1, tag, owner, clock)
{
m_char_width = 11;
}
-a2bus_aevm80_device::a2bus_aevm80_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_aevm80_device::a2bus_aevm80_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_videx80_device(mconfig, A2BUS_AEVIEWMASTER80, tag, owner, clock)
{
m_char_width = 10;
diff --git a/src/devices/bus/a2bus/a2vulcan.cpp b/src/devices/bus/a2bus/a2vulcan.cpp
index 889e7df5de3..632b9c16b58 100644
--- a/src/devices/bus/a2bus/a2vulcan.cpp
+++ b/src/devices/bus/a2bus/a2vulcan.cpp
@@ -90,7 +90,7 @@ class a2bus_vulcanbase_device:
{
protected:
// construction/destruction
- a2bus_vulcanbase_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_vulcanbase_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
@@ -117,7 +117,7 @@ private:
class a2bus_vulcan_device : public a2bus_vulcanbase_device
{
public:
- a2bus_vulcan_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_vulcan_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;
@@ -127,7 +127,7 @@ protected:
class a2bus_vulcaniie_device : public a2bus_vulcanbase_device
{
public:
- a2bus_vulcaniie_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_vulcaniie_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;
@@ -137,7 +137,7 @@ protected:
class a2bus_vulcangold_device : public a2bus_vulcanbase_device
{
public:
- a2bus_vulcangold_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_vulcangold_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;
@@ -179,7 +179,7 @@ const tiny_rom_entry *a2bus_vulcangold_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_vulcanbase_device::a2bus_vulcanbase_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_vulcanbase_device::a2bus_vulcanbase_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_a2bus_card_interface(mconfig, *this),
m_ata(*this, VULCAN_ATA_TAG),
@@ -188,17 +188,17 @@ a2bus_vulcanbase_device::a2bus_vulcanbase_device(const machine_config &mconfig,
{
}
-a2bus_vulcan_device::a2bus_vulcan_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_vulcan_device::a2bus_vulcan_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_vulcanbase_device(mconfig, A2BUS_VULCAN, tag, owner, clock)
{
}
-a2bus_vulcaniie_device::a2bus_vulcaniie_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_vulcaniie_device::a2bus_vulcaniie_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_vulcanbase_device(mconfig, A2BUS_VULCANIIE, tag, owner, clock)
{
}
-a2bus_vulcangold_device::a2bus_vulcangold_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_vulcangold_device::a2bus_vulcangold_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_vulcanbase_device(mconfig, A2BUS_VULCANGOLD, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/a2zipdrive.cpp b/src/devices/bus/a2bus/a2zipdrive.cpp
index 9a59af1a431..77accaf4105 100644
--- a/src/devices/bus/a2bus/a2zipdrive.cpp
+++ b/src/devices/bus/a2bus/a2zipdrive.cpp
@@ -98,7 +98,7 @@ class a2bus_zipdrivebase_device:
{
protected:
// construction/destruction
- a2bus_zipdrivebase_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_zipdrivebase_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
@@ -120,13 +120,13 @@ protected:
class a2bus_zipdrive_device : public a2bus_zipdrivebase_device
{
public:
- a2bus_zipdrive_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_zipdrive_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
};
class a2bus_focusdrive_device : public a2bus_zipdrivebase_device
{
public:
- a2bus_focusdrive_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_focusdrive_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
virtual void device_reset() override;
@@ -166,7 +166,7 @@ const tiny_rom_entry *a2bus_focusdrive_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_zipdrivebase_device::a2bus_zipdrivebase_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_zipdrivebase_device::a2bus_zipdrivebase_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_a2bus_card_interface(mconfig, *this),
m_ata(*this, ZIPDRIVE_ATA_TAG),
@@ -175,12 +175,12 @@ a2bus_zipdrivebase_device::a2bus_zipdrivebase_device(const machine_config &mconf
{
}
-a2bus_zipdrive_device::a2bus_zipdrive_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_zipdrive_device::a2bus_zipdrive_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_zipdrivebase_device(mconfig, A2BUS_ZIPDRIVE, tag, owner, clock)
{
}
-a2bus_focusdrive_device::a2bus_focusdrive_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_focusdrive_device::a2bus_focusdrive_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_zipdrivebase_device(mconfig, A2BUS_FOCUSDRIVE, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/ace2x00.cpp b/src/devices/bus/a2bus/ace2x00.cpp
index ccea01c4ecc..922fea05c81 100644
--- a/src/devices/bus/a2bus/ace2x00.cpp
+++ b/src/devices/bus/a2bus/ace2x00.cpp
@@ -41,18 +41,18 @@ void a2bus_ace2x00_device::device_add_mconfig(machine_config &config)
// LIVE DEVICE
//**************************************************************************
-a2bus_ace2x00_device::a2bus_ace2x00_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_ace2x00_device::a2bus_ace2x00_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_a2bus_card_interface(mconfig, *this), m_rom(nullptr)
{
}
-a2bus_ace2x00_slot1_device::a2bus_ace2x00_slot1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_ace2x00_slot1_device::a2bus_ace2x00_slot1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_ace2x00_device(mconfig, A2BUS_ACE2X00_SLOT1, tag, owner, clock)
{
}
-a2bus_ace2x00_slot6_device::a2bus_ace2x00_slot6_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_ace2x00_slot6_device::a2bus_ace2x00_slot6_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_ace2x00_device(mconfig, A2BUS_ACE2X00_SLOT6, tag, owner, clock),
m_iwm(*this, "iwm"),
m_floppy(*this, "%u", 0U)
diff --git a/src/devices/bus/a2bus/ace2x00.h b/src/devices/bus/a2bus/ace2x00.h
index 9714f5aa965..2f041728df2 100644
--- a/src/devices/bus/a2bus/ace2x00.h
+++ b/src/devices/bus/a2bus/ace2x00.h
@@ -28,7 +28,7 @@ class a2bus_ace2x00_device:
{
public:
// construction/destruction
- a2bus_ace2x00_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_ace2x00_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
protected:
virtual void device_start() override;
@@ -47,7 +47,7 @@ protected:
class a2bus_ace2x00_slot1_device : public a2bus_ace2x00_device
{
public:
- a2bus_ace2x00_slot1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_ace2x00_slot1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
};
@@ -55,7 +55,7 @@ protected:
class a2bus_ace2x00_slot6_device : public a2bus_ace2x00_device
{
public:
- a2bus_ace2x00_slot6_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_ace2x00_slot6_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
virtual void device_add_mconfig(machine_config &config) override;
diff --git a/src/devices/bus/a2bus/agat7langcard.cpp b/src/devices/bus/a2bus/agat7langcard.cpp
index 05a8b87d3c3..70beed95351 100644
--- a/src/devices/bus/a2bus/agat7langcard.cpp
+++ b/src/devices/bus/a2bus/agat7langcard.cpp
@@ -32,13 +32,13 @@ DEFINE_DEVICE_TYPE(A2BUS_AGAT7LANGCARD, a2bus_agat7langcard_device, "a7lang", "A
// LIVE DEVICE
//**************************************************************************
-a2bus_agat7langcard_device::a2bus_agat7langcard_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_agat7langcard_device::a2bus_agat7langcard_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_a2bus_card_interface(mconfig, *this), m_inh_state(0), m_dxxx_bank(0), m_main_bank(0), m_csr(0)
{
}
-a2bus_agat7langcard_device::a2bus_agat7langcard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_agat7langcard_device::a2bus_agat7langcard_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_agat7langcard_device(mconfig, A2BUS_AGAT7LANGCARD, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/agat7langcard.h b/src/devices/bus/a2bus/agat7langcard.h
index e7dae54ebfb..2884b273a1d 100644
--- a/src/devices/bus/a2bus/agat7langcard.h
+++ b/src/devices/bus/a2bus/agat7langcard.h
@@ -25,10 +25,10 @@ class a2bus_agat7langcard_device:
{
public:
// construction/destruction
- a2bus_agat7langcard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_agat7langcard_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- a2bus_agat7langcard_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_agat7langcard_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
diff --git a/src/devices/bus/a2bus/agat7ports.cpp b/src/devices/bus/a2bus/agat7ports.cpp
index afd196d6549..36c0e5dd7bc 100644
--- a/src/devices/bus/a2bus/agat7ports.cpp
+++ b/src/devices/bus/a2bus/agat7ports.cpp
@@ -63,7 +63,7 @@ void a2bus_agat7_ports_device::device_add_mconfig(machine_config &config)
output_latch_device &cent_data_out(OUTPUT_LATCH(config, "cent_data_out"));
m_centronics->set_output_latch(cent_data_out);
- I8251(config, m_d10, 0);
+ I8251(config, m_d10);
}
//-------------------------------------------------
@@ -80,7 +80,7 @@ ioport_constructor a2bus_agat7_ports_device::device_input_ports() const
// LIVE DEVICE
//**************************************************************************
-a2bus_agat7_ports_device::a2bus_agat7_ports_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+a2bus_agat7_ports_device::a2bus_agat7_ports_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_a2bus_card_interface(mconfig, *this)
, m_printer_cfg(*this, "PRINTER_CFG")
@@ -90,7 +90,7 @@ a2bus_agat7_ports_device::a2bus_agat7_ports_device(const machine_config &mconfig
{
}
-a2bus_agat7_ports_device::a2bus_agat7_ports_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_agat7_ports_device::a2bus_agat7_ports_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_agat7_ports_device(mconfig, A2BUS_AGAT7_PORTS, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/agat7ports.h b/src/devices/bus/a2bus/agat7ports.h
index 2ee4f38b4dd..51fc7230af3 100644
--- a/src/devices/bus/a2bus/agat7ports.h
+++ b/src/devices/bus/a2bus/agat7ports.h
@@ -30,10 +30,10 @@ class a2bus_agat7_ports_device:
{
public:
// construction/destruction
- a2bus_agat7_ports_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_agat7_ports_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- a2bus_agat7_ports_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_agat7_ports_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
diff --git a/src/devices/bus/a2bus/agat7ram.cpp b/src/devices/bus/a2bus/agat7ram.cpp
index ef0b7a3a335..a0a8bd37127 100644
--- a/src/devices/bus/a2bus/agat7ram.cpp
+++ b/src/devices/bus/a2bus/agat7ram.cpp
@@ -32,13 +32,13 @@ DEFINE_DEVICE_TYPE(A2BUS_AGAT7RAM, a2bus_agat7ram_device, "a7ram", "Agat-7 32K R
// LIVE DEVICE
//**************************************************************************
-a2bus_agat7ram_device::a2bus_agat7ram_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_agat7ram_device::a2bus_agat7ram_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_a2bus_card_interface(mconfig, *this), m_inh_state(0), m_main_bank(0), m_csr(0)
{
}
-a2bus_agat7ram_device::a2bus_agat7ram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_agat7ram_device::a2bus_agat7ram_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_agat7ram_device(mconfig, A2BUS_AGAT7RAM, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/agat7ram.h b/src/devices/bus/a2bus/agat7ram.h
index 6b8529fcb7b..81d65af83bc 100644
--- a/src/devices/bus/a2bus/agat7ram.h
+++ b/src/devices/bus/a2bus/agat7ram.h
@@ -25,10 +25,10 @@ class a2bus_agat7ram_device:
{
public:
// construction/destruction
- a2bus_agat7ram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_agat7ram_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- a2bus_agat7ram_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_agat7ram_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
diff --git a/src/devices/bus/a2bus/agat840k_hle.cpp b/src/devices/bus/a2bus/agat840k_hle.cpp
index cd6d01389b4..f0fdd572a0a 100644
--- a/src/devices/bus/a2bus/agat840k_hle.cpp
+++ b/src/devices/bus/a2bus/agat840k_hle.cpp
@@ -83,7 +83,7 @@ const tiny_rom_entry *a2bus_agat840k_hle_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_agat840k_hle_device::a2bus_agat840k_hle_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+a2bus_agat840k_hle_device::a2bus_agat840k_hle_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_a2bus_card_interface(mconfig, *this)
, m_floppy_image(*this, "floppy%u", 0U)
@@ -95,7 +95,7 @@ a2bus_agat840k_hle_device::a2bus_agat840k_hle_device(const machine_config &mconf
{
}
-a2bus_agat840k_hle_device::a2bus_agat840k_hle_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_agat840k_hle_device::a2bus_agat840k_hle_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_agat840k_hle_device(mconfig, A2BUS_AGAT840K_HLE, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/agat840k_hle.h b/src/devices/bus/a2bus/agat840k_hle.h
index a497f2bc7aa..5866344bad1 100644
--- a/src/devices/bus/a2bus/agat840k_hle.h
+++ b/src/devices/bus/a2bus/agat840k_hle.h
@@ -35,7 +35,7 @@ public:
};
// construction/destruction
- a2bus_agat840k_hle_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_agat840k_hle_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
uint8_t d14_i_b();
uint8_t d15_i_a();
@@ -51,7 +51,7 @@ public:
protected:
// construction/destruction
- a2bus_agat840k_hle_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_agat840k_hle_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
diff --git a/src/devices/bus/a2bus/agat_fdc.cpp b/src/devices/bus/a2bus/agat_fdc.cpp
index dc88c7ea39e..ce6ffe84934 100644
--- a/src/devices/bus/a2bus/agat_fdc.cpp
+++ b/src/devices/bus/a2bus/agat_fdc.cpp
@@ -104,7 +104,7 @@ const tiny_rom_entry *a2bus_agat_fdc_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_agat_fdc_device::a2bus_agat_fdc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+a2bus_agat_fdc_device::a2bus_agat_fdc_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_a2bus_card_interface(mconfig, *this)
, m_d14(*this, "d14")
@@ -116,7 +116,7 @@ a2bus_agat_fdc_device::a2bus_agat_fdc_device(const machine_config &mconfig, devi
{
}
-a2bus_agat_fdc_device::a2bus_agat_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_agat_fdc_device::a2bus_agat_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_agat_fdc_device(mconfig, A2BUS_AGAT_FDC, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/agat_fdc.h b/src/devices/bus/a2bus/agat_fdc.h
index 84bfd82b268..e7e72811171 100644
--- a/src/devices/bus/a2bus/agat_fdc.h
+++ b/src/devices/bus/a2bus/agat_fdc.h
@@ -32,7 +32,7 @@ class a2bus_agat_fdc_device:
{
public:
// construction/destruction
- a2bus_agat_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_agat_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
uint8_t d14_i_b();
uint8_t d15_i_a();
@@ -45,7 +45,7 @@ public:
protected:
// construction/destruction
- a2bus_agat_fdc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_agat_fdc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
diff --git a/src/devices/bus/a2bus/booti.cpp b/src/devices/bus/a2bus/booti.cpp
index 39c6b1055ba..734282e7302 100644
--- a/src/devices/bus/a2bus/booti.cpp
+++ b/src/devices/bus/a2bus/booti.cpp
@@ -45,10 +45,10 @@ class a2bus_booti_device:
{
public:
// construction/destruction
- a2bus_booti_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_booti_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- a2bus_booti_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_booti_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
@@ -80,7 +80,7 @@ private:
void a2bus_booti_device::device_add_mconfig(machine_config &config)
{
- AT28C64B(config, "flash", 0);
+ AT28C64B(config, "flash");
CH376(config, "ch376");
}
@@ -98,7 +98,7 @@ const tiny_rom_entry *a2bus_booti_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_booti_device::a2bus_booti_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_booti_device::a2bus_booti_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_a2bus_card_interface(mconfig, *this),
m_flash(*this, "flash"),
@@ -107,7 +107,7 @@ a2bus_booti_device::a2bus_booti_device(const machine_config &mconfig, device_typ
{
}
-a2bus_booti_device::a2bus_booti_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_booti_device::a2bus_booti_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_booti_device(mconfig, A2BUS_BOOTI, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/byte8251.cpp b/src/devices/bus/a2bus/byte8251.cpp
index ffe6c6325c0..f5d87b133b5 100644
--- a/src/devices/bus/a2bus/byte8251.cpp
+++ b/src/devices/bus/a2bus/byte8251.cpp
@@ -45,7 +45,7 @@ class a2bus_byte8251_device : public device_t, public device_a2bus_card_interfac
{
public:
// construction/destruction
- a2bus_byte8251_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ a2bus_byte8251_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
DECLARE_INPUT_CHANGED_MEMBER(rate_changed);
@@ -68,7 +68,7 @@ private:
required_ioport m_switches;
};
-a2bus_byte8251_device::a2bus_byte8251_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+a2bus_byte8251_device::a2bus_byte8251_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, A2BUS_BYTE8251, tag, owner, clock)
, device_a2bus_card_interface(mconfig, *this)
, m_usart(*this, "8251")
@@ -131,7 +131,7 @@ ioport_constructor a2bus_byte8251_device::device_input_ports() const
void a2bus_byte8251_device::device_add_mconfig(machine_config &config)
{
- I8251(config, m_usart, 1021800); // CLK tied to ϕ1 signal from bus pin 38
+ I8251(config, m_usart, XTAL::u(1021800)); // CLK tied to ϕ1 signal from bus pin 38
m_usart->txd_handler().set("rs232", FUNC(rs232_port_device::write_txd));
MM5307AA(config, m_brg, A2BUS_7M_CLOCK / 8);
diff --git a/src/devices/bus/a2bus/ccs7710.cpp b/src/devices/bus/a2bus/ccs7710.cpp
index 17f8cdfe80e..fe6b15f0af1 100644
--- a/src/devices/bus/a2bus/ccs7710.cpp
+++ b/src/devices/bus/a2bus/ccs7710.cpp
@@ -38,7 +38,7 @@ DEFINE_DEVICE_TYPE(A2BUS_CCS7710, ccs7710_device, "ccs7710", "CCS Model 7710 Asy
// DEVICE IMPLEMENTATION
//**************************************************************************
-ccs7710_device::ccs7710_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+ccs7710_device::ccs7710_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, A2BUS_CCS7710, tag, owner, clock)
, device_a2bus_card_interface(mconfig, *this)
, m_acia(*this, "acia")
diff --git a/src/devices/bus/a2bus/ccs7710.h b/src/devices/bus/a2bus/ccs7710.h
index db2a7616891..5b3db8a7073 100644
--- a/src/devices/bus/a2bus/ccs7710.h
+++ b/src/devices/bus/a2bus/ccs7710.h
@@ -19,7 +19,7 @@ class ccs7710_device : public device_t, public device_a2bus_card_interface
{
public:
// device type constructor
- ccs7710_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ ccs7710_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/a2bus/cmsscsi.cpp b/src/devices/bus/a2bus/cmsscsi.cpp
index 77a7ade3e6f..f0876e57972 100644
--- a/src/devices/bus/a2bus/cmsscsi.cpp
+++ b/src/devices/bus/a2bus/cmsscsi.cpp
@@ -88,7 +88,7 @@ const tiny_rom_entry *a2bus_cmsscsi_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_cmsscsi_device::a2bus_cmsscsi_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_cmsscsi_device::a2bus_cmsscsi_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_a2bus_card_interface(mconfig, *this),
m_ncr5380(*this, SCSI_5380_TAG),
@@ -96,7 +96,7 @@ a2bus_cmsscsi_device::a2bus_cmsscsi_device(const machine_config &mconfig, device
{
}
-a2bus_cmsscsi_device::a2bus_cmsscsi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_cmsscsi_device::a2bus_cmsscsi_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_cmsscsi_device(mconfig, A2BUS_CMSSCSI, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/cmsscsi.h b/src/devices/bus/a2bus/cmsscsi.h
index 8e417d76bc0..4d7a2ae6a56 100644
--- a/src/devices/bus/a2bus/cmsscsi.h
+++ b/src/devices/bus/a2bus/cmsscsi.h
@@ -26,12 +26,12 @@ class a2bus_cmsscsi_device:
{
public:
// construction/destruction
- a2bus_cmsscsi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_cmsscsi_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
DECLARE_WRITE_LINE_MEMBER( drq_w );
protected:
- a2bus_cmsscsi_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_cmsscsi_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
diff --git a/src/devices/bus/a2bus/computereyes2.cpp b/src/devices/bus/a2bus/computereyes2.cpp
index 979472d00ef..f1ec52c54df 100644
--- a/src/devices/bus/a2bus/computereyes2.cpp
+++ b/src/devices/bus/a2bus/computereyes2.cpp
@@ -28,10 +28,10 @@ class a2bus_computereyes2_device:
{
public:
// construction/destruction
- a2bus_computereyes2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_computereyes2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- a2bus_computereyes2_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_computereyes2_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
@@ -66,14 +66,14 @@ void a2bus_computereyes2_device::device_add_mconfig(machine_config &config)
// LIVE DEVICE
//**************************************************************************
-a2bus_computereyes2_device::a2bus_computereyes2_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_computereyes2_device::a2bus_computereyes2_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_a2bus_card_interface(mconfig, *this),
m_picture(*this, "srcimg")
{
}
-a2bus_computereyes2_device::a2bus_computereyes2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_computereyes2_device::a2bus_computereyes2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_computereyes2_device(mconfig, A2BUS_COMPUTEREYES2, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/corvfdc01.cpp b/src/devices/bus/a2bus/corvfdc01.cpp
index 212f49ed20b..be53e109f6f 100644
--- a/src/devices/bus/a2bus/corvfdc01.cpp
+++ b/src/devices/bus/a2bus/corvfdc01.cpp
@@ -103,7 +103,7 @@ const tiny_rom_entry *a2bus_corvfdc01_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_corvfdc01_device::a2bus_corvfdc01_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_corvfdc01_device::a2bus_corvfdc01_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_a2bus_card_interface(mconfig, *this),
m_wdfdc(*this, FDC01_FDC_TAG),
@@ -115,7 +115,7 @@ a2bus_corvfdc01_device::a2bus_corvfdc01_device(const machine_config &mconfig, de
{
}
-a2bus_corvfdc01_device::a2bus_corvfdc01_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_corvfdc01_device::a2bus_corvfdc01_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_corvfdc01_device(mconfig, A2BUS_CORVFDC01, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/corvfdc01.h b/src/devices/bus/a2bus/corvfdc01.h
index 5c92107fcbe..76e7f1b95f2 100644
--- a/src/devices/bus/a2bus/corvfdc01.h
+++ b/src/devices/bus/a2bus/corvfdc01.h
@@ -28,10 +28,10 @@ class a2bus_corvfdc01_device:
{
public:
// construction/destruction
- a2bus_corvfdc01_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_corvfdc01_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- a2bus_corvfdc01_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_corvfdc01_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
diff --git a/src/devices/bus/a2bus/corvfdc02.cpp b/src/devices/bus/a2bus/corvfdc02.cpp
index 12c7aed06ac..cdddec35de1 100644
--- a/src/devices/bus/a2bus/corvfdc02.cpp
+++ b/src/devices/bus/a2bus/corvfdc02.cpp
@@ -77,7 +77,7 @@ const tiny_rom_entry *a2bus_corvfdc02_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_corvfdc02_device::a2bus_corvfdc02_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_corvfdc02_device::a2bus_corvfdc02_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_a2bus_card_interface(mconfig, *this),
m_fdc(*this, FDC02_FDC_TAG),
@@ -88,7 +88,7 @@ a2bus_corvfdc02_device::a2bus_corvfdc02_device(const machine_config &mconfig, de
{
}
-a2bus_corvfdc02_device::a2bus_corvfdc02_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_corvfdc02_device::a2bus_corvfdc02_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_corvfdc02_device(mconfig, A2BUS_CORVFDC02, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/corvfdc02.h b/src/devices/bus/a2bus/corvfdc02.h
index 825d68d564b..213c1bdfe36 100644
--- a/src/devices/bus/a2bus/corvfdc02.h
+++ b/src/devices/bus/a2bus/corvfdc02.h
@@ -28,10 +28,10 @@ class a2bus_corvfdc02_device:
{
public:
// construction/destruction
- a2bus_corvfdc02_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_corvfdc02_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- a2bus_corvfdc02_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_corvfdc02_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
diff --git a/src/devices/bus/a2bus/excel9.cpp b/src/devices/bus/a2bus/excel9.cpp
index 706cb3c4f63..5fd27dea399 100644
--- a/src/devices/bus/a2bus/excel9.cpp
+++ b/src/devices/bus/a2bus/excel9.cpp
@@ -52,7 +52,7 @@ ROM_END
void a2bus_excel9_device::device_add_mconfig(machine_config &config)
{
- MC6809E(config, m_6809, 1021800); // 6809E runs at ~1 MHz
+ MC6809E(config, m_6809, XTAL::u(1021800)); // 6809E runs at ~1 MHz
m_6809->set_addrmap(AS_PROGRAM, &a2bus_excel9_device::m6809_mem);
}
@@ -69,7 +69,7 @@ const tiny_rom_entry *a2bus_excel9_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_excel9_device::a2bus_excel9_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+a2bus_excel9_device::a2bus_excel9_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_a2bus_card_interface(mconfig, *this)
, m_6809(*this, "m6809")
@@ -83,7 +83,7 @@ a2bus_excel9_device::a2bus_excel9_device(const machine_config &mconfig, device_t
{
}
-a2bus_excel9_device::a2bus_excel9_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_excel9_device::a2bus_excel9_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_excel9_device(mconfig, A2BUS_EXCEL9, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/excel9.h b/src/devices/bus/a2bus/excel9.h
index 2814cd6e394..a1fd57fc577 100644
--- a/src/devices/bus/a2bus/excel9.h
+++ b/src/devices/bus/a2bus/excel9.h
@@ -25,10 +25,10 @@ class a2bus_excel9_device:
{
public:
// construction/destruction
- a2bus_excel9_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_excel9_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- a2bus_excel9_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_excel9_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
diff --git a/src/devices/bus/a2bus/ezcgi.cpp b/src/devices/bus/a2bus/ezcgi.cpp
index 3ebccb45518..b5a78c766f4 100644
--- a/src/devices/bus/a2bus/ezcgi.cpp
+++ b/src/devices/bus/a2bus/ezcgi.cpp
@@ -36,10 +36,10 @@ class a2bus_ezcgi_device:
{
public:
// construction/destruction
- a2bus_ezcgi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_ezcgi_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- a2bus_ezcgi_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_ezcgi_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
@@ -61,10 +61,10 @@ class a2bus_ezcgi_9938_device:
{
public:
// construction/destruction
- a2bus_ezcgi_9938_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_ezcgi_9938_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- a2bus_ezcgi_9938_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_ezcgi_9938_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
@@ -86,10 +86,10 @@ class a2bus_ezcgi_9958_device:
{
public:
// construction/destruction
- a2bus_ezcgi_9958_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_ezcgi_9958_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- a2bus_ezcgi_9958_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_ezcgi_9958_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
@@ -158,36 +158,36 @@ void a2bus_ezcgi_9958_device::device_add_mconfig(machine_config &config)
// LIVE DEVICE
//**************************************************************************
-a2bus_ezcgi_device::a2bus_ezcgi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_ezcgi_device::a2bus_ezcgi_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_ezcgi_device(mconfig, A2BUS_EZCGI, tag, owner, clock)
{
}
-a2bus_ezcgi_device::a2bus_ezcgi_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_ezcgi_device::a2bus_ezcgi_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_a2bus_card_interface(mconfig, *this),
m_tms(*this, TMS_TAG)
{
}
-a2bus_ezcgi_9938_device::a2bus_ezcgi_9938_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_ezcgi_9938_device::a2bus_ezcgi_9938_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_ezcgi_9938_device(mconfig, A2BUS_EZCGI_9938, tag, owner, clock)
{
}
-a2bus_ezcgi_9938_device::a2bus_ezcgi_9938_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_ezcgi_9938_device::a2bus_ezcgi_9938_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_a2bus_card_interface(mconfig, *this),
m_tms(*this, TMS_TAG)
{
}
-a2bus_ezcgi_9958_device::a2bus_ezcgi_9958_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_ezcgi_9958_device::a2bus_ezcgi_9958_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_ezcgi_9958_device(mconfig, A2BUS_EZCGI_9958, tag, owner, clock)
{
}
-a2bus_ezcgi_9958_device::a2bus_ezcgi_9958_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_ezcgi_9958_device::a2bus_ezcgi_9958_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_a2bus_card_interface(mconfig, *this),
m_tms(*this, TMS_TAG)
diff --git a/src/devices/bus/a2bus/grafex.cpp b/src/devices/bus/a2bus/grafex.cpp
index 6855ebe174a..d7486a8d68e 100644
--- a/src/devices/bus/a2bus/grafex.cpp
+++ b/src/devices/bus/a2bus/grafex.cpp
@@ -46,10 +46,10 @@ class a2bus_grafex_device : public device_t,
{
public:
// construction/destruction
- a2bus_grafex_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_grafex_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- a2bus_grafex_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_grafex_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_add_mconfig(machine_config &config) override;
@@ -89,12 +89,12 @@ void a2bus_grafex_device::device_add_mconfig(machine_config &config)
// LIVE DEVICE
//**************************************************************************
-a2bus_grafex_device::a2bus_grafex_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_grafex_device::a2bus_grafex_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_grafex_device(mconfig, A2BUS_GRAFEX, tag, owner, clock)
{
}
-a2bus_grafex_device::a2bus_grafex_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_grafex_device::a2bus_grafex_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_a2bus_card_interface(mconfig, *this),
m_gdc(*this, "upd7220"),
diff --git a/src/devices/bus/a2bus/grappler.cpp b/src/devices/bus/a2bus/grappler.cpp
index 933b9b3357f..0ad56766acf 100644
--- a/src/devices/bus/a2bus/grappler.cpp
+++ b/src/devices/bus/a2bus/grappler.cpp
@@ -63,7 +63,7 @@ public:
virtual u8 read_c800(u16 offset) override;
protected:
- a2bus_grappler_device_base(machine_config const &mconfig, device_type type, char const *tag, device_t *owner, u32 clock);
+ a2bus_grappler_device_base(machine_config const &mconfig, device_type type, char const *tag, device_t *owner, const XTAL &clock);
// signal state
u8 busy_in() const { return m_busy_in; }
@@ -100,7 +100,7 @@ private:
};
-a2bus_grappler_device_base::a2bus_grappler_device_base(machine_config const &mconfig, device_type type, char const *tag, device_t *owner, u32 clock) :
+a2bus_grappler_device_base::a2bus_grappler_device_base(machine_config const &mconfig, device_type type, char const *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, type, tag, owner, clock),
device_a2bus_card_interface(mconfig, *this),
m_printer_conn(*this, "prn"),
@@ -230,7 +230,7 @@ void a2bus_grappler_device_base::set_slct_in(s32 param)
class a2bus_grappler_device : public a2bus_grappler_device_base
{
public:
- a2bus_grappler_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock);
+ a2bus_grappler_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock);
// device_a2bus_card_interface implementation
virtual u8 read_c0nx(u8 offset) override;
@@ -260,7 +260,7 @@ private:
};
-a2bus_grappler_device::a2bus_grappler_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock) :
+a2bus_grappler_device::a2bus_grappler_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock) :
a2bus_grappler_device_base(mconfig, A2BUS_GRAPPLER, tag, owner, clock),
m_strobe(1U),
m_ack_latch(1U),
@@ -443,7 +443,7 @@ public:
virtual void write_cnxx(u8 offset, u8 data) override;
protected:
- a2bus_grapplerplus_device_base(machine_config const &mconfig, device_type type, char const *tag, device_t *owner, u32 clock);
+ a2bus_grapplerplus_device_base(machine_config const &mconfig, device_type type, char const *tag, device_t *owner, const XTAL &clock);
// device_t implementation
virtual ioport_constructor device_input_ports() const override;
@@ -472,7 +472,7 @@ private:
};
-a2bus_grapplerplus_device_base::a2bus_grapplerplus_device_base(machine_config const &mconfig, device_type type, char const *tag, device_t *owner, u32 clock) :
+a2bus_grapplerplus_device_base::a2bus_grapplerplus_device_base(machine_config const &mconfig, device_type type, char const *tag, device_t *owner, const XTAL &clock) :
a2bus_grappler_device_base(mconfig, type, tag, owner, clock),
m_s1(*this, "S1"),
m_ack_latch(1U),
@@ -619,7 +619,7 @@ void a2bus_grapplerplus_device_base::set_ack_in(s32 param)
class a2bus_grapplerplus_device : public a2bus_grapplerplus_device_base
{
public:
- a2bus_grapplerplus_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock);
+ a2bus_grapplerplus_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock);
// DIP switch handlers
virtual DECLARE_INPUT_CHANGED_MEMBER(sw_msb) override;
@@ -653,7 +653,7 @@ private:
};
-a2bus_grapplerplus_device::a2bus_grapplerplus_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock) :
+a2bus_grapplerplus_device::a2bus_grapplerplus_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock) :
a2bus_grapplerplus_device_base(mconfig, A2BUS_GRAPPLERPLUS, tag, owner, clock),
m_strobe_timer(nullptr),
m_data_latch(0xffU),
@@ -842,7 +842,7 @@ TIMER_CALLBACK_MEMBER(a2bus_grapplerplus_device::update_strobe)
class a2bus_buf_grapplerplus_device : public a2bus_grapplerplus_device_base
{
public:
- a2bus_buf_grapplerplus_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock) :
+ a2bus_buf_grapplerplus_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock) :
a2bus_buf_grapplerplus_device(mconfig, A2BUS_BUFGRAPPLERPLUS, tag, owner, clock)
{
}
@@ -851,7 +851,7 @@ public:
virtual u8 read_c0nx(u8 offset) override;
protected:
- a2bus_buf_grapplerplus_device(machine_config const &mconfig, device_type type, char const *tag, device_t *owner, u32 clock);
+ a2bus_buf_grapplerplus_device(machine_config const &mconfig, device_type type, char const *tag, device_t *owner, const XTAL &clock);
// device_t implementation
virtual tiny_rom_entry const *device_rom_region() const override { return ROM_NAME(bufgrapplerplus); }
@@ -895,7 +895,7 @@ private:
-a2bus_buf_grapplerplus_device::a2bus_buf_grapplerplus_device(machine_config const &mconfig, device_type type, char const *tag, device_t *owner, u32 clock) :
+a2bus_buf_grapplerplus_device::a2bus_buf_grapplerplus_device(machine_config const &mconfig, device_type type, char const *tag, device_t *owner, const XTAL &clock) :
a2bus_grapplerplus_device_base(mconfig, type, tag, owner, clock),
m_mcu(*this, "mcu"),
m_ram(),
@@ -1223,7 +1223,7 @@ void a2bus_buf_grapplerplus_device::clear_ibusy(s32 param)
class a2bus_buf_grapplerplus_reva_device : public a2bus_buf_grapplerplus_device
{
public:
- a2bus_buf_grapplerplus_reva_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock) :
+ a2bus_buf_grapplerplus_reva_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock) :
a2bus_buf_grapplerplus_device(mconfig, A2BUS_BUFGRAPPLERPLUSA, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/lancegs.cpp b/src/devices/bus/a2bus/lancegs.cpp
index cca53536c2e..bcda172a191 100644
--- a/src/devices/bus/a2bus/lancegs.cpp
+++ b/src/devices/bus/a2bus/lancegs.cpp
@@ -63,10 +63,10 @@ class a2bus_lancegs_device:
{
public:
// construction/destruction
- a2bus_lancegs_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_lancegs_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- a2bus_lancegs_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_lancegs_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_add_mconfig(machine_config &config) override;
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -89,12 +89,12 @@ private:
// LIVE DEVICE
//**************************************************************************
-a2bus_lancegs_device::a2bus_lancegs_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_lancegs_device::a2bus_lancegs_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_lancegs_device(mconfig, A2BUS_LANCEGS, tag, owner, clock)
{
}
-a2bus_lancegs_device::a2bus_lancegs_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_lancegs_device::a2bus_lancegs_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_a2bus_card_interface(mconfig, *this),
m_netinf(*this, "smc91c96"),
@@ -106,7 +106,7 @@ a2bus_lancegs_device::a2bus_lancegs_device(const machine_config &mconfig, device
void a2bus_lancegs_device::device_add_mconfig(machine_config &config)
{
SMC91C96(config, m_netinf, 20_MHz_XTAL); // Datasheet fig 12.26, pg 122.
- I2C_24C04(config, m_i2cmem, 0).set_address(0x80).set_e0(1);
+ I2C_24C04(config, m_i2cmem).set_address(0x80).set_e0(1);
m_netinf->irq_handler().set(FUNC(a2bus_lancegs_device::netinf_irq_w));
}
diff --git a/src/devices/bus/a2bus/laser128.cpp b/src/devices/bus/a2bus/laser128.cpp
index ecddbc66b14..5fcdf24caf7 100644
--- a/src/devices/bus/a2bus/laser128.cpp
+++ b/src/devices/bus/a2bus/laser128.cpp
@@ -41,18 +41,18 @@ void a2bus_laser128_device::device_add_mconfig(machine_config &config)
// LIVE DEVICE
//**************************************************************************
-a2bus_laser128_device::a2bus_laser128_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_laser128_device::a2bus_laser128_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_a2bus_card_interface(mconfig, *this), m_rom(nullptr), m_slot7_bank(0), m_bParPrinter(false), m_slot7_ram_bank(0)
{
}
-a2bus_laser128_device::a2bus_laser128_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_laser128_device::a2bus_laser128_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_laser128_device(mconfig, A2BUS_LASER128, tag, owner, clock)
{
}
-a2bus_laser128_orig_device::a2bus_laser128_orig_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_laser128_orig_device::a2bus_laser128_orig_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_laser128_device(mconfig, A2BUS_LASER128_ORIG, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/laser128.h b/src/devices/bus/a2bus/laser128.h
index 9858e3889f7..82b53e15f6a 100644
--- a/src/devices/bus/a2bus/laser128.h
+++ b/src/devices/bus/a2bus/laser128.h
@@ -25,13 +25,13 @@ class a2bus_laser128_device:
{
public:
// construction/destruction
- a2bus_laser128_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_laser128_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
// special config API
void set_parallel_printer(bool bPrinterIsParallel) { m_bParPrinter = bPrinterIsParallel; }
protected:
- a2bus_laser128_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_laser128_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
@@ -57,7 +57,7 @@ private:
class a2bus_laser128_orig_device: public a2bus_laser128_device
{
public:
- a2bus_laser128_orig_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_laser128_orig_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
virtual uint8_t read_c800(uint16_t offset) override;
diff --git a/src/devices/bus/a2bus/mouse.cpp b/src/devices/bus/a2bus/mouse.cpp
index 6a40c244a40..f5003d02e3b 100644
--- a/src/devices/bus/a2bus/mouse.cpp
+++ b/src/devices/bus/a2bus/mouse.cpp
@@ -95,14 +95,14 @@ class a2bus_mouse_device:
{
public:
// construction/destruction
- a2bus_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_mouse_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;
virtual ioport_constructor device_input_ports() const override;
protected:
- a2bus_mouse_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_mouse_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_add_mconfig(machine_config &config) override;
virtual void device_start() override;
@@ -183,14 +183,14 @@ ioport_constructor a2bus_mouse_device::device_input_ports() const
void a2bus_mouse_device::device_add_mconfig(machine_config &config)
{
- M68705P3(config, m_mcu, 2043600);
+ M68705P3(config, m_mcu, XTAL::u(2043600));
m_mcu->porta_r().set(FUNC(a2bus_mouse_device::mcu_port_a_r));
m_mcu->portb_r().set(FUNC(a2bus_mouse_device::mcu_port_b_r));
m_mcu->porta_w().set(FUNC(a2bus_mouse_device::mcu_port_a_w));
m_mcu->portb_w().set(FUNC(a2bus_mouse_device::mcu_port_b_w));
m_mcu->portc_w().set(FUNC(a2bus_mouse_device::mcu_port_c_w));
- PIA6821(config, m_pia, 1021800);
+ PIA6821(config, m_pia, XTAL::u(1021800));
m_pia->writepa_handler().set(FUNC(a2bus_mouse_device::pia_out_a));
m_pia->writepb_handler().set(FUNC(a2bus_mouse_device::pia_out_b));
m_pia->tspb_handler().set_constant(0x00);
@@ -212,7 +212,7 @@ const tiny_rom_entry *a2bus_mouse_device::device_rom_region() const
LIVE DEVICE
***************************************************************************/
-a2bus_mouse_device::a2bus_mouse_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_mouse_device::a2bus_mouse_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_a2bus_card_interface(mconfig, *this),
m_pia(*this, MOUSE_PIA_TAG),
@@ -225,7 +225,7 @@ a2bus_mouse_device::a2bus_mouse_device(const machine_config &mconfig, device_typ
{
}
-a2bus_mouse_device::a2bus_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_mouse_device::a2bus_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_mouse_device(mconfig, A2BUS_MOUSE, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/nippelclock.cpp b/src/devices/bus/a2bus/nippelclock.cpp
index 047e13422e0..b86e8291ec2 100644
--- a/src/devices/bus/a2bus/nippelclock.cpp
+++ b/src/devices/bus/a2bus/nippelclock.cpp
@@ -55,14 +55,14 @@ WRITE_LINE_MEMBER(a2bus_nippelclock_device::irq_w)
// LIVE DEVICE
//**************************************************************************
-a2bus_nippelclock_device::a2bus_nippelclock_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+a2bus_nippelclock_device::a2bus_nippelclock_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_a2bus_card_interface(mconfig, *this)
, m_rtc(*this, "rtc")
{
}
-a2bus_nippelclock_device::a2bus_nippelclock_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_nippelclock_device::a2bus_nippelclock_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_nippelclock_device(mconfig, A2BUS_NIPPELCLOCK, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/nippelclock.h b/src/devices/bus/a2bus/nippelclock.h
index d2ac6f14c7f..4bc93e89fa6 100644
--- a/src/devices/bus/a2bus/nippelclock.h
+++ b/src/devices/bus/a2bus/nippelclock.h
@@ -26,10 +26,10 @@ class a2bus_nippelclock_device:
{
public:
// construction/destruction
- a2bus_nippelclock_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_nippelclock_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- a2bus_nippelclock_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_nippelclock_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
diff --git a/src/devices/bus/a2bus/pc_xporter.cpp b/src/devices/bus/a2bus/pc_xporter.cpp
index 06a87cc1820..2fa23e450cf 100644
--- a/src/devices/bus/a2bus/pc_xporter.cpp
+++ b/src/devices/bus/a2bus/pc_xporter.cpp
@@ -107,12 +107,12 @@ class a2bus_pcxporter_device:
{
public:
// construction/destruction
- a2bus_pcxporter_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_pcxporter_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
[[maybe_unused]] uint16_t pc_bios_r(offs_t offset); // TODO: hook up to something?
protected:
- a2bus_pcxporter_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_pcxporter_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
@@ -252,7 +252,7 @@ void a2bus_pcxporter_device::device_add_mconfig(machine_config &config)
PIC8259(config, m_pic8259);
m_pic8259->out_int_callback().set_inputline(m_v30, 0);
- ISA8(config, m_isabus, 0);
+ ISA8(config, m_isabus);
m_isabus->set_memspace(m_v30, AS_PROGRAM);
m_isabus->set_iospace(m_v30, AS_IO);
m_isabus->irq2_callback().set(m_pic8259, FUNC(pic8259_device::ir2_w));
@@ -273,15 +273,15 @@ void a2bus_pcxporter_device::device_add_mconfig(machine_config &config)
SPEAKER(config, "mono").front_center();
SPEAKER_SOUND(config, m_speaker).add_route(ALL_OUTPUTS, "mono", 1.00);
- ISA8_SLOT(config, "isa1", 0, m_isabus, pc_isa8_cards, "cga", true); // FIXME: determine ISA bus clock
- ISA8_SLOT(config, "isa2", 0, m_isabus, pc_isa8_cards, "fdc_xt", true);
+ ISA8_SLOT(config, "isa1", m_isabus, pc_isa8_cards, "cga", true); // FIXME: determine ISA bus clock
+ ISA8_SLOT(config, "isa2", m_isabus, pc_isa8_cards, "fdc_xt", true);
}
//**************************************************************************
// LIVE DEVICE
//**************************************************************************
-a2bus_pcxporter_device::a2bus_pcxporter_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_pcxporter_device::a2bus_pcxporter_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_a2bus_card_interface(mconfig, *this),
m_v30(*this, "v30"),
@@ -294,7 +294,7 @@ a2bus_pcxporter_device::a2bus_pcxporter_device(const machine_config &mconfig, de
{
}
-a2bus_pcxporter_device::a2bus_pcxporter_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_pcxporter_device::a2bus_pcxporter_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_pcxporter_device(mconfig, A2BUS_PCXPORTER, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/prodosromdrive.cpp b/src/devices/bus/a2bus/prodosromdrive.cpp
index d9275384a00..9cdc1c1bdc4 100644
--- a/src/devices/bus/a2bus/prodosromdrive.cpp
+++ b/src/devices/bus/a2bus/prodosromdrive.cpp
@@ -33,10 +33,10 @@ class a2bus_pdromdrive_device : public device_t,
{
public:
// construction/destruction
- a2bus_pdromdrive_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_pdromdrive_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- a2bus_pdromdrive_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_pdromdrive_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual const tiny_rom_entry *device_rom_region() const override;
@@ -56,12 +56,12 @@ private:
// LIVE DEVICE
//**************************************************************************
-a2bus_pdromdrive_device::a2bus_pdromdrive_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_pdromdrive_device::a2bus_pdromdrive_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_pdromdrive_device(mconfig, A2BUS_PRODOSROMDRIVE, tag, owner, clock)
{
}
-a2bus_pdromdrive_device::a2bus_pdromdrive_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_pdromdrive_device::a2bus_pdromdrive_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_a2bus_card_interface(mconfig, *this),
m_rom(*this, "romdrive")
diff --git a/src/devices/bus/a2bus/q68.cpp b/src/devices/bus/a2bus/q68.cpp
index 4729f450e4a..c98513be043 100644
--- a/src/devices/bus/a2bus/q68.cpp
+++ b/src/devices/bus/a2bus/q68.cpp
@@ -107,7 +107,7 @@ const tiny_rom_entry *a2bus_68k_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_68k_device::a2bus_68k_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+a2bus_68k_device::a2bus_68k_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_a2bus_card_interface(mconfig, *this)
, m_m68008(*this, "m68008")
@@ -115,12 +115,12 @@ a2bus_68k_device::a2bus_68k_device(const machine_config &mconfig, device_type ty
{
}
-a2bus_q68_device::a2bus_q68_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_q68_device::a2bus_q68_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_68k_device(mconfig, A2BUS_Q68, tag, owner, clock)
{
}
-a2bus_q68plus_device::a2bus_q68plus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_q68plus_device::a2bus_q68plus_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_68k_device(mconfig, A2BUS_Q68PLUS, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/q68.h b/src/devices/bus/a2bus/q68.h
index 34664a284f0..32f63838a06 100644
--- a/src/devices/bus/a2bus/q68.h
+++ b/src/devices/bus/a2bus/q68.h
@@ -33,7 +33,7 @@ class a2bus_68k_device:
public device_a2bus_card_interface
{
protected:
- a2bus_68k_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_68k_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
@@ -56,7 +56,7 @@ private:
class a2bus_q68_device : public a2bus_68k_device
{
public:
- a2bus_q68_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_q68_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
virtual void device_add_mconfig(machine_config &config) override;
@@ -68,7 +68,7 @@ private:
class a2bus_q68plus_device : public a2bus_68k_device
{
public:
- a2bus_q68plus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_q68plus_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
static auto parent_rom_device_type() { return &A2BUS_Q68; }
diff --git a/src/devices/bus/a2bus/ramcard128k.cpp b/src/devices/bus/a2bus/ramcard128k.cpp
index 0736e39c5d4..a5a6b98dc0f 100644
--- a/src/devices/bus/a2bus/ramcard128k.cpp
+++ b/src/devices/bus/a2bus/ramcard128k.cpp
@@ -29,13 +29,13 @@ DEFINE_DEVICE_TYPE(A2BUS_RAMCARD128K, a2bus_ssramcard_device, "ssram128", "Satur
// LIVE DEVICE
//**************************************************************************
-a2bus_ssramcard_device::a2bus_ssramcard_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_ssramcard_device::a2bus_ssramcard_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_a2bus_card_interface(mconfig, *this),
m_inh_state(0), m_last_offset(0), m_dxxx_bank(0), m_main_bank(0)
{
}
-a2bus_ssramcard_device::a2bus_ssramcard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_ssramcard_device::a2bus_ssramcard_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_ssramcard_device(mconfig, A2BUS_RAMCARD128K, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/ramcard128k.h b/src/devices/bus/a2bus/ramcard128k.h
index ee3ac683514..1fd5573d74a 100644
--- a/src/devices/bus/a2bus/ramcard128k.h
+++ b/src/devices/bus/a2bus/ramcard128k.h
@@ -25,10 +25,10 @@ class a2bus_ssramcard_device:
{
public:
// construction/destruction
- a2bus_ssramcard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_ssramcard_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- a2bus_ssramcard_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_ssramcard_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
diff --git a/src/devices/bus/a2bus/ramcard16k.cpp b/src/devices/bus/a2bus/ramcard16k.cpp
index cd91ce64230..612367d5776 100644
--- a/src/devices/bus/a2bus/ramcard16k.cpp
+++ b/src/devices/bus/a2bus/ramcard16k.cpp
@@ -29,13 +29,13 @@ DEFINE_DEVICE_TYPE(A2BUS_RAMCARD16K, a2bus_ramcard_device, "a2ram16k", "Apple II
// LIVE DEVICE
//**************************************************************************
-a2bus_ramcard_device::a2bus_ramcard_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_ramcard_device::a2bus_ramcard_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_a2bus_card_interface(mconfig, *this), m_inh_state(0), m_prewrite(false), m_dxxx_bank(0)
{
}
-a2bus_ramcard_device::a2bus_ramcard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_ramcard_device::a2bus_ramcard_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_ramcard_device(mconfig, A2BUS_RAMCARD16K, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/ramcard16k.h b/src/devices/bus/a2bus/ramcard16k.h
index 21edcd7a7fd..0e35520bc30 100644
--- a/src/devices/bus/a2bus/ramcard16k.h
+++ b/src/devices/bus/a2bus/ramcard16k.h
@@ -25,10 +25,10 @@ class a2bus_ramcard_device:
{
public:
// construction/destruction
- a2bus_ramcard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_ramcard_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- a2bus_ramcard_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_ramcard_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
diff --git a/src/devices/bus/a2bus/sider.cpp b/src/devices/bus/a2bus/sider.cpp
index d2722c8bb77..4241cb30b3b 100644
--- a/src/devices/bus/a2bus/sider.cpp
+++ b/src/devices/bus/a2bus/sider.cpp
@@ -140,7 +140,7 @@ const tiny_rom_entry *a2bus_sider1card_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_sider_device::a2bus_sider_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_sider_device::a2bus_sider_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_a2bus_card_interface(mconfig, *this),
m_sasibus(*this, "sasibus"),
@@ -151,12 +151,12 @@ a2bus_sider_device::a2bus_sider_device(const machine_config &mconfig, device_typ
{
}
-a2bus_sider2card_device::a2bus_sider2card_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_sider2card_device::a2bus_sider2card_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_sider_device(mconfig, A2BUS_SIDER2, tag, owner, clock)
{
}
-a2bus_sider1card_device::a2bus_sider1card_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_sider1card_device::a2bus_sider1card_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_sider_device(mconfig, A2BUS_SIDER1, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/sider.h b/src/devices/bus/a2bus/sider.h
index 6bb5ed3c036..ed7f56e5ede 100644
--- a/src/devices/bus/a2bus/sider.h
+++ b/src/devices/bus/a2bus/sider.h
@@ -27,7 +27,7 @@ class a2bus_sider_device:
public device_a2bus_card_interface
{
protected:
- a2bus_sider_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_sider_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
@@ -53,14 +53,14 @@ private:
class a2bus_sider2card_device: public a2bus_sider_device
{
public:
- a2bus_sider2card_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_sider2card_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
virtual const tiny_rom_entry *device_rom_region() const override;
};
class a2bus_sider1card_device: public a2bus_sider_device
{
public:
- a2bus_sider1card_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_sider1card_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
virtual const tiny_rom_entry *device_rom_region() const override;
};
diff --git a/src/devices/bus/a2bus/softcard3.cpp b/src/devices/bus/a2bus/softcard3.cpp
index fb3da1eb291..1b3d24e809f 100644
--- a/src/devices/bus/a2bus/softcard3.cpp
+++ b/src/devices/bus/a2bus/softcard3.cpp
@@ -60,7 +60,7 @@ void a2bus_softcard3_device::device_add_mconfig(machine_config &config)
// LIVE DEVICE
//**************************************************************************
-a2bus_softcard3_device::a2bus_softcard3_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_softcard3_device::a2bus_softcard3_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_a2bus_card_interface(mconfig, *this),
m_z80(*this, "z80"),
@@ -72,7 +72,7 @@ a2bus_softcard3_device::a2bus_softcard3_device(const machine_config &mconfig, de
{
}
-a2bus_softcard3_device::a2bus_softcard3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_softcard3_device::a2bus_softcard3_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_softcard3_device(mconfig, A2BUS_SOFTCARD3, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/softcard3.h b/src/devices/bus/a2bus/softcard3.h
index a048c9e754d..cb7d27539e1 100644
--- a/src/devices/bus/a2bus/softcard3.h
+++ b/src/devices/bus/a2bus/softcard3.h
@@ -25,12 +25,12 @@ class a2bus_softcard3_device:
public:
// construction/destruction
- a2bus_softcard3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_softcard3_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
void z80_io_w(offs_t offset, uint8_t data);
protected:
- a2bus_softcard3_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_softcard3_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
diff --git a/src/devices/bus/a2bus/ssbapple.cpp b/src/devices/bus/a2bus/ssbapple.cpp
index c4ad0f7684b..0aae9420bee 100644
--- a/src/devices/bus/a2bus/ssbapple.cpp
+++ b/src/devices/bus/a2bus/ssbapple.cpp
@@ -35,13 +35,13 @@ class a2bus_ssb_device:
{
public:
// construction/destruction
- a2bus_ssb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_ssb_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
static constexpr feature_type imperfect_features() { return feature::SOUND; }
required_device<tms5220_device> m_tms;
protected:
- a2bus_ssb_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_ssb_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
@@ -64,7 +64,7 @@ protected:
void a2bus_ssb_device::device_add_mconfig(machine_config &config)
{
SPEAKER(config, "ssbapple").front_center();
- TMS5220(config, m_tms, 640000); // guess - this gives 8 kHz output according to the datasheet
+ TMS5220(config, m_tms, XTAL::u(640000)); // guess - this gives 8 kHz output according to the datasheet
m_tms->add_route(ALL_OUTPUTS, "ssbapple", 1.0);
}
@@ -72,14 +72,14 @@ void a2bus_ssb_device::device_add_mconfig(machine_config &config)
// LIVE DEVICE
//**************************************************************************
-a2bus_ssb_device::a2bus_ssb_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_ssb_device::a2bus_ssb_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_a2bus_card_interface(mconfig, *this),
m_tms(*this, TMS_TAG)
{
}
-a2bus_ssb_device::a2bus_ssb_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_ssb_device::a2bus_ssb_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_ssb_device(mconfig, A2BUS_SSBAPPLE, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/ssprite.cpp b/src/devices/bus/a2bus/ssprite.cpp
index 2fdecb117c9..14889c2a83d 100644
--- a/src/devices/bus/a2bus/ssprite.cpp
+++ b/src/devices/bus/a2bus/ssprite.cpp
@@ -39,10 +39,10 @@ class a2bus_ssprite_device:
{
public:
// construction/destruction
- a2bus_ssprite_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_ssprite_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- a2bus_ssprite_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_ssprite_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
@@ -72,20 +72,20 @@ void a2bus_ssprite_device::device_add_mconfig(machine_config &config)
SCREEN(config, SCREEN_TAG, SCREEN_TYPE_RASTER);
SPEAKER(config, "mono").front_center();
- AY8912(config, m_ay, 1022727).add_route(ALL_OUTPUTS, "mono", 1.0);
- TMS5220(config, m_tms5220, 640000).add_route(ALL_OUTPUTS, "mono", 1.0);
+ AY8912(config, m_ay, XTAL::u(1022727)).add_route(ALL_OUTPUTS, "mono", 1.0);
+ TMS5220(config, m_tms5220, XTAL::u(640000)).add_route(ALL_OUTPUTS, "mono", 1.0);
}
//**************************************************************************
// LIVE DEVICE
//**************************************************************************
-a2bus_ssprite_device::a2bus_ssprite_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_ssprite_device::a2bus_ssprite_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_ssprite_device(mconfig, A2BUS_SSPRITE, tag, owner, clock)
{
}
-a2bus_ssprite_device::a2bus_ssprite_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_ssprite_device::a2bus_ssprite_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_a2bus_card_interface(mconfig, *this),
m_tms(*this, TMS_TAG),
diff --git a/src/devices/bus/a2bus/suprterminal.cpp b/src/devices/bus/a2bus/suprterminal.cpp
index 796937bebcb..f064c569e66 100644
--- a/src/devices/bus/a2bus/suprterminal.cpp
+++ b/src/devices/bus/a2bus/suprterminal.cpp
@@ -47,10 +47,10 @@ class a2bus_suprterminal_device:
{
public:
// construction/destruction
- a2bus_suprterminal_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ a2bus_suprterminal_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- a2bus_suprterminal_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock);
+ a2bus_suprterminal_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
@@ -103,12 +103,12 @@ const tiny_rom_entry *a2bus_suprterminal_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_suprterminal_device::a2bus_suprterminal_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) :
+a2bus_suprterminal_device::a2bus_suprterminal_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_suprterminal_device(mconfig, A2BUS_SUPRTERMINAL, tag, owner, clock)
{
}
-a2bus_suprterminal_device::a2bus_suprterminal_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) :
+a2bus_suprterminal_device::a2bus_suprterminal_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_a2bus_card_interface(mconfig, *this),
m_crtc(*this, "crtc"),
diff --git a/src/devices/bus/a2bus/timemasterho.cpp b/src/devices/bus/a2bus/timemasterho.cpp
index 8dbef3a5a37..fa6c30df595 100644
--- a/src/devices/bus/a2bus/timemasterho.cpp
+++ b/src/devices/bus/a2bus/timemasterho.cpp
@@ -86,10 +86,10 @@ class a2bus_timemasterho_device:
{
public:
// construction/destruction
- a2bus_timemasterho_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_timemasterho_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- a2bus_timemasterho_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_timemasterho_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
@@ -138,13 +138,13 @@ ioport_constructor a2bus_timemasterho_device::device_input_ports() const
void a2bus_timemasterho_device::device_add_mconfig(machine_config &config)
{
- PIA6821(config, m_pia, 1021800);
+ PIA6821(config, m_pia, XTAL::u(1021800));
m_pia->writepa_handler().set(FUNC(a2bus_timemasterho_device::pia_out_a));
m_pia->writepb_handler().set(FUNC(a2bus_timemasterho_device::pia_out_b));
m_pia->irqa_handler().set(FUNC(a2bus_timemasterho_device::pia_irqa_w));
m_pia->irqb_handler().set(FUNC(a2bus_timemasterho_device::pia_irqb_w));
- MSM5832(config, m_msm5832, 32768);
+ MSM5832(config, m_msm5832, XTAL::u(32768));
}
//-------------------------------------------------
@@ -160,7 +160,7 @@ const tiny_rom_entry *a2bus_timemasterho_device::device_rom_region() const
// LIVE DEVICE
//**************************************************************************
-a2bus_timemasterho_device::a2bus_timemasterho_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_timemasterho_device::a2bus_timemasterho_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_a2bus_card_interface(mconfig, *this),
m_pia(*this, TIMEMASTER_PIA_TAG),
@@ -170,7 +170,7 @@ a2bus_timemasterho_device::a2bus_timemasterho_device(const machine_config &mconf
{
}
-a2bus_timemasterho_device::a2bus_timemasterho_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_timemasterho_device::a2bus_timemasterho_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_timemasterho_device(mconfig, A2BUS_TIMEMASTERHO, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/titan3plus2.cpp b/src/devices/bus/a2bus/titan3plus2.cpp
index e04dc03448a..4c1a3970828 100644
--- a/src/devices/bus/a2bus/titan3plus2.cpp
+++ b/src/devices/bus/a2bus/titan3plus2.cpp
@@ -49,14 +49,14 @@ void a2bus_titan3plus2_device::device_add_mconfig(machine_config &config)
APPLE2_GAMEIO(config, m_gameio, apple2_gameio_device::default_options, nullptr);
}
-a2bus_titan3plus2_device::a2bus_titan3plus2_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_titan3plus2_device::a2bus_titan3plus2_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_a2bus_card_interface(mconfig, *this),
m_gameio(*this, "gameio"),
m_inh_state(0), m_last_offset(0), m_dxxx_bank(0), m_main_bank(0), m_enabled(false)
{
}
-a2bus_titan3plus2_device::a2bus_titan3plus2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_titan3plus2_device::a2bus_titan3plus2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_titan3plus2_device(mconfig, A2BUS_TITAN3PLUS2, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/titan3plus2.h b/src/devices/bus/a2bus/titan3plus2.h
index f162f115d8e..9b9326e14a3 100644
--- a/src/devices/bus/a2bus/titan3plus2.h
+++ b/src/devices/bus/a2bus/titan3plus2.h
@@ -26,10 +26,10 @@ class a2bus_titan3plus2_device:
{
public:
// construction/destruction
- a2bus_titan3plus2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_titan3plus2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- a2bus_titan3plus2_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_titan3plus2_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
diff --git a/src/devices/bus/a2bus/transwarp.cpp b/src/devices/bus/a2bus/transwarp.cpp
index a87f724a704..d3288b67966 100644
--- a/src/devices/bus/a2bus/transwarp.cpp
+++ b/src/devices/bus/a2bus/transwarp.cpp
@@ -136,7 +136,7 @@ void a2bus_transwarp_device::device_add_mconfig(machine_config &config)
// LIVE DEVICE
//**************************************************************************
-a2bus_transwarp_device::a2bus_transwarp_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_transwarp_device::a2bus_transwarp_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_a2bus_card_interface(mconfig, *this),
m_bEnabled(false),
@@ -147,7 +147,7 @@ a2bus_transwarp_device::a2bus_transwarp_device(const machine_config &mconfig, de
{
}
-a2bus_transwarp_device::a2bus_transwarp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2bus_transwarp_device::a2bus_transwarp_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_transwarp_device(mconfig, A2BUS_TRANSWARP, tag, owner, clock)
{
}
diff --git a/src/devices/bus/a2bus/transwarp.h b/src/devices/bus/a2bus/transwarp.h
index 1213ea26c8b..7846ef23f9e 100644
--- a/src/devices/bus/a2bus/transwarp.h
+++ b/src/devices/bus/a2bus/transwarp.h
@@ -23,10 +23,10 @@ class a2bus_transwarp_device:
{
public:
// construction/destruction
- a2bus_transwarp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_transwarp_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- a2bus_transwarp_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ a2bus_transwarp_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
// overrides of device_t functions
virtual void device_start() override;
diff --git a/src/devices/bus/a2bus/uniprint.cpp b/src/devices/bus/a2bus/uniprint.cpp
index 9bc72a4f2bd..b0be885c3ad 100644
--- a/src/devices/bus/a2bus/uniprint.cpp
+++ b/src/devices/bus/a2bus/uniprint.cpp
@@ -15,7 +15,7 @@ namespace {
class a2bus_uniprint_device : public device_t, public device_a2bus_card_interface
{
public:
- a2bus_uniprint_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock);
+ a2bus_uniprint_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock);
// device_a2bus_card_interface implementation
virtual u8 read_c0nx(u8 offset) override;
@@ -88,7 +88,7 @@ INPUT_PORTS_START(uniprint)
INPUT_PORTS_END
-a2bus_uniprint_device::a2bus_uniprint_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock) :
+a2bus_uniprint_device::a2bus_uniprint_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, A2BUS_UNIPRINT, tag, owner, clock),
device_a2bus_card_interface(mconfig, *this),
m_printer_conn(*this, "prn"),
diff --git a/src/devices/bus/a2bus/uthernet.cpp b/src/devices/bus/a2bus/uthernet.cpp
index 6f3a8d21b47..1487f088a0c 100644
--- a/src/devices/bus/a2bus/uthernet.cpp
+++ b/src/devices/bus/a2bus/uthernet.cpp
@@ -25,13 +25,13 @@ class a2bus_uthernet_device:
{
public:
// construction/destruction
- a2bus_uthernet_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+ a2bus_uthernet_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
a2bus_uthernet_device(mconfig, A2BUS_UTHERNET, tag, owner, clock)
{
}
protected:
- a2bus_uthernet_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+ a2bus_uthernet_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_a2bus_card_interface(mconfig, *this),
m_netinf(*this, "cs8900a")