summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/bbc
diff options
context:
space:
mode:
author Olivier Galibert <galibert@pobox.com>2022-06-16 12:47:52 +0200
committer Olivier Galibert <galibert@pobox.com>2025-04-29 23:06:41 +0200
commit45d4cd52a8194f2ef9e0383cfb2e2a35634af6ff (patch)
tree4e8d8fcb7382a5e9e0bce5ec59939bcfbe67155a /src/devices/bus/bbc
parent5c14bcdfcb4aefb71b5b62387c4ad05dbeb3814e (diff)
full xtal conversionxtal
Diffstat (limited to 'src/devices/bus/bbc')
-rw-r--r--src/devices/bus/bbc/1mhzbus/1mhzbus.cpp2
-rw-r--r--src/devices/bus/bbc/1mhzbus/1mhzbus.h4
-rw-r--r--src/devices/bus/bbc/1mhzbus/autoprom.cpp2
-rw-r--r--src/devices/bus/bbc/1mhzbus/autoprom.h2
-rw-r--r--src/devices/bus/bbc/1mhzbus/beebopl.cpp2
-rw-r--r--src/devices/bus/bbc/1mhzbus/beebopl.h2
-rw-r--r--src/devices/bus/bbc/1mhzbus/beebsid.cpp2
-rw-r--r--src/devices/bus/bbc/1mhzbus/beebsid.h2
-rw-r--r--src/devices/bus/bbc/1mhzbus/cc500.cpp2
-rw-r--r--src/devices/bus/bbc/1mhzbus/cc500.h2
-rw-r--r--src/devices/bus/bbc/1mhzbus/cfa3000opt.cpp2
-rw-r--r--src/devices/bus/bbc/1mhzbus/cfa3000opt.h2
-rw-r--r--src/devices/bus/bbc/1mhzbus/cisco.cpp2
-rw-r--r--src/devices/bus/bbc/1mhzbus/cisco.h2
-rw-r--r--src/devices/bus/bbc/1mhzbus/datacentre.cpp2
-rw-r--r--src/devices/bus/bbc/1mhzbus/datacentre.h2
-rw-r--r--src/devices/bus/bbc/1mhzbus/emrmidi.cpp4
-rw-r--r--src/devices/bus/bbc/1mhzbus/emrmidi.h2
-rw-r--r--src/devices/bus/bbc/1mhzbus/ide.cpp4
-rw-r--r--src/devices/bus/bbc/1mhzbus/ide.h4
-rw-r--r--src/devices/bus/bbc/1mhzbus/ieee488.cpp6
-rw-r--r--src/devices/bus/bbc/1mhzbus/ieee488.h6
-rw-r--r--src/devices/bus/bbc/1mhzbus/m2000.cpp8
-rw-r--r--src/devices/bus/bbc/1mhzbus/m2000.h2
-rw-r--r--src/devices/bus/bbc/1mhzbus/m5000.cpp12
-rw-r--r--src/devices/bus/bbc/1mhzbus/m5000.h12
-rw-r--r--src/devices/bus/bbc/1mhzbus/multiform.cpp2
-rw-r--r--src/devices/bus/bbc/1mhzbus/multiform.h2
-rw-r--r--src/devices/bus/bbc/1mhzbus/opus3.cpp6
-rw-r--r--src/devices/bus/bbc/1mhzbus/opus3.h6
-rw-r--r--src/devices/bus/bbc/1mhzbus/pdram.cpp2
-rw-r--r--src/devices/bus/bbc/1mhzbus/pdram.h2
-rw-r--r--src/devices/bus/bbc/1mhzbus/pms64k.cpp2
-rw-r--r--src/devices/bus/bbc/1mhzbus/pms64k.h2
-rw-r--r--src/devices/bus/bbc/1mhzbus/ramdisc.cpp2
-rw-r--r--src/devices/bus/bbc/1mhzbus/ramdisc.h2
-rw-r--r--src/devices/bus/bbc/1mhzbus/sasi.cpp6
-rw-r--r--src/devices/bus/bbc/1mhzbus/sasi.h6
-rw-r--r--src/devices/bus/bbc/1mhzbus/scsi.cpp6
-rw-r--r--src/devices/bus/bbc/1mhzbus/scsi.h6
-rw-r--r--src/devices/bus/bbc/1mhzbus/sprite.cpp2
-rw-r--r--src/devices/bus/bbc/1mhzbus/sprite.h2
-rw-r--r--src/devices/bus/bbc/analogue/analogue.cpp2
-rw-r--r--src/devices/bus/bbc/analogue/analogue.h2
-rw-r--r--src/devices/bus/bbc/analogue/bitstik.cpp6
-rw-r--r--src/devices/bus/bbc/analogue/bitstik.h6
-rw-r--r--src/devices/bus/bbc/analogue/cfa3000a.cpp2
-rw-r--r--src/devices/bus/bbc/analogue/cfa3000a.h2
-rw-r--r--src/devices/bus/bbc/analogue/joystick.cpp6
-rw-r--r--src/devices/bus/bbc/analogue/joystick.h6
-rw-r--r--src/devices/bus/bbc/cart/click.cpp2
-rw-r--r--src/devices/bus/bbc/cart/click.h2
-rw-r--r--src/devices/bus/bbc/cart/mastersd.cpp4
-rw-r--r--src/devices/bus/bbc/cart/mastersd.h2
-rw-r--r--src/devices/bus/bbc/cart/mega256.cpp2
-rw-r--r--src/devices/bus/bbc/cart/mega256.h2
-rw-r--r--src/devices/bus/bbc/cart/mr8000.cpp2
-rw-r--r--src/devices/bus/bbc/cart/mr8000.h2
-rw-r--r--src/devices/bus/bbc/cart/msc.cpp2
-rw-r--r--src/devices/bus/bbc/cart/msc.h2
-rw-r--r--src/devices/bus/bbc/cart/slot.cpp2
-rw-r--r--src/devices/bus/bbc/cart/slot.h4
-rw-r--r--src/devices/bus/bbc/exp/autocue.cpp2
-rw-r--r--src/devices/bus/bbc/exp/autocue.h2
-rw-r--r--src/devices/bus/bbc/exp/exp.cpp2
-rw-r--r--src/devices/bus/bbc/exp/exp.h4
-rw-r--r--src/devices/bus/bbc/exp/mertec.cpp2
-rw-r--r--src/devices/bus/bbc/exp/mertec.h2
-rw-r--r--src/devices/bus/bbc/fdc/acorn.cpp4
-rw-r--r--src/devices/bus/bbc/fdc/acorn.h4
-rw-r--r--src/devices/bus/bbc/fdc/ams.cpp2
-rw-r--r--src/devices/bus/bbc/fdc/ams.h2
-rw-r--r--src/devices/bus/bbc/fdc/cumana.cpp6
-rw-r--r--src/devices/bus/bbc/fdc/cumana.h6
-rw-r--r--src/devices/bus/bbc/fdc/cv1797.cpp2
-rw-r--r--src/devices/bus/bbc/fdc/cv1797.h2
-rw-r--r--src/devices/bus/bbc/fdc/fdc.cpp2
-rw-r--r--src/devices/bus/bbc/fdc/fdc.h4
-rw-r--r--src/devices/bus/bbc/fdc/kenda.cpp2
-rw-r--r--src/devices/bus/bbc/fdc/kenda.h2
-rw-r--r--src/devices/bus/bbc/fdc/opus.cpp10
-rw-r--r--src/devices/bus/bbc/fdc/opus.h10
-rw-r--r--src/devices/bus/bbc/fdc/solidisk.cpp12
-rw-r--r--src/devices/bus/bbc/fdc/solidisk.h12
-rw-r--r--src/devices/bus/bbc/fdc/udm.cpp2
-rw-r--r--src/devices/bus/bbc/fdc/udm.h2
-rw-r--r--src/devices/bus/bbc/fdc/watford.cpp6
-rw-r--r--src/devices/bus/bbc/fdc/watford.h6
-rw-r--r--src/devices/bus/bbc/internal/aries.cpp8
-rw-r--r--src/devices/bus/bbc/internal/aries.h8
-rw-r--r--src/devices/bus/bbc/internal/atpl.cpp4
-rw-r--r--src/devices/bus/bbc/internal/atpl.h4
-rw-r--r--src/devices/bus/bbc/internal/cumana68k.cpp6
-rw-r--r--src/devices/bus/bbc/internal/cumana68k.h2
-rw-r--r--src/devices/bus/bbc/internal/integrab.cpp2
-rw-r--r--src/devices/bus/bbc/internal/integrab.h2
-rw-r--r--src/devices/bus/bbc/internal/internal.cpp2
-rw-r--r--src/devices/bus/bbc/internal/internal.h4
-rw-r--r--src/devices/bus/bbc/internal/memex.cpp2
-rw-r--r--src/devices/bus/bbc/internal/memex.h2
-rw-r--r--src/devices/bus/bbc/internal/morleyaa.cpp2
-rw-r--r--src/devices/bus/bbc/internal/morleyaa.h2
-rw-r--r--src/devices/bus/bbc/internal/overlay.cpp2
-rw-r--r--src/devices/bus/bbc/internal/overlay.h2
-rw-r--r--src/devices/bus/bbc/internal/peartree.cpp12
-rw-r--r--src/devices/bus/bbc/internal/peartree.h12
-rw-r--r--src/devices/bus/bbc/internal/ramamp.cpp2
-rw-r--r--src/devices/bus/bbc/internal/ramamp.h2
-rw-r--r--src/devices/bus/bbc/internal/raven20.cpp2
-rw-r--r--src/devices/bus/bbc/internal/raven20.h2
-rw-r--r--src/devices/bus/bbc/internal/romex.cpp2
-rw-r--r--src/devices/bus/bbc/internal/romex.h2
-rw-r--r--src/devices/bus/bbc/internal/stl2m128.cpp2
-rw-r--r--src/devices/bus/bbc/internal/stl2m128.h2
-rw-r--r--src/devices/bus/bbc/internal/stl4m32.cpp2
-rw-r--r--src/devices/bus/bbc/internal/stl4m32.h2
-rw-r--r--src/devices/bus/bbc/internal/stlswr.cpp10
-rw-r--r--src/devices/bus/bbc/internal/stlswr.h12
-rw-r--r--src/devices/bus/bbc/internal/we32kram.cpp2
-rw-r--r--src/devices/bus/bbc/internal/we32kram.h2
-rw-r--r--src/devices/bus/bbc/internal/werom.cpp6
-rw-r--r--src/devices/bus/bbc/internal/werom.h8
-rw-r--r--src/devices/bus/bbc/internal/weromram.cpp2
-rw-r--r--src/devices/bus/bbc/internal/weromram.h2
-rw-r--r--src/devices/bus/bbc/joyport/joyport.cpp2
-rw-r--r--src/devices/bus/bbc/joyport/joyport.h2
-rw-r--r--src/devices/bus/bbc/joyport/joystick.cpp2
-rw-r--r--src/devices/bus/bbc/joyport/joystick.h2
-rw-r--r--src/devices/bus/bbc/joyport/mouse.cpp2
-rw-r--r--src/devices/bus/bbc/joyport/mouse.h2
-rw-r--r--src/devices/bus/bbc/modem/meup.cpp2
-rw-r--r--src/devices/bus/bbc/modem/meup.h2
-rw-r--r--src/devices/bus/bbc/modem/modem.cpp2
-rw-r--r--src/devices/bus/bbc/modem/modem.h4
-rw-r--r--src/devices/bus/bbc/modem/scsiaiv.cpp6
-rw-r--r--src/devices/bus/bbc/modem/scsiaiv.h6
-rw-r--r--src/devices/bus/bbc/rom/datagem.cpp2
-rw-r--r--src/devices/bus/bbc/rom/datagem.h2
-rw-r--r--src/devices/bus/bbc/rom/dfs.cpp2
-rw-r--r--src/devices/bus/bbc/rom/dfs.h2
-rw-r--r--src/devices/bus/bbc/rom/genie.cpp2
-rw-r--r--src/devices/bus/bbc/rom/genie.h2
-rw-r--r--src/devices/bus/bbc/rom/nvram.cpp2
-rw-r--r--src/devices/bus/bbc/rom/nvram.h2
-rw-r--r--src/devices/bus/bbc/rom/pal.cpp20
-rw-r--r--src/devices/bus/bbc/rom/pal.h20
-rw-r--r--src/devices/bus/bbc/rom/ram.cpp2
-rw-r--r--src/devices/bus/bbc/rom/ram.h2
-rw-r--r--src/devices/bus/bbc/rom/rom.cpp2
-rw-r--r--src/devices/bus/bbc/rom/rom.h2
-rw-r--r--src/devices/bus/bbc/rom/rtc.cpp6
-rw-r--r--src/devices/bus/bbc/rom/rtc.h4
-rw-r--r--src/devices/bus/bbc/rom/slot.cpp6
-rw-r--r--src/devices/bus/bbc/rom/slot.h6
-rw-r--r--src/devices/bus/bbc/tube/tube.cpp2
-rw-r--r--src/devices/bus/bbc/tube/tube.h2
-rw-r--r--src/devices/bus/bbc/tube/tube_32016.cpp8
-rw-r--r--src/devices/bus/bbc/tube/tube_32016.h8
-rw-r--r--src/devices/bus/bbc/tube/tube_6502.cpp10
-rw-r--r--src/devices/bus/bbc/tube/tube_6502.h10
-rw-r--r--src/devices/bus/bbc/tube/tube_80186.cpp8
-rw-r--r--src/devices/bus/bbc/tube/tube_80186.h6
-rw-r--r--src/devices/bus/bbc/tube/tube_80286.cpp2
-rw-r--r--src/devices/bus/bbc/tube/tube_80286.h2
-rw-r--r--src/devices/bus/bbc/tube/tube_a500.cpp2
-rw-r--r--src/devices/bus/bbc/tube/tube_a500.h2
-rw-r--r--src/devices/bus/bbc/tube/tube_arm.cpp2
-rw-r--r--src/devices/bus/bbc/tube/tube_arm.h2
-rw-r--r--src/devices/bus/bbc/tube/tube_arm7.cpp2
-rw-r--r--src/devices/bus/bbc/tube/tube_arm7.h2
-rw-r--r--src/devices/bus/bbc/tube/tube_casper.cpp2
-rw-r--r--src/devices/bus/bbc/tube/tube_casper.h2
-rw-r--r--src/devices/bus/bbc/tube/tube_cms6809.cpp2
-rw-r--r--src/devices/bus/bbc/tube/tube_cms6809.h2
-rw-r--r--src/devices/bus/bbc/tube/tube_rc6502.cpp6
-rw-r--r--src/devices/bus/bbc/tube/tube_rc6502.h6
-rw-r--r--src/devices/bus/bbc/tube/tube_x25.cpp2
-rw-r--r--src/devices/bus/bbc/tube/tube_x25.h2
-rw-r--r--src/devices/bus/bbc/tube/tube_z80.cpp6
-rw-r--r--src/devices/bus/bbc/tube/tube_z80.h6
-rw-r--r--src/devices/bus/bbc/tube/tube_zep100.cpp12
-rw-r--r--src/devices/bus/bbc/tube/tube_zep100.h10
-rw-r--r--src/devices/bus/bbc/userport/beebspch.cpp8
-rw-r--r--src/devices/bus/bbc/userport/beebspch.h2
-rw-r--r--src/devices/bus/bbc/userport/cfa3000kbd.cpp2
-rw-r--r--src/devices/bus/bbc/userport/cfa3000kbd.h2
-rw-r--r--src/devices/bus/bbc/userport/lcd.cpp2
-rw-r--r--src/devices/bus/bbc/userport/lcd.h2
-rw-r--r--src/devices/bus/bbc/userport/m4000.cpp2
-rw-r--r--src/devices/bus/bbc/userport/m4000.h2
-rw-r--r--src/devices/bus/bbc/userport/palext.cpp6
-rw-r--r--src/devices/bus/bbc/userport/palext.h6
-rw-r--r--src/devices/bus/bbc/userport/pointer.cpp8
-rw-r--r--src/devices/bus/bbc/userport/pointer.h8
-rw-r--r--src/devices/bus/bbc/userport/sdcard.cpp10
-rw-r--r--src/devices/bus/bbc/userport/sdcard.h6
-rw-r--r--src/devices/bus/bbc/userport/userport.cpp2
-rw-r--r--src/devices/bus/bbc/userport/userport.h2
-rw-r--r--src/devices/bus/bbc/userport/usersplit.cpp2
-rw-r--r--src/devices/bus/bbc/userport/usersplit.h2
-rw-r--r--src/devices/bus/bbc/userport/voicebox.cpp4
-rw-r--r--src/devices/bus/bbc/userport/voicebox.h2
202 files changed, 396 insertions, 396 deletions
diff --git a/src/devices/bus/bbc/1mhzbus/1mhzbus.cpp b/src/devices/bus/bbc/1mhzbus/1mhzbus.cpp
index 0af231e4eb3..cbfba97eabb 100644
--- a/src/devices/bus/bbc/1mhzbus/1mhzbus.cpp
+++ b/src/devices/bus/bbc/1mhzbus/1mhzbus.cpp
@@ -41,7 +41,7 @@ device_bbc_1mhzbus_interface::device_bbc_1mhzbus_interface(const machine_config
// bbc_1mhzbus_slot_device - constructor
//-------------------------------------------------
-bbc_1mhzbus_slot_device::bbc_1mhzbus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+bbc_1mhzbus_slot_device::bbc_1mhzbus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, BBC_1MHZBUS_SLOT, tag, owner, clock),
device_single_card_slot_interface<device_bbc_1mhzbus_interface>(mconfig, *this),
m_card(nullptr),
diff --git a/src/devices/bus/bbc/1mhzbus/1mhzbus.h b/src/devices/bus/bbc/1mhzbus/1mhzbus.h
index 302348b6822..dcc1b26873e 100644
--- a/src/devices/bus/bbc/1mhzbus/1mhzbus.h
+++ b/src/devices/bus/bbc/1mhzbus/1mhzbus.h
@@ -92,7 +92,7 @@ class bbc_1mhzbus_slot_device : public device_t, public device_single_card_slot_
public:
// construction/destruction
template <typename T>
- bbc_1mhzbus_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock, T &&slot_options, const char *default_option)
+ bbc_1mhzbus_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock, T &&slot_options, const char *default_option)
: bbc_1mhzbus_slot_device(mconfig, tag, owner, clock)
{
option_reset();
@@ -101,7 +101,7 @@ public:
set_fixed(false);
}
- bbc_1mhzbus_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock);
+ bbc_1mhzbus_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock);
// callbacks
auto irq_handler() { return m_irq_handler.bind(); }
diff --git a/src/devices/bus/bbc/1mhzbus/autoprom.cpp b/src/devices/bus/bbc/1mhzbus/autoprom.cpp
index 0bf0b0cfefd..74c74c449f9 100644
--- a/src/devices/bus/bbc/1mhzbus/autoprom.cpp
+++ b/src/devices/bus/bbc/1mhzbus/autoprom.cpp
@@ -96,7 +96,7 @@ const tiny_rom_entry *bbc_autoprom_device::device_rom_region() const
// bbc_autoprom_device - constructor
//-------------------------------------------------
-bbc_autoprom_device::bbc_autoprom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_autoprom_device::bbc_autoprom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_AUTOPROM, tag, owner, clock)
, device_bbc_1mhzbus_interface(mconfig, *this)
, m_autorun(*this, "autorun")
diff --git a/src/devices/bus/bbc/1mhzbus/autoprom.h b/src/devices/bus/bbc/1mhzbus/autoprom.h
index 358b5819f2b..26f44b66351 100644
--- a/src/devices/bus/bbc/1mhzbus/autoprom.h
+++ b/src/devices/bus/bbc/1mhzbus/autoprom.h
@@ -23,7 +23,7 @@ class bbc_autoprom_device :
{
public:
// construction/destruction
- bbc_autoprom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_autoprom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/bbc/1mhzbus/beebopl.cpp b/src/devices/bus/bbc/1mhzbus/beebopl.cpp
index 9c3db9ca6ff..36c1cbe561f 100644
--- a/src/devices/bus/bbc/1mhzbus/beebopl.cpp
+++ b/src/devices/bus/bbc/1mhzbus/beebopl.cpp
@@ -47,7 +47,7 @@ void bbc_beebopl_device::device_add_mconfig(machine_config &config)
// bbc_beebopl_device - constructor
//-------------------------------------------------
-bbc_beebopl_device::bbc_beebopl_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_beebopl_device::bbc_beebopl_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_BEEBOPL, tag, owner, clock)
, device_bbc_1mhzbus_interface(mconfig, *this)
, m_1mhzbus(*this, "1mhzbus")
diff --git a/src/devices/bus/bbc/1mhzbus/beebopl.h b/src/devices/bus/bbc/1mhzbus/beebopl.h
index 618bea6af41..ba0dd7e7cbc 100644
--- a/src/devices/bus/bbc/1mhzbus/beebopl.h
+++ b/src/devices/bus/bbc/1mhzbus/beebopl.h
@@ -25,7 +25,7 @@ class bbc_beebopl_device :
{
public:
// construction/destruction
- bbc_beebopl_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_beebopl_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/bbc/1mhzbus/beebsid.cpp b/src/devices/bus/bbc/1mhzbus/beebsid.cpp
index d50449ede99..2ef317618d3 100644
--- a/src/devices/bus/bbc/1mhzbus/beebsid.cpp
+++ b/src/devices/bus/bbc/1mhzbus/beebsid.cpp
@@ -43,7 +43,7 @@ void bbc_beebsid_device::device_add_mconfig(machine_config &config)
// bbc_beebsid_device - constructor
//-------------------------------------------------
-bbc_beebsid_device::bbc_beebsid_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+bbc_beebsid_device::bbc_beebsid_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, BBC_BEEBSID, tag, owner, clock),
device_bbc_1mhzbus_interface(mconfig, *this),
m_1mhzbus(*this, "1mhzbus"),
diff --git a/src/devices/bus/bbc/1mhzbus/beebsid.h b/src/devices/bus/bbc/1mhzbus/beebsid.h
index 107e875abde..ff5e6e5120a 100644
--- a/src/devices/bus/bbc/1mhzbus/beebsid.h
+++ b/src/devices/bus/bbc/1mhzbus/beebsid.h
@@ -25,7 +25,7 @@ class bbc_beebsid_device :
{
public:
// construction/destruction
- bbc_beebsid_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_beebsid_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/bbc/1mhzbus/cc500.cpp b/src/devices/bus/bbc/1mhzbus/cc500.cpp
index c04fc06429e..17f51de4747 100644
--- a/src/devices/bus/bbc/1mhzbus/cc500.cpp
+++ b/src/devices/bus/bbc/1mhzbus/cc500.cpp
@@ -93,7 +93,7 @@ const tiny_rom_entry* bbc_cc500_device::device_rom_region() const
// bbc_cc500_device - constructor
//-------------------------------------------------
-bbc_cc500_device::bbc_cc500_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_cc500_device::bbc_cc500_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_CC500, tag, owner, clock)
, device_bbc_1mhzbus_interface(mconfig, *this)
, m_palette(*this, ":palette")
diff --git a/src/devices/bus/bbc/1mhzbus/cc500.h b/src/devices/bus/bbc/1mhzbus/cc500.h
index f99ceec100a..4831ed2526a 100644
--- a/src/devices/bus/bbc/1mhzbus/cc500.h
+++ b/src/devices/bus/bbc/1mhzbus/cc500.h
@@ -27,7 +27,7 @@ class bbc_cc500_device :
{
public:
// construction/destruction
- bbc_cc500_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_cc500_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/bbc/1mhzbus/cfa3000opt.cpp b/src/devices/bus/bbc/1mhzbus/cfa3000opt.cpp
index e5ac755e006..2146b4d1338 100644
--- a/src/devices/bus/bbc/1mhzbus/cfa3000opt.cpp
+++ b/src/devices/bus/bbc/1mhzbus/cfa3000opt.cpp
@@ -77,7 +77,7 @@ ioport_constructor cfa3000_opt_device::device_input_ports() const
// cfa3000_opt_device - constructor
//-------------------------------------------------
-cfa3000_opt_device::cfa3000_opt_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+cfa3000_opt_device::cfa3000_opt_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, CFA3000_OPT, tag, owner, clock),
device_bbc_1mhzbus_interface(mconfig, *this),
m_opt(*this, "OPT")
diff --git a/src/devices/bus/bbc/1mhzbus/cfa3000opt.h b/src/devices/bus/bbc/1mhzbus/cfa3000opt.h
index 64913e95604..cbe0ea3b270 100644
--- a/src/devices/bus/bbc/1mhzbus/cfa3000opt.h
+++ b/src/devices/bus/bbc/1mhzbus/cfa3000opt.h
@@ -26,7 +26,7 @@ class cfa3000_opt_device :
{
public:
// construction/destruction
- cfa3000_opt_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ cfa3000_opt_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/bbc/1mhzbus/cisco.cpp b/src/devices/bus/bbc/1mhzbus/cisco.cpp
index e12efa906d2..eb1fd20a76a 100644
--- a/src/devices/bus/bbc/1mhzbus/cisco.cpp
+++ b/src/devices/bus/bbc/1mhzbus/cisco.cpp
@@ -83,7 +83,7 @@ void bbc_cisco_device::device_add_mconfig(machine_config &config)
// bbc_cisco_device - constructor
//-------------------------------------------------
-bbc_cisco_device::bbc_cisco_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_cisco_device::bbc_cisco_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_CISCO, tag, owner, clock)
, device_bbc_1mhzbus_interface(mconfig, *this)
, device_rtc_interface(mconfig , *this)
diff --git a/src/devices/bus/bbc/1mhzbus/cisco.h b/src/devices/bus/bbc/1mhzbus/cisco.h
index fdbe528db98..80507f50979 100644
--- a/src/devices/bus/bbc/1mhzbus/cisco.h
+++ b/src/devices/bus/bbc/1mhzbus/cisco.h
@@ -25,7 +25,7 @@ class bbc_cisco_device
{
public:
// construction/destruction
- bbc_cisco_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_cisco_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/bbc/1mhzbus/datacentre.cpp b/src/devices/bus/bbc/1mhzbus/datacentre.cpp
index f21d5af1d54..d12694f314e 100644
--- a/src/devices/bus/bbc/1mhzbus/datacentre.cpp
+++ b/src/devices/bus/bbc/1mhzbus/datacentre.cpp
@@ -108,7 +108,7 @@ const tiny_rom_entry *bbc_datacentre_device::device_rom_region() const
// bbc_ide_device - constructor
//-------------------------------------------------
-bbc_datacentre_device::bbc_datacentre_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock)
+bbc_datacentre_device::bbc_datacentre_device(const machine_config& mconfig, const char* tag, device_t* owner, const XTAL &clock)
: device_t(mconfig, BBC_DATACENTRE, tag, owner, clock)
, device_bbc_1mhzbus_interface(mconfig, *this)
, m_links(*this, "LINKS")
diff --git a/src/devices/bus/bbc/1mhzbus/datacentre.h b/src/devices/bus/bbc/1mhzbus/datacentre.h
index c6846821e9b..597fd673bdb 100644
--- a/src/devices/bus/bbc/1mhzbus/datacentre.h
+++ b/src/devices/bus/bbc/1mhzbus/datacentre.h
@@ -27,7 +27,7 @@ class bbc_datacentre_device :
{
public:
// construction/destruction
- bbc_datacentre_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_datacentre_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
DECLARE_INPUT_CHANGED_MEMBER(import_nvrest);
template<int Drive> DECLARE_QUICKLOAD_LOAD_MEMBER(quickload_cb);
diff --git a/src/devices/bus/bbc/1mhzbus/emrmidi.cpp b/src/devices/bus/bbc/1mhzbus/emrmidi.cpp
index 6cfbacf23da..e1e1e6251c6 100644
--- a/src/devices/bus/bbc/1mhzbus/emrmidi.cpp
+++ b/src/devices/bus/bbc/1mhzbus/emrmidi.cpp
@@ -36,7 +36,7 @@ DEFINE_DEVICE_TYPE(BBC_EMRMIDI, bbc_emrmidi_device, "bbc_emrmidi", "EMR BBC Midi
void bbc_emrmidi_device::device_add_mconfig(machine_config &config)
{
- ACIA6850(config, m_acia, 0);
+ ACIA6850(config, m_acia);
m_acia->txd_handler().set("mdout1", FUNC(midi_port_device::write_txd));
m_acia->txd_handler().append("mdout2", FUNC(midi_port_device::write_txd));
m_acia->irq_handler().set(DEVICE_SELF_OWNER, FUNC(bbc_1mhzbus_slot_device::irq_w));
@@ -60,7 +60,7 @@ void bbc_emrmidi_device::device_add_mconfig(machine_config &config)
// bbc_emrmidi_device - constructor
//-------------------------------------------------
-bbc_emrmidi_device::bbc_emrmidi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_emrmidi_device::bbc_emrmidi_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_EMRMIDI, tag, owner, clock)
, device_bbc_1mhzbus_interface(mconfig, *this)
, m_acia(*this, "acia1")
diff --git a/src/devices/bus/bbc/1mhzbus/emrmidi.h b/src/devices/bus/bbc/1mhzbus/emrmidi.h
index 341e487ce24..228d37519f5 100644
--- a/src/devices/bus/bbc/1mhzbus/emrmidi.h
+++ b/src/devices/bus/bbc/1mhzbus/emrmidi.h
@@ -27,7 +27,7 @@ class bbc_emrmidi_device :
{
public:
// construction/destruction
- bbc_emrmidi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_emrmidi_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/bbc/1mhzbus/ide.cpp b/src/devices/bus/bbc/1mhzbus/ide.cpp
index d5fdafb000d..103066ecc81 100644
--- a/src/devices/bus/bbc/1mhzbus/ide.cpp
+++ b/src/devices/bus/bbc/1mhzbus/ide.cpp
@@ -78,14 +78,14 @@ void bbc_beebide_device::device_add_mconfig(machine_config& config)
// bbc_ide_device - constructor
//-------------------------------------------------
-bbc_ide8_device::bbc_ide8_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock)
+bbc_ide8_device::bbc_ide8_device(const machine_config& mconfig, const char* tag, device_t* owner, const XTAL &clock)
: device_t(mconfig, BBC_IDE8, tag, owner, clock)
, device_bbc_1mhzbus_interface(mconfig, *this)
, m_ide(*this, "ide")
{
}
-bbc_beebide_device::bbc_beebide_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock)
+bbc_beebide_device::bbc_beebide_device(const machine_config& mconfig, const char* tag, device_t* owner, const XTAL &clock)
: device_t(mconfig, BBC_BEEBIDE, tag, owner, clock)
, device_bbc_1mhzbus_interface(mconfig, *this)
, m_ide(*this, "ide")
diff --git a/src/devices/bus/bbc/1mhzbus/ide.h b/src/devices/bus/bbc/1mhzbus/ide.h
index d326c199ce9..dfddadf1f67 100644
--- a/src/devices/bus/bbc/1mhzbus/ide.h
+++ b/src/devices/bus/bbc/1mhzbus/ide.h
@@ -29,7 +29,7 @@ class bbc_ide8_device :
{
public:
// construction/destruction
- bbc_ide8_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock);
+ bbc_ide8_device(const machine_config& mconfig, const char* tag, device_t* owner, const XTAL &clock);
protected:
// device-level overrides
@@ -52,7 +52,7 @@ class bbc_beebide_device :
{
public:
// construction/destruction
- bbc_beebide_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock);
+ bbc_beebide_device(const machine_config& mconfig, const char* tag, device_t* owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/bbc/1mhzbus/ieee488.cpp b/src/devices/bus/bbc/1mhzbus/ieee488.cpp
index 3ddb6a13dc1..c0bcecc85d5 100644
--- a/src/devices/bus/bbc/1mhzbus/ieee488.cpp
+++ b/src/devices/bus/bbc/1mhzbus/ieee488.cpp
@@ -155,7 +155,7 @@ const tiny_rom_entry *bbc_ieee488_device::device_rom_region() const
// bbc_ieee488_device - constructor
//-------------------------------------------------
-bbc_ieee488_device::bbc_ieee488_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_ieee488_device::bbc_ieee488_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_IEEE488, tag, owner, clock)
, device_bbc_1mhzbus_interface(mconfig, *this)
, m_ieee(*this, IEEE488_TAG)
@@ -164,7 +164,7 @@ bbc_ieee488_device::bbc_ieee488_device(const machine_config &mconfig, const char
{
}
-bbc_b488_device::bbc_b488_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_b488_device::bbc_b488_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_B488, tag, owner, clock)
, device_bbc_1mhzbus_interface(mconfig, *this)
, m_ieee(*this, IEEE488_TAG)
@@ -172,7 +172,7 @@ bbc_b488_device::bbc_b488_device(const machine_config &mconfig, const char *tag,
{
}
-//bbc_procyon_device::bbc_procyon_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+//bbc_procyon_device::bbc_procyon_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
// : device_t(mconfig, BBC_PROCYON, tag, owner, clock)
// , device_bbc_1mhzbus_interface(mconfig, *this)
// , m_ieee(*this, IEEE488_TAG)
diff --git a/src/devices/bus/bbc/1mhzbus/ieee488.h b/src/devices/bus/bbc/1mhzbus/ieee488.h
index 9b810b4bf8d..b45c860b88d 100644
--- a/src/devices/bus/bbc/1mhzbus/ieee488.h
+++ b/src/devices/bus/bbc/1mhzbus/ieee488.h
@@ -32,7 +32,7 @@ class bbc_ieee488_device:
{
public:
// construction/destruction
- bbc_ieee488_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_ieee488_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
@@ -60,7 +60,7 @@ class bbc_b488_device :
{
public:
// construction/destruction
- bbc_b488_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_b488_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
@@ -84,7 +84,7 @@ private:
//{
//public:
// // construction/destruction
-// bbc_procyon_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+// bbc_procyon_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
//
//protected:
// // device-level overrides
diff --git a/src/devices/bus/bbc/1mhzbus/m2000.cpp b/src/devices/bus/bbc/1mhzbus/m2000.cpp
index 8203cada22e..c9c874da0c3 100644
--- a/src/devices/bus/bbc/1mhzbus/m2000.cpp
+++ b/src/devices/bus/bbc/1mhzbus/m2000.cpp
@@ -30,15 +30,15 @@ void bbc_m2000_device::device_add_mconfig(machine_config &config)
{
INPUT_MERGER_ANY_HIGH(config, m_irqs).output_handler().set(DEVICE_SELF_OWNER, FUNC(bbc_1mhzbus_slot_device::irq_w));
- ACIA6850(config, m_acia1, 0);
+ ACIA6850(config, m_acia1);
m_acia1->txd_handler().set("mdout1", FUNC(midi_port_device::write_txd));
m_acia1->irq_handler().set(m_irqs, FUNC(input_merger_device::in_w<0>));
- ACIA6850(config, m_acia2, 0);
+ ACIA6850(config, m_acia2);
m_acia2->txd_handler().set("mdout2", FUNC(midi_port_device::write_txd));
m_acia2->irq_handler().set(m_irqs, FUNC(input_merger_device::in_w<1>));
- ACIA6850(config, m_acia3, 0);
+ ACIA6850(config, m_acia3);
m_acia3->txd_handler().set("mdout3", FUNC(midi_port_device::write_txd));
m_acia3->irq_handler().set(m_irqs, FUNC(input_merger_device::in_w<2>));
@@ -66,7 +66,7 @@ void bbc_m2000_device::device_add_mconfig(machine_config &config)
// bbc_m2000_device - constructor
//-------------------------------------------------
-bbc_m2000_device::bbc_m2000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_m2000_device::bbc_m2000_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_M2000, tag, owner, clock)
, device_bbc_1mhzbus_interface(mconfig, *this)
, m_1mhzbus(*this, "1mhzbus")
diff --git a/src/devices/bus/bbc/1mhzbus/m2000.h b/src/devices/bus/bbc/1mhzbus/m2000.h
index eeee1034a4e..8680d6f2287 100644
--- a/src/devices/bus/bbc/1mhzbus/m2000.h
+++ b/src/devices/bus/bbc/1mhzbus/m2000.h
@@ -29,7 +29,7 @@ class bbc_m2000_device :
{
public:
// construction/destruction
- bbc_m2000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_m2000_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/bbc/1mhzbus/m5000.cpp b/src/devices/bus/bbc/1mhzbus/m5000.cpp
index ae3fd948969..77f300ec6e1 100644
--- a/src/devices/bus/bbc/1mhzbus/m5000.cpp
+++ b/src/devices/bus/bbc/1mhzbus/m5000.cpp
@@ -120,7 +120,7 @@ void bbc_m87_device::device_add_mconfig(machine_config &config)
// bbc_hybrid_device - constructor
//-------------------------------------------------
-bbc_m500_device::bbc_m500_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+bbc_m500_device::bbc_m500_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_bbc_1mhzbus_interface(mconfig, *this)
, m_1mhzbus(*this, "1mhzbus")
@@ -129,22 +129,22 @@ bbc_m500_device::bbc_m500_device(const machine_config &mconfig, device_type type
{
}
-bbc_m500_device::bbc_m500_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_m500_device::bbc_m500_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_m500_device(mconfig, BBC_M500, tag, owner, clock)
{
}
-bbc_m5000_device::bbc_m5000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_m5000_device::bbc_m5000_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_m500_device(mconfig, BBC_M5000, tag, owner, clock)
{
}
-bbc_m3000_device::bbc_m3000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_m3000_device::bbc_m3000_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_m500_device(mconfig, BBC_M3000, tag, owner, clock)
{
}
-bbc_m87_device::bbc_m87_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_m87_device::bbc_m87_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_m500_device(mconfig, BBC_M87, tag, owner, clock)
{
}
@@ -219,7 +219,7 @@ void bbc_m3000_device::jim_w(offs_t offset, uint8_t data)
// htmusic_device - constructor
//-------------------------------------------------
-htmusic_device::htmusic_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+htmusic_device::htmusic_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, HTMUSIC, tag, owner, clock)
, device_sound_interface(mconfig, *this)
, m_counter(0)
diff --git a/src/devices/bus/bbc/1mhzbus/m5000.h b/src/devices/bus/bbc/1mhzbus/m5000.h
index 116bc17cebe..eaa4c19ebbe 100644
--- a/src/devices/bus/bbc/1mhzbus/m5000.h
+++ b/src/devices/bus/bbc/1mhzbus/m5000.h
@@ -37,7 +37,7 @@
class htmusic_device : public device_t, public device_sound_interface
{
public:
- htmusic_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ htmusic_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
void ram_w(offs_t offset, uint8_t data) { m_wave_ram[offset & 0x7ff] = data; }
@@ -78,10 +78,10 @@ class bbc_m500_device : public device_t, public device_bbc_1mhzbus_interface
{
public:
// construction/destruction
- bbc_m500_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_m500_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- bbc_m500_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ bbc_m500_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
// device-level overrides
virtual void device_start() override;
@@ -109,7 +109,7 @@ class bbc_m5000_device : public bbc_m500_device
{
public:
// construction/destruction
- bbc_m5000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_m5000_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// optional information overrides
@@ -124,7 +124,7 @@ class bbc_m3000_device : public bbc_m500_device
{
public:
// construction/destruction
- bbc_m3000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_m3000_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// optional information overrides
@@ -140,7 +140,7 @@ class bbc_m87_device : public bbc_m500_device
{
public:
// construction/destruction
- bbc_m87_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_m87_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// optional information overrides
diff --git a/src/devices/bus/bbc/1mhzbus/multiform.cpp b/src/devices/bus/bbc/1mhzbus/multiform.cpp
index 081c488107a..52e13320446 100644
--- a/src/devices/bus/bbc/1mhzbus/multiform.cpp
+++ b/src/devices/bus/bbc/1mhzbus/multiform.cpp
@@ -95,7 +95,7 @@ const tiny_rom_entry *bbc_multiform_device::device_rom_region() const
// bbc_multiform_device - constructor
//-------------------------------------------------
-bbc_multiform_device::bbc_multiform_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_multiform_device::bbc_multiform_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_MULTIFORM, tag, owner, clock)
, device_bbc_1mhzbus_interface(mconfig, *this)
, m_z80(*this, "z80")
diff --git a/src/devices/bus/bbc/1mhzbus/multiform.h b/src/devices/bus/bbc/1mhzbus/multiform.h
index 586ebe0d7d2..769b87a0876 100644
--- a/src/devices/bus/bbc/1mhzbus/multiform.h
+++ b/src/devices/bus/bbc/1mhzbus/multiform.h
@@ -28,7 +28,7 @@ class bbc_multiform_device :
{
public:
// construction/destruction
- bbc_multiform_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_multiform_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
uint8_t mem_r(offs_t offset);
void mem_w(offs_t offset, uint8_t data);
diff --git a/src/devices/bus/bbc/1mhzbus/opus3.cpp b/src/devices/bus/bbc/1mhzbus/opus3.cpp
index f537eb88b54..da82188d1e8 100644
--- a/src/devices/bus/bbc/1mhzbus/opus3.cpp
+++ b/src/devices/bus/bbc/1mhzbus/opus3.cpp
@@ -126,7 +126,7 @@ const tiny_rom_entry *bbc_opusa_device::device_rom_region() const
// bbc_opus3_device - constructor
//-------------------------------------------------
-bbc_opus3_device::bbc_opus3_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+bbc_opus3_device::bbc_opus3_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_bbc_1mhzbus_interface(mconfig, *this)
, m_ramdisk(*this, "ramdisk")
@@ -136,12 +136,12 @@ bbc_opus3_device::bbc_opus3_device(const machine_config &mconfig, device_type ty
{
}
-bbc_opus3_device::bbc_opus3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_opus3_device::bbc_opus3_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_opus3_device(mconfig, BBC_OPUS3, tag, owner, clock)
{
}
-bbc_opusa_device::bbc_opusa_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_opusa_device::bbc_opusa_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_opus3_device(mconfig, BBC_OPUSA, tag, owner, clock)
{
}
diff --git a/src/devices/bus/bbc/1mhzbus/opus3.h b/src/devices/bus/bbc/1mhzbus/opus3.h
index 2fd06b4015f..ba44d44ea4e 100644
--- a/src/devices/bus/bbc/1mhzbus/opus3.h
+++ b/src/devices/bus/bbc/1mhzbus/opus3.h
@@ -27,10 +27,10 @@ class bbc_opus3_device:
{
public:
// construction/destruction
- bbc_opus3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_opus3_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- bbc_opus3_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ bbc_opus3_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
// device-level overrides
virtual void device_start() override;
@@ -59,7 +59,7 @@ class bbc_opusa_device : public bbc_opus3_device
{
public:
// construction/destruction
- bbc_opusa_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_opusa_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/bbc/1mhzbus/pdram.cpp b/src/devices/bus/bbc/1mhzbus/pdram.cpp
index 81106218fc4..fbdd63d9923 100644
--- a/src/devices/bus/bbc/1mhzbus/pdram.cpp
+++ b/src/devices/bus/bbc/1mhzbus/pdram.cpp
@@ -44,7 +44,7 @@ const tiny_rom_entry* bbc_pdram_device::device_rom_region() const
// bbc_pdram_device - constructor
//-------------------------------------------------
-bbc_pdram_device::bbc_pdram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_pdram_device::bbc_pdram_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_PDRAM, tag, owner, clock)
, device_bbc_1mhzbus_interface(mconfig, *this)
, m_ram_page(0)
diff --git a/src/devices/bus/bbc/1mhzbus/pdram.h b/src/devices/bus/bbc/1mhzbus/pdram.h
index 23f5b2884ca..7f1e71d6109 100644
--- a/src/devices/bus/bbc/1mhzbus/pdram.h
+++ b/src/devices/bus/bbc/1mhzbus/pdram.h
@@ -22,7 +22,7 @@ class bbc_pdram_device:
{
public:
// construction/destruction
- bbc_pdram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_pdram_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/bbc/1mhzbus/pms64k.cpp b/src/devices/bus/bbc/1mhzbus/pms64k.cpp
index 0c975b39f48..2633f79381d 100644
--- a/src/devices/bus/bbc/1mhzbus/pms64k.cpp
+++ b/src/devices/bus/bbc/1mhzbus/pms64k.cpp
@@ -38,7 +38,7 @@ void bbc_pms64k_device::device_add_mconfig(machine_config &config)
// bbc_pms64k_device - constructor
//-------------------------------------------------
-bbc_pms64k_device::bbc_pms64k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_pms64k_device::bbc_pms64k_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_PMS64K, tag, owner, clock)
, device_bbc_1mhzbus_interface(mconfig, *this)
, m_nvram(*this, "nvram")
diff --git a/src/devices/bus/bbc/1mhzbus/pms64k.h b/src/devices/bus/bbc/1mhzbus/pms64k.h
index 8b817b7db1d..aac78a1f298 100644
--- a/src/devices/bus/bbc/1mhzbus/pms64k.h
+++ b/src/devices/bus/bbc/1mhzbus/pms64k.h
@@ -23,7 +23,7 @@ class bbc_pms64k_device:
{
public:
// construction/destruction
- bbc_pms64k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_pms64k_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/bbc/1mhzbus/ramdisc.cpp b/src/devices/bus/bbc/1mhzbus/ramdisc.cpp
index 7552042a716..ac5d12530e8 100644
--- a/src/devices/bus/bbc/1mhzbus/ramdisc.cpp
+++ b/src/devices/bus/bbc/1mhzbus/ramdisc.cpp
@@ -86,7 +86,7 @@ const tiny_rom_entry *bbc_ramdisc_device::device_rom_region() const
// bbc_ramdisc_device - constructor
//-------------------------------------------------
-bbc_ramdisc_device::bbc_ramdisc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_ramdisc_device::bbc_ramdisc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_RAMDISC, tag, owner, clock)
, device_bbc_1mhzbus_interface(mconfig, *this)
, m_1mhzbus(*this, "1mhzbus")
diff --git a/src/devices/bus/bbc/1mhzbus/ramdisc.h b/src/devices/bus/bbc/1mhzbus/ramdisc.h
index a4955921bcc..ca27e7bc309 100644
--- a/src/devices/bus/bbc/1mhzbus/ramdisc.h
+++ b/src/devices/bus/bbc/1mhzbus/ramdisc.h
@@ -23,7 +23,7 @@ class bbc_ramdisc_device:
{
public:
// construction/destruction
- bbc_ramdisc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_ramdisc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
DECLARE_INPUT_CHANGED_MEMBER(power_changed);
diff --git a/src/devices/bus/bbc/1mhzbus/sasi.cpp b/src/devices/bus/bbc/1mhzbus/sasi.cpp
index 9a55916f8f1..16d60d94f62 100644
--- a/src/devices/bus/bbc/1mhzbus/sasi.cpp
+++ b/src/devices/bus/bbc/1mhzbus/sasi.cpp
@@ -72,7 +72,7 @@ void bbc_torchhd_device::device_add_mconfig(machine_config &config)
// bbc_sasi_device - constructor
//-------------------------------------------------
-bbc_sasi_device::bbc_sasi_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+bbc_sasi_device::bbc_sasi_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_bbc_1mhzbus_interface(mconfig, *this)
, m_sasi(*this, "sasi:7:scsicb")
@@ -80,12 +80,12 @@ bbc_sasi_device::bbc_sasi_device(const machine_config &mconfig, device_type type
{
}
-bbc_sasi_device::bbc_sasi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_sasi_device::bbc_sasi_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_sasi_device(mconfig, BBC_SASI, tag, owner, clock)
{
}
-bbc_torchhd_device::bbc_torchhd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_torchhd_device::bbc_torchhd_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_sasi_device(mconfig, BBC_TORCHHD, tag, owner, clock)
{
}
diff --git a/src/devices/bus/bbc/1mhzbus/sasi.h b/src/devices/bus/bbc/1mhzbus/sasi.h
index e1b81125ecd..3ce5d0d6485 100644
--- a/src/devices/bus/bbc/1mhzbus/sasi.h
+++ b/src/devices/bus/bbc/1mhzbus/sasi.h
@@ -24,13 +24,13 @@ class bbc_sasi_device:
{
public:
// construction/destruction
- bbc_sasi_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_sasi_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
DECLARE_WRITE_LINE_MEMBER(req_w);
DECLARE_WRITE_LINE_MEMBER(sel_w);
protected:
- bbc_sasi_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ bbc_sasi_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
// device-level overrides
virtual void device_start() override;
@@ -55,7 +55,7 @@ class bbc_torchhd_device : public bbc_sasi_device
{
public:
// construction/destruction
- bbc_torchhd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_torchhd_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// optional information overrides
diff --git a/src/devices/bus/bbc/1mhzbus/scsi.cpp b/src/devices/bus/bbc/1mhzbus/scsi.cpp
index 26c640467b3..b3fd0cd1db8 100644
--- a/src/devices/bus/bbc/1mhzbus/scsi.cpp
+++ b/src/devices/bus/bbc/1mhzbus/scsi.cpp
@@ -87,19 +87,19 @@ void bbc_awhd_device::device_add_mconfig(machine_config &config)
// bbc_scsi_device - constructor
//-------------------------------------------------
-bbc_scsi_device::bbc_scsi_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+bbc_scsi_device::bbc_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_bbc_1mhzbus_interface(mconfig, *this)
, m_scsi(*this, "scsi:7:scsicb")
{
}
-bbc_scsi_device::bbc_scsi_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock)
+bbc_scsi_device::bbc_scsi_device(const machine_config& mconfig, const char* tag, device_t* owner, const XTAL &clock)
: bbc_scsi_device(mconfig, BBC_SCSI, tag, owner, clock)
{
}
-bbc_awhd_device::bbc_awhd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_awhd_device::bbc_awhd_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_scsi_device(mconfig, BBC_AWHD, tag, owner, clock)
, m_1mhzbus(*this, "1mhzbus")
{
diff --git a/src/devices/bus/bbc/1mhzbus/scsi.h b/src/devices/bus/bbc/1mhzbus/scsi.h
index 8a4dabbe113..5c16af7676c 100644
--- a/src/devices/bus/bbc/1mhzbus/scsi.h
+++ b/src/devices/bus/bbc/1mhzbus/scsi.h
@@ -24,13 +24,13 @@ class bbc_scsi_device:
{
public:
// construction/destruction
- bbc_scsi_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock);
+ bbc_scsi_device(const machine_config& mconfig, const char* tag, device_t* owner, const XTAL &clock);
DECLARE_WRITE_LINE_MEMBER(bsy_w);
DECLARE_WRITE_LINE_MEMBER(req_w);
protected:
- bbc_scsi_device(const machine_config& mconfig, device_type type, const char* tag, device_t* owner, uint32_t clock);
+ bbc_scsi_device(const machine_config& mconfig, device_type type, const char* tag, device_t* owner, const XTAL &clock);
// device-level overrides
virtual void device_start() override;
@@ -57,7 +57,7 @@ public:
static constexpr feature_type imperfect_features() { return feature::DISK; }
// construction/destruction
- bbc_awhd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_awhd_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// optional information overrides
diff --git a/src/devices/bus/bbc/1mhzbus/sprite.cpp b/src/devices/bus/bbc/1mhzbus/sprite.cpp
index ee7f5f292e7..f47ca52e0c3 100644
--- a/src/devices/bus/bbc/1mhzbus/sprite.cpp
+++ b/src/devices/bus/bbc/1mhzbus/sprite.cpp
@@ -41,7 +41,7 @@ void bbc_sprite_device::device_add_mconfig(machine_config &config)
// bbc_sprite_device - constructor
//-------------------------------------------------
-bbc_sprite_device::bbc_sprite_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_sprite_device::bbc_sprite_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_SPRITE, tag, owner, clock)
, device_bbc_1mhzbus_interface(mconfig, *this)
, m_vdp(*this, "vdp")
diff --git a/src/devices/bus/bbc/1mhzbus/sprite.h b/src/devices/bus/bbc/1mhzbus/sprite.h
index 02b0cff5dc2..a6aac9f0bda 100644
--- a/src/devices/bus/bbc/1mhzbus/sprite.h
+++ b/src/devices/bus/bbc/1mhzbus/sprite.h
@@ -24,7 +24,7 @@ class bbc_sprite_device:
{
public:
// construction/destruction
- bbc_sprite_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_sprite_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/bbc/analogue/analogue.cpp b/src/devices/bus/bbc/analogue/analogue.cpp
index 6dce6a36e99..f631033da42 100644
--- a/src/devices/bus/bbc/analogue/analogue.cpp
+++ b/src/devices/bus/bbc/analogue/analogue.cpp
@@ -41,7 +41,7 @@ device_bbc_analogue_interface::device_bbc_analogue_interface(const machine_confi
// bbc_analogue_slot_device - constructor
//-------------------------------------------------
-bbc_analogue_slot_device::bbc_analogue_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+bbc_analogue_slot_device::bbc_analogue_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, BBC_ANALOGUE_SLOT, tag, owner, clock),
device_single_card_slot_interface<device_bbc_analogue_interface>(mconfig, *this),
m_card(nullptr),
diff --git a/src/devices/bus/bbc/analogue/analogue.h b/src/devices/bus/bbc/analogue/analogue.h
index bb58d2d0148..062abe5842f 100644
--- a/src/devices/bus/bbc/analogue/analogue.h
+++ b/src/devices/bus/bbc/analogue/analogue.h
@@ -55,7 +55,7 @@ public:
set_fixed(false);
}
- bbc_analogue_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock = 0);
+ bbc_analogue_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock = XTAL());
// callbacks
auto lpstb_handler() { return m_lpstb_handler.bind(); }
diff --git a/src/devices/bus/bbc/analogue/bitstik.cpp b/src/devices/bus/bbc/analogue/bitstik.cpp
index f904e20db9f..68df8b71769 100644
--- a/src/devices/bus/bbc/analogue/bitstik.cpp
+++ b/src/devices/bus/bbc/analogue/bitstik.cpp
@@ -89,7 +89,7 @@ const tiny_rom_entry *bbc_bitstik2_device::device_rom_region() const
// bbc_bitstik_device - constructor
//-------------------------------------------------
-bbc_bitstik_device::bbc_bitstik_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+bbc_bitstik_device::bbc_bitstik_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_bbc_analogue_interface(mconfig, *this),
m_channel(*this, "CHANNEL%u", 0),
@@ -97,12 +97,12 @@ bbc_bitstik_device::bbc_bitstik_device(const machine_config &mconfig, device_typ
{
}
-bbc_bitstik1_device::bbc_bitstik1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+bbc_bitstik1_device::bbc_bitstik1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
bbc_bitstik_device(mconfig, BBC_BITSTIK1, tag, owner, clock)
{
}
-bbc_bitstik2_device::bbc_bitstik2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+bbc_bitstik2_device::bbc_bitstik2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
bbc_bitstik_device(mconfig, BBC_BITSTIK2, tag, owner, clock)
{
}
diff --git a/src/devices/bus/bbc/analogue/bitstik.h b/src/devices/bus/bbc/analogue/bitstik.h
index 494be5dec69..89747c5c1fb 100644
--- a/src/devices/bus/bbc/analogue/bitstik.h
+++ b/src/devices/bus/bbc/analogue/bitstik.h
@@ -31,7 +31,7 @@ class bbc_bitstik_device :
{
protected:
// construction/destruction
- bbc_bitstik_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ bbc_bitstik_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
// device-level overrides
virtual void device_start() override;
@@ -50,7 +50,7 @@ private:
class bbc_bitstik1_device : public bbc_bitstik_device
{
public:
- bbc_bitstik1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_bitstik1_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;
@@ -59,7 +59,7 @@ protected:
class bbc_bitstik2_device : public bbc_bitstik_device
{
public:
- bbc_bitstik2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_bitstik2_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/bbc/analogue/cfa3000a.cpp b/src/devices/bus/bbc/analogue/cfa3000a.cpp
index f48234e091b..754dbbf75b9 100644
--- a/src/devices/bus/bbc/analogue/cfa3000a.cpp
+++ b/src/devices/bus/bbc/analogue/cfa3000a.cpp
@@ -58,7 +58,7 @@ ioport_constructor cfa3000_anlg_device::device_input_ports() const
// cfa3000_anlg_device - constructor
//-------------------------------------------------
-cfa3000_anlg_device::cfa3000_anlg_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+cfa3000_anlg_device::cfa3000_anlg_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, CFA3000_ANLG, tag, owner, clock),
device_bbc_analogue_interface(mconfig, *this),
m_channel(*this, "CHANNEL%u", 0),
diff --git a/src/devices/bus/bbc/analogue/cfa3000a.h b/src/devices/bus/bbc/analogue/cfa3000a.h
index 8948ca586be..6662f02ceb8 100644
--- a/src/devices/bus/bbc/analogue/cfa3000a.h
+++ b/src/devices/bus/bbc/analogue/cfa3000a.h
@@ -26,7 +26,7 @@ class cfa3000_anlg_device :
{
public:
// construction/destruction
- cfa3000_anlg_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ cfa3000_anlg_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/bbc/analogue/joystick.cpp b/src/devices/bus/bbc/analogue/joystick.cpp
index 434ea1060b2..c938d327799 100644
--- a/src/devices/bus/bbc/analogue/joystick.cpp
+++ b/src/devices/bus/bbc/analogue/joystick.cpp
@@ -82,7 +82,7 @@ ioport_constructor bbc_voltmace3b_device::device_input_ports() const
// bbc_joystick_device - constructor
//-------------------------------------------------
-bbc_joystick_device::bbc_joystick_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+bbc_joystick_device::bbc_joystick_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_bbc_analogue_interface(mconfig, *this),
m_joy(*this, "JOY%u", 0),
@@ -90,12 +90,12 @@ bbc_joystick_device::bbc_joystick_device(const machine_config &mconfig, device_t
{
}
-bbc_acornjoy_device::bbc_acornjoy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+bbc_acornjoy_device::bbc_acornjoy_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
bbc_joystick_device(mconfig, BBC_ACORNJOY, tag, owner, clock)
{
}
-bbc_voltmace3b_device::bbc_voltmace3b_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+bbc_voltmace3b_device::bbc_voltmace3b_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
bbc_joystick_device(mconfig, BBC_VOLTMACE3B, tag, owner, clock)
{
}
diff --git a/src/devices/bus/bbc/analogue/joystick.h b/src/devices/bus/bbc/analogue/joystick.h
index 887e87c74d7..2cefd0ab9d5 100644
--- a/src/devices/bus/bbc/analogue/joystick.h
+++ b/src/devices/bus/bbc/analogue/joystick.h
@@ -26,7 +26,7 @@ class bbc_joystick_device :
{
protected:
// construction/destruction
- bbc_joystick_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ bbc_joystick_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
// device-level overrides
virtual void device_start() override;
@@ -43,7 +43,7 @@ private:
class bbc_acornjoy_device : public bbc_joystick_device
{
public:
- bbc_acornjoy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_acornjoy_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
virtual ioport_constructor device_input_ports() const override;
};
@@ -51,7 +51,7 @@ public:
class bbc_voltmace3b_device : public bbc_joystick_device
{
public:
- bbc_voltmace3b_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_voltmace3b_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
virtual ioport_constructor device_input_ports() const override;
};
diff --git a/src/devices/bus/bbc/cart/click.cpp b/src/devices/bus/bbc/cart/click.cpp
index 175de5eeae3..a0277210137 100644
--- a/src/devices/bus/bbc/cart/click.cpp
+++ b/src/devices/bus/bbc/cart/click.cpp
@@ -54,7 +54,7 @@ ioport_constructor bbc_click_device::device_input_ports() const
// bbc_click_device - constructor
//-------------------------------------------------
-bbc_click_device::bbc_click_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_click_device::bbc_click_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_CLICK, tag, owner, clock)
, device_bbc_cart_interface(mconfig, *this)
{
diff --git a/src/devices/bus/bbc/cart/click.h b/src/devices/bus/bbc/cart/click.h
index 9f6691c4356..bd71bea4053 100644
--- a/src/devices/bus/bbc/cart/click.h
+++ b/src/devices/bus/bbc/cart/click.h
@@ -26,7 +26,7 @@ class bbc_click_device : public device_t, public device_bbc_cart_interface
{
public:
// construction/destruction
- bbc_click_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_click_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
DECLARE_INPUT_CHANGED_MEMBER(click_button);
diff --git a/src/devices/bus/bbc/cart/mastersd.cpp b/src/devices/bus/bbc/cart/mastersd.cpp
index 1c1d21ede72..4395b9002ae 100644
--- a/src/devices/bus/bbc/cart/mastersd.cpp
+++ b/src/devices/bus/bbc/cart/mastersd.cpp
@@ -26,7 +26,7 @@ DEFINE_DEVICE_TYPE(BBC_MASTERSD, bbc_mastersd_device, "bbc_mastersd", "MasterSD
void bbc_mastersd_device::device_add_mconfig(machine_config &config)
{
- SPI_SDCARD(config, m_sdcard, 0);
+ SPI_SDCARD(config, m_sdcard);
m_sdcard->spi_miso_callback().set([this](int state) { m_in_bit = state; });
}
@@ -38,7 +38,7 @@ void bbc_mastersd_device::device_add_mconfig(machine_config &config)
// bbc_mastersd_device - constructor
//-------------------------------------------------
-bbc_mastersd_device::bbc_mastersd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_mastersd_device::bbc_mastersd_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_MASTERSD, tag, owner, clock)
, device_bbc_cart_interface(mconfig, *this)
, m_sdcard(*this, "sdcard")
diff --git a/src/devices/bus/bbc/cart/mastersd.h b/src/devices/bus/bbc/cart/mastersd.h
index cd6d399176d..b05a613576e 100644
--- a/src/devices/bus/bbc/cart/mastersd.h
+++ b/src/devices/bus/bbc/cart/mastersd.h
@@ -21,7 +21,7 @@ class bbc_mastersd_device : public device_t, public device_bbc_cart_interface
{
public:
// construction/destruction
- bbc_mastersd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_mastersd_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/bbc/cart/mega256.cpp b/src/devices/bus/bbc/cart/mega256.cpp
index f0348df2e74..985ab6082a2 100644
--- a/src/devices/bus/bbc/cart/mega256.cpp
+++ b/src/devices/bus/bbc/cart/mega256.cpp
@@ -27,7 +27,7 @@ DEFINE_DEVICE_TYPE(BBC_MEGA256, bbc_mega256_device, "bbc_mega256", "Solidisk Meg
// bbc_mega256_device - constructor
//-------------------------------------------------
-bbc_mega256_device::bbc_mega256_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_mega256_device::bbc_mega256_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_MEGA256, tag, owner, clock)
, device_bbc_cart_interface(mconfig, *this)
, m_page(0)
diff --git a/src/devices/bus/bbc/cart/mega256.h b/src/devices/bus/bbc/cart/mega256.h
index b6f211b694a..f6f1fdbab6a 100644
--- a/src/devices/bus/bbc/cart/mega256.h
+++ b/src/devices/bus/bbc/cart/mega256.h
@@ -26,7 +26,7 @@ class bbc_mega256_device : public device_t, public device_bbc_cart_interface
{
public:
// construction/destruction
- bbc_mega256_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_mega256_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/bbc/cart/mr8000.cpp b/src/devices/bus/bbc/cart/mr8000.cpp
index a039936f23a..8a7e127d4c4 100644
--- a/src/devices/bus/bbc/cart/mr8000.cpp
+++ b/src/devices/bus/bbc/cart/mr8000.cpp
@@ -51,7 +51,7 @@ ioport_constructor bbc_mr8000_device::device_input_ports() const
// bbc_mr8000_device - constructor
//-------------------------------------------------
-bbc_mr8000_device::bbc_mr8000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_mr8000_device::bbc_mr8000_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_MR8000, tag, owner, clock)
, device_bbc_cart_interface(mconfig, *this)
, m_switch(*this, "SWITCH")
diff --git a/src/devices/bus/bbc/cart/mr8000.h b/src/devices/bus/bbc/cart/mr8000.h
index ccf79e4508e..d2d37b4ec40 100644
--- a/src/devices/bus/bbc/cart/mr8000.h
+++ b/src/devices/bus/bbc/cart/mr8000.h
@@ -24,7 +24,7 @@ class bbc_mr8000_device : public device_t, public device_bbc_cart_interface
{
public:
// construction/destruction
- bbc_mr8000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_mr8000_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/bbc/cart/msc.cpp b/src/devices/bus/bbc/cart/msc.cpp
index 05a3284e83d..ca282be539e 100644
--- a/src/devices/bus/bbc/cart/msc.cpp
+++ b/src/devices/bus/bbc/cart/msc.cpp
@@ -44,7 +44,7 @@ ioport_constructor bbc_msc_device::device_input_ports() const
// bbc_msc_device - constructor
//-------------------------------------------------
-bbc_msc_device::bbc_msc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_msc_device::bbc_msc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_MSC, tag, owner, clock)
, device_bbc_cart_interface(mconfig, *this)
, m_button(*this, "BUTTON")
diff --git a/src/devices/bus/bbc/cart/msc.h b/src/devices/bus/bbc/cart/msc.h
index 4bde2113047..22affbb6d58 100644
--- a/src/devices/bus/bbc/cart/msc.h
+++ b/src/devices/bus/bbc/cart/msc.h
@@ -24,7 +24,7 @@ class bbc_msc_device : public device_t, public device_bbc_cart_interface
{
public:
// construction/destruction
- bbc_msc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_msc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
DECLARE_INPUT_CHANGED_MEMBER(activate);
diff --git a/src/devices/bus/bbc/cart/slot.cpp b/src/devices/bus/bbc/cart/slot.cpp
index 04e01ac04db..e6517298314 100644
--- a/src/devices/bus/bbc/cart/slot.cpp
+++ b/src/devices/bus/bbc/cart/slot.cpp
@@ -48,7 +48,7 @@ device_bbc_cart_interface::~device_bbc_cart_interface()
//-------------------------------------------------
// bbc_cartslot_device - constructor
//-------------------------------------------------
-bbc_cartslot_device::bbc_cartslot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+bbc_cartslot_device::bbc_cartslot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
electron_cartslot_device(mconfig, BBCM_CARTSLOT, tag, owner, clock)
{
}
diff --git a/src/devices/bus/bbc/cart/slot.h b/src/devices/bus/bbc/cart/slot.h
index 42487bee5c7..0f5c5212682 100644
--- a/src/devices/bus/bbc/cart/slot.h
+++ b/src/devices/bus/bbc/cart/slot.h
@@ -123,7 +123,7 @@ class bbc_cartslot_device : public electron_cartslot_device
public:
// construction/destruction
template <typename T>
- bbc_cartslot_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock, T &&slot_options, const char *default_option)
+ bbc_cartslot_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock, T &&slot_options, const char *default_option)
: electron_cartslot_device(mconfig, tag, owner, clock)
{
option_reset();
@@ -132,7 +132,7 @@ public:
set_fixed(false);
}
- bbc_cartslot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_cartslot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
virtual const char *image_interface() const noexcept override { return "bbcm_cart"; }
virtual const char *file_extensions() const noexcept override { return "rom,bin"; }
diff --git a/src/devices/bus/bbc/exp/autocue.cpp b/src/devices/bus/bbc/exp/autocue.cpp
index 4c9fa193c3a..72f3d853316 100644
--- a/src/devices/bus/bbc/exp/autocue.cpp
+++ b/src/devices/bus/bbc/exp/autocue.cpp
@@ -44,7 +44,7 @@ void bbc_autocue_device::device_add_mconfig(machine_config &config)
// bbc_autocue_device - constructor
//-------------------------------------------------
-bbc_autocue_device::bbc_autocue_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_autocue_device::bbc_autocue_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_AUTOCUE, tag, owner, clock)
, device_bbc_exp_interface(mconfig, *this)
, m_nvram(*this, "nvram")
diff --git a/src/devices/bus/bbc/exp/autocue.h b/src/devices/bus/bbc/exp/autocue.h
index 0151e94e9bf..933fec91721 100644
--- a/src/devices/bus/bbc/exp/autocue.h
+++ b/src/devices/bus/bbc/exp/autocue.h
@@ -23,7 +23,7 @@ class bbc_autocue_device :
{
public:
// construction/destruction
- bbc_autocue_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_autocue_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/bbc/exp/exp.cpp b/src/devices/bus/bbc/exp/exp.cpp
index 4209249a0f9..46c11ad43cb 100644
--- a/src/devices/bus/bbc/exp/exp.cpp
+++ b/src/devices/bus/bbc/exp/exp.cpp
@@ -41,7 +41,7 @@ device_bbc_exp_interface::device_bbc_exp_interface(const machine_config &mconfig
// bbc_exp_slot_device - constructor
//-------------------------------------------------
-bbc_exp_slot_device::bbc_exp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+bbc_exp_slot_device::bbc_exp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, BBC_EXP_SLOT, tag, owner, clock),
device_single_card_slot_interface<device_bbc_exp_interface>(mconfig, *this),
m_card(nullptr),
diff --git a/src/devices/bus/bbc/exp/exp.h b/src/devices/bus/bbc/exp/exp.h
index f7d695b59a5..ccf0aa49230 100644
--- a/src/devices/bus/bbc/exp/exp.h
+++ b/src/devices/bus/bbc/exp/exp.h
@@ -56,7 +56,7 @@ class bbc_exp_slot_device : public device_t, public device_single_card_slot_inte
public:
// construction/destruction
template <typename T>
- bbc_exp_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock, T &&slot_options, const char *default_option)
+ bbc_exp_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock, T &&slot_options, const char *default_option)
: bbc_exp_slot_device(mconfig, tag, owner, clock)
{
option_reset();
@@ -65,7 +65,7 @@ public:
set_fixed(false);
}
- bbc_exp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_exp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
// callbacks
auto irq_handler() { return m_irq_handler.bind(); }
diff --git a/src/devices/bus/bbc/exp/mertec.cpp b/src/devices/bus/bbc/exp/mertec.cpp
index c561f052460..d2019b296db 100644
--- a/src/devices/bus/bbc/exp/mertec.cpp
+++ b/src/devices/bus/bbc/exp/mertec.cpp
@@ -79,7 +79,7 @@ void bbc_mertec_device::device_add_mconfig(machine_config &config)
// bbc_mertec_device - constructor
//-------------------------------------------------
-bbc_mertec_device::bbc_mertec_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_mertec_device::bbc_mertec_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_MERTEC, tag, owner, clock)
, device_bbc_exp_interface(mconfig, *this)
, m_pia(*this, "pia")
diff --git a/src/devices/bus/bbc/exp/mertec.h b/src/devices/bus/bbc/exp/mertec.h
index 33d71ab2ce9..ba051d7f96b 100644
--- a/src/devices/bus/bbc/exp/mertec.h
+++ b/src/devices/bus/bbc/exp/mertec.h
@@ -29,7 +29,7 @@ class bbc_mertec_device :
{
public:
// construction/destruction
- bbc_mertec_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_mertec_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
diff --git a/src/devices/bus/bbc/fdc/acorn.cpp b/src/devices/bus/bbc/fdc/acorn.cpp
index 22b2cc027c8..b383f9f352f 100644
--- a/src/devices/bus/bbc/fdc/acorn.cpp
+++ b/src/devices/bus/bbc/fdc/acorn.cpp
@@ -135,7 +135,7 @@ const tiny_rom_entry *bbc_acorn1770_device::device_rom_region() const
// bbc_acornfdc_device - constructor
//-------------------------------------------------
-bbc_acorn8271_device::bbc_acorn8271_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_acorn8271_device::bbc_acorn8271_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_ACORN8271, tag, owner, clock)
, device_bbc_fdc_interface(mconfig, *this)
, m_fdc(*this, "i8271")
@@ -143,7 +143,7 @@ bbc_acorn8271_device::bbc_acorn8271_device(const machine_config &mconfig, const
{
}
-bbc_acorn1770_device::bbc_acorn1770_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_acorn1770_device::bbc_acorn1770_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_ACORN1770, tag, owner, clock)
, device_bbc_fdc_interface(mconfig, *this)
, m_fdc(*this, "wd1770")
diff --git a/src/devices/bus/bbc/fdc/acorn.h b/src/devices/bus/bbc/fdc/acorn.h
index 347368ff29f..b973c45292e 100644
--- a/src/devices/bus/bbc/fdc/acorn.h
+++ b/src/devices/bus/bbc/fdc/acorn.h
@@ -30,7 +30,7 @@ class bbc_acorn8271_device :
{
public:
// construction/destruction
- bbc_acorn8271_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_acorn8271_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
static void floppy_formats(format_registration &fr);
@@ -59,7 +59,7 @@ class bbc_acorn1770_device :
{
public:
// construction/destruction
- bbc_acorn1770_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_acorn1770_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/bbc/fdc/ams.cpp b/src/devices/bus/bbc/fdc/ams.cpp
index ef64eabd75c..b085e7e1f20 100644
--- a/src/devices/bus/bbc/fdc/ams.cpp
+++ b/src/devices/bus/bbc/fdc/ams.cpp
@@ -73,7 +73,7 @@ const tiny_rom_entry *bbc_ams3_device::device_rom_region() const
// bbc_ams3_device - constructor
//-------------------------------------------------
-bbc_ams3_device::bbc_ams3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_ams3_device::bbc_ams3_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_AMS3, tag, owner, clock)
, device_bbc_fdc_interface(mconfig, *this)
, m_fdc(*this, "i8271")
diff --git a/src/devices/bus/bbc/fdc/ams.h b/src/devices/bus/bbc/fdc/ams.h
index a1bdcc27696..bb4105c37af 100644
--- a/src/devices/bus/bbc/fdc/ams.h
+++ b/src/devices/bus/bbc/fdc/ams.h
@@ -27,7 +27,7 @@ class bbc_ams3_device :
{
public:
// construction/destruction
- bbc_ams3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_ams3_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
static void floppy_formats(format_registration &fr);
diff --git a/src/devices/bus/bbc/fdc/cumana.cpp b/src/devices/bus/bbc/fdc/cumana.cpp
index 2db9b4b2f2a..a81f83f6a4d 100644
--- a/src/devices/bus/bbc/fdc/cumana.cpp
+++ b/src/devices/bus/bbc/fdc/cumana.cpp
@@ -106,7 +106,7 @@ const tiny_rom_entry *bbc_cumana2_device::device_rom_region() const
// bbc_cumanafdc_device - constructor
//-------------------------------------------------
-bbc_cumanafdc_device::bbc_cumanafdc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+bbc_cumanafdc_device::bbc_cumanafdc_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_bbc_fdc_interface(mconfig, *this),
m_fdc(*this, "mb8877a"),
@@ -115,13 +115,13 @@ bbc_cumanafdc_device::bbc_cumanafdc_device(const machine_config &mconfig, device
{
}
-bbc_cumana1_device::bbc_cumana1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+bbc_cumana1_device::bbc_cumana1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
bbc_cumanafdc_device(mconfig, BBC_CUMANA1, tag, owner, clock)
{
m_invert = true;
}
-bbc_cumana2_device::bbc_cumana2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+bbc_cumana2_device::bbc_cumana2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
bbc_cumanafdc_device(mconfig, BBC_CUMANA2, tag, owner, clock)
{
m_invert = false;
diff --git a/src/devices/bus/bbc/fdc/cumana.h b/src/devices/bus/bbc/fdc/cumana.h
index d775a68e622..f92d64b1d96 100644
--- a/src/devices/bus/bbc/fdc/cumana.h
+++ b/src/devices/bus/bbc/fdc/cumana.h
@@ -34,7 +34,7 @@ public:
protected:
// construction/destruction
- bbc_cumanafdc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ bbc_cumanafdc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
// device-level overrides
virtual void device_start() override;
@@ -55,7 +55,7 @@ private:
class bbc_cumana1_device : public bbc_cumanafdc_device
{
public:
- bbc_cumana1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_cumana1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
virtual void device_add_mconfig(machine_config &config) override;
@@ -65,7 +65,7 @@ protected:
class bbc_cumana2_device : public bbc_cumanafdc_device
{
public:
- bbc_cumana2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_cumana2_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/bbc/fdc/cv1797.cpp b/src/devices/bus/bbc/fdc/cv1797.cpp
index 32d517f35cb..d7e9a993465 100644
--- a/src/devices/bus/bbc/fdc/cv1797.cpp
+++ b/src/devices/bus/bbc/fdc/cv1797.cpp
@@ -86,7 +86,7 @@ const tiny_rom_entry *bbc_cv1797_device::device_rom_region() const
// bbc_cv1797_device - constructor
//-------------------------------------------------
-bbc_cv1797_device::bbc_cv1797_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_cv1797_device::bbc_cv1797_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_CV1797, tag, owner, clock)
, device_bbc_fdc_interface(mconfig, *this)
, m_fdc(*this, "fd1797")
diff --git a/src/devices/bus/bbc/fdc/cv1797.h b/src/devices/bus/bbc/fdc/cv1797.h
index 16b870f963c..29f52996eef 100644
--- a/src/devices/bus/bbc/fdc/cv1797.h
+++ b/src/devices/bus/bbc/fdc/cv1797.h
@@ -28,7 +28,7 @@ class bbc_cv1797_device :
{
public:
// construction/destruction
- bbc_cv1797_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_cv1797_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/bbc/fdc/fdc.cpp b/src/devices/bus/bbc/fdc/fdc.cpp
index abfc5e109b1..505ef16b446 100644
--- a/src/devices/bus/bbc/fdc/fdc.cpp
+++ b/src/devices/bus/bbc/fdc/fdc.cpp
@@ -40,7 +40,7 @@ device_bbc_fdc_interface::device_bbc_fdc_interface(const machine_config &mconfig
// bbc_fdc_slot_device - constructor
//-------------------------------------------------
-bbc_fdc_slot_device::bbc_fdc_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+bbc_fdc_slot_device::bbc_fdc_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, BBC_FDC_SLOT, tag, owner, clock),
device_single_card_slot_interface<device_bbc_fdc_interface>(mconfig, *this),
m_card(nullptr),
diff --git a/src/devices/bus/bbc/fdc/fdc.h b/src/devices/bus/bbc/fdc/fdc.h
index 7138ced7ad1..b7b724488dc 100644
--- a/src/devices/bus/bbc/fdc/fdc.h
+++ b/src/devices/bus/bbc/fdc/fdc.h
@@ -26,7 +26,7 @@ class bbc_fdc_slot_device : public device_t, public device_single_card_slot_inte
public:
// construction/destruction
template <typename T>
- bbc_fdc_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock, T &&slot_options, const char *default_option)
+ bbc_fdc_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock, T &&slot_options, const char *default_option)
: bbc_fdc_slot_device(mconfig, tag, owner, clock)
{
option_reset();
@@ -36,7 +36,7 @@ public:
set_insert_rom(true);
}
- bbc_fdc_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock);
+ bbc_fdc_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock);
void set_insert_rom(bool insert_rom) { m_insert_rom = insert_rom; }
bool insert_rom() { return m_insert_rom; }
diff --git a/src/devices/bus/bbc/fdc/kenda.cpp b/src/devices/bus/bbc/fdc/kenda.cpp
index 801dd731200..5ef055a1224 100644
--- a/src/devices/bus/bbc/fdc/kenda.cpp
+++ b/src/devices/bus/bbc/fdc/kenda.cpp
@@ -99,7 +99,7 @@ const tiny_rom_entry *bbc_kenda_device::device_rom_region() const
// bbc_kenda_device - constructor
//-------------------------------------------------
-bbc_kenda_device::bbc_kenda_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_kenda_device::bbc_kenda_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_KENDA, tag, owner, clock)
, device_bbc_fdc_interface(mconfig, *this)
, m_fdc(*this, "fdc")
diff --git a/src/devices/bus/bbc/fdc/kenda.h b/src/devices/bus/bbc/fdc/kenda.h
index 99868f062fb..8ad7c738ac6 100644
--- a/src/devices/bus/bbc/fdc/kenda.h
+++ b/src/devices/bus/bbc/fdc/kenda.h
@@ -25,7 +25,7 @@ class bbc_kenda_device : public device_t, public device_bbc_fdc_interface
{
public:
// construction/destruction
- bbc_kenda_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_kenda_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/bbc/fdc/opus.cpp b/src/devices/bus/bbc/fdc/opus.cpp
index 2851fc3de3c..c68e034e0c5 100644
--- a/src/devices/bus/bbc/fdc/opus.cpp
+++ b/src/devices/bus/bbc/fdc/opus.cpp
@@ -166,7 +166,7 @@ const tiny_rom_entry *bbc_opus1770_device::device_rom_region() const
// bbc_opusfdc_device - constructor
//-------------------------------------------------
-bbc_opus8272_device::bbc_opus8272_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+bbc_opus8272_device::bbc_opus8272_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, BBC_OPUS8272, tag, owner, clock),
device_bbc_fdc_interface(mconfig, *this),
m_fdc(*this, "i8272"),
@@ -174,7 +174,7 @@ bbc_opus8272_device::bbc_opus8272_device(const machine_config &mconfig, const ch
{
}
-bbc_opusfdc_device::bbc_opusfdc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+bbc_opusfdc_device::bbc_opusfdc_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_bbc_fdc_interface(mconfig, *this),
m_fdc(*this, "fdc"),
@@ -183,17 +183,17 @@ bbc_opusfdc_device::bbc_opusfdc_device(const machine_config &mconfig, device_typ
{
}
-bbc_opus2791_device::bbc_opus2791_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_opus2791_device::bbc_opus2791_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_opusfdc_device(mconfig, BBC_OPUS2791, tag, owner, clock)
{
}
-bbc_opus2793_device::bbc_opus2793_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_opus2793_device::bbc_opus2793_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_opusfdc_device(mconfig, BBC_OPUS2793, tag, owner, clock)
{
}
-bbc_opus1770_device::bbc_opus1770_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_opus1770_device::bbc_opus1770_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_opusfdc_device(mconfig, BBC_OPUS1770, tag, owner, clock)
{
}
diff --git a/src/devices/bus/bbc/fdc/opus.h b/src/devices/bus/bbc/fdc/opus.h
index 5cca5a5c701..bbc66abef1d 100644
--- a/src/devices/bus/bbc/fdc/opus.h
+++ b/src/devices/bus/bbc/fdc/opus.h
@@ -26,7 +26,7 @@ class bbc_opus8272_device :
{
public:
// construction/destruction
- bbc_opus8272_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_opus8272_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
@@ -56,7 +56,7 @@ public:
protected:
// construction/destruction
- bbc_opusfdc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ bbc_opusfdc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
// device-level overrides
virtual void device_start() override;
@@ -74,7 +74,7 @@ private:
class bbc_opus2791_device : public bbc_opusfdc_device
{
public:
- bbc_opus2791_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_opus2791_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
virtual void device_add_mconfig(machine_config &config) override;
@@ -84,7 +84,7 @@ protected:
class bbc_opus2793_device : public bbc_opusfdc_device
{
public:
- bbc_opus2793_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_opus2793_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
virtual void device_add_mconfig(machine_config &config) override;
@@ -94,7 +94,7 @@ protected:
class bbc_opus1770_device : public bbc_opusfdc_device
{
public:
- bbc_opus1770_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_opus1770_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/bbc/fdc/solidisk.cpp b/src/devices/bus/bbc/fdc/solidisk.cpp
index c342fc64355..3b4df171758 100644
--- a/src/devices/bus/bbc/fdc/solidisk.cpp
+++ b/src/devices/bus/bbc/fdc/solidisk.cpp
@@ -147,7 +147,7 @@ const tiny_rom_entry *bbc_stldfdc_1_device::device_rom_region() const
// bbc_stlfdc_device - constructor
//-------------------------------------------------
-bbc_stlfdc_device::bbc_stlfdc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+bbc_stlfdc_device::bbc_stlfdc_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_bbc_fdc_interface(mconfig, *this)
, m_wd1770(*this, "wd1770")
@@ -157,27 +157,27 @@ bbc_stlfdc_device::bbc_stlfdc_device(const machine_config &mconfig, device_type
{
}
-bbc_stl1770_1_device::bbc_stl1770_1_device(const machine_config& mconfig, device_type type, const char* tag, device_t* owner, uint32_t clock)
+bbc_stl1770_1_device::bbc_stl1770_1_device(const machine_config& mconfig, device_type type, const char* tag, device_t* owner, const XTAL &clock)
: bbc_stlfdc_device(mconfig, type, tag, owner, clock)
{
}
-bbc_stl1770_1_device::bbc_stl1770_1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_stl1770_1_device::bbc_stl1770_1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_stlfdc_device(mconfig, BBC_STL1770_1, tag, owner, clock)
{
}
-bbc_stl1770_2_device::bbc_stl1770_2_device(const machine_config& mconfig, device_type type, const char* tag, device_t* owner, uint32_t clock)
+bbc_stl1770_2_device::bbc_stl1770_2_device(const machine_config& mconfig, device_type type, const char* tag, device_t* owner, const XTAL &clock)
: bbc_stlfdc_device(mconfig, type, tag, owner, clock)
{
}
-bbc_stl1770_2_device::bbc_stl1770_2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_stl1770_2_device::bbc_stl1770_2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_stlfdc_device(mconfig, BBC_STL1770_2, tag, owner, clock)
{
}
-bbc_stldfdc_1_device::bbc_stldfdc_1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_stldfdc_1_device::bbc_stldfdc_1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_stl1770_1_device(mconfig, BBC_STLDFDC_1, tag, owner, clock)
{
}
diff --git a/src/devices/bus/bbc/fdc/solidisk.h b/src/devices/bus/bbc/fdc/solidisk.h
index 025db9ca332..cede8534314 100644
--- a/src/devices/bus/bbc/fdc/solidisk.h
+++ b/src/devices/bus/bbc/fdc/solidisk.h
@@ -33,7 +33,7 @@ public:
protected:
// construction/destruction
- bbc_stlfdc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ bbc_stlfdc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
DECLARE_WRITE_LINE_MEMBER(motor_w);
DECLARE_WRITE_LINE_MEMBER(side_w);
@@ -48,10 +48,10 @@ protected:
class bbc_stl1770_1_device : public bbc_stlfdc_device
{
public:
- bbc_stl1770_1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_stl1770_1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- bbc_stl1770_1_device(const machine_config& mconfig, device_type type, const char* tag, device_t* owner, uint32_t clock);
+ bbc_stl1770_1_device(const machine_config& mconfig, device_type type, const char* tag, device_t* owner, const XTAL &clock);
// device-level overrides
virtual void device_start() override;
@@ -67,10 +67,10 @@ protected:
class bbc_stl1770_2_device : public bbc_stlfdc_device
{
public:
- bbc_stl1770_2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_stl1770_2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- bbc_stl1770_2_device(const machine_config& mconfig, device_type type, const char* tag, device_t* owner, uint32_t clock);
+ bbc_stl1770_2_device(const machine_config& mconfig, device_type type, const char* tag, device_t* owner, const XTAL &clock);
// device-level overrides
virtual void device_start() override;
@@ -87,7 +87,7 @@ class bbc_stldfdc_1_device : public bbc_stl1770_1_device
{
public:
// construction/destruction
- bbc_stldfdc_1_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock);
+ bbc_stldfdc_1_device(const machine_config& mconfig, const char* tag, device_t* owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/bbc/fdc/udm.cpp b/src/devices/bus/bbc/fdc/udm.cpp
index dc078aa8dfa..dfcc4f801fa 100644
--- a/src/devices/bus/bbc/fdc/udm.cpp
+++ b/src/devices/bus/bbc/fdc/udm.cpp
@@ -85,7 +85,7 @@ const tiny_rom_entry *bbc_udm_device::device_rom_region() const
// bbc_udm_device - constructor
//-------------------------------------------------
-bbc_udm_device::bbc_udm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_udm_device::bbc_udm_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_UDM, tag, owner, clock)
, device_bbc_fdc_interface(mconfig, *this)
, m_fdc(*this, "wd2793")
diff --git a/src/devices/bus/bbc/fdc/udm.h b/src/devices/bus/bbc/fdc/udm.h
index 8e21917efb8..06a7605d83f 100644
--- a/src/devices/bus/bbc/fdc/udm.h
+++ b/src/devices/bus/bbc/fdc/udm.h
@@ -28,7 +28,7 @@ class bbc_udm_device :
{
public:
// construction/destruction
- bbc_udm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_udm_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/bbc/fdc/watford.cpp b/src/devices/bus/bbc/fdc/watford.cpp
index 7f058c41838..2d4b9d6fb28 100644
--- a/src/devices/bus/bbc/fdc/watford.cpp
+++ b/src/devices/bus/bbc/fdc/watford.cpp
@@ -110,13 +110,13 @@ const tiny_rom_entry *bbc_weddb3_device::device_rom_region() const
// bbc_watfordfdc_device - constructor
//-------------------------------------------------
-bbc_watfordfdc_device::bbc_watfordfdc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+bbc_watfordfdc_device::bbc_watfordfdc_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_bbc_fdc_interface(mconfig, *this)
{
}
-bbc_weddb2_device::bbc_weddb2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_weddb2_device::bbc_weddb2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_watfordfdc_device(mconfig, BBC_WEDDB2, tag, owner, clock)
, m_fdc(*this, "wd1772")
, m_floppy(*this, "wd1772:%u", 0)
@@ -124,7 +124,7 @@ bbc_weddb2_device::bbc_weddb2_device(const machine_config &mconfig, const char *
{
}
-bbc_weddb3_device::bbc_weddb3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_weddb3_device::bbc_weddb3_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_watfordfdc_device(mconfig, BBC_WEDDB3, tag, owner, clock)
, m_fdc(*this, "wd1770")
, m_floppy(*this, "wd1770:%u", 0)
diff --git a/src/devices/bus/bbc/fdc/watford.h b/src/devices/bus/bbc/fdc/watford.h
index 37a635d2afb..51effebb2a4 100644
--- a/src/devices/bus/bbc/fdc/watford.h
+++ b/src/devices/bus/bbc/fdc/watford.h
@@ -30,13 +30,13 @@ public:
protected:
// construction/destruction
- bbc_watfordfdc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ bbc_watfordfdc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
};
class bbc_weddb2_device : public bbc_watfordfdc_device
{
public:
- bbc_weddb2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_weddb2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
@@ -58,7 +58,7 @@ private:
class bbc_weddb3_device : public bbc_watfordfdc_device
{
public:
- bbc_weddb3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_weddb3_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/bbc/internal/aries.cpp b/src/devices/bus/bbc/internal/aries.cpp
index 1ee29009129..705374042be 100644
--- a/src/devices/bus/bbc/internal/aries.cpp
+++ b/src/devices/bus/bbc/internal/aries.cpp
@@ -103,24 +103,24 @@ const tiny_rom_entry *bbc_ariesb32_device::device_rom_region() const
// bbc_aries_device - constructor
//-------------------------------------------------
-bbc_ariesb12_device::bbc_ariesb12_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+bbc_ariesb12_device::bbc_ariesb12_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_bbc_internal_interface(mconfig, *this)
, m_rom(*this, "romslot%u", 0U)
{
}
-bbc_ariesb12_device::bbc_ariesb12_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_ariesb12_device::bbc_ariesb12_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_ariesb12_device(mconfig, BBC_ARIESB12, tag, owner, clock)
{
}
-bbc_ariesb20_device::bbc_ariesb20_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_ariesb20_device::bbc_ariesb20_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_ariesb12_device(mconfig, BBC_ARIESB20, tag, owner, clock)
{
}
-bbc_ariesb32_device::bbc_ariesb32_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_ariesb32_device::bbc_ariesb32_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_ariesb12_device(mconfig, BBC_ARIESB32, tag, owner, clock)
, m_aries_rom(*this, "aries_rom")
{
diff --git a/src/devices/bus/bbc/internal/aries.h b/src/devices/bus/bbc/internal/aries.h
index 9dc7383ff21..a61cd9119d3 100644
--- a/src/devices/bus/bbc/internal/aries.h
+++ b/src/devices/bus/bbc/internal/aries.h
@@ -30,10 +30,10 @@ class bbc_ariesb12_device :
{
public:
// construction/destruction
- bbc_ariesb12_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_ariesb12_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- bbc_ariesb12_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ bbc_ariesb12_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
// device-level overrides
virtual void device_start() override;
@@ -56,7 +56,7 @@ class bbc_ariesb20_device : public bbc_ariesb12_device
{
public:
// construction/destruction
- bbc_ariesb20_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_ariesb20_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
@@ -82,7 +82,7 @@ class bbc_ariesb32_device : public bbc_ariesb12_device
{
public:
// construction/destruction
- bbc_ariesb32_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_ariesb32_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/bbc/internal/atpl.cpp b/src/devices/bus/bbc/internal/atpl.cpp
index 94c5f8459b0..635785c8bc6 100644
--- a/src/devices/bus/bbc/internal/atpl.cpp
+++ b/src/devices/bus/bbc/internal/atpl.cpp
@@ -94,7 +94,7 @@ void bbc_atplswp_device::device_add_mconfig(machine_config &config)
// bbc_atplsw_device - constructor
//-------------------------------------------------
-bbc_atplsw_device::bbc_atplsw_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_atplsw_device::bbc_atplsw_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_ATPLSW, tag, owner, clock)
, device_bbc_internal_interface(mconfig, *this)
, m_rom(*this, "romslot%u", 0U)
@@ -102,7 +102,7 @@ bbc_atplsw_device::bbc_atplsw_device(const machine_config &mconfig, const char *
{
}
-bbc_atplswp_device::bbc_atplswp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_atplswp_device::bbc_atplswp_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_ATPLSWP, tag, owner, clock)
, device_bbc_internal_interface(mconfig, *this)
, m_rom(*this, "romslot%u", 0U)
diff --git a/src/devices/bus/bbc/internal/atpl.h b/src/devices/bus/bbc/internal/atpl.h
index fe10ebb3a76..37a78d23d29 100644
--- a/src/devices/bus/bbc/internal/atpl.h
+++ b/src/devices/bus/bbc/internal/atpl.h
@@ -27,7 +27,7 @@ class bbc_atplsw_device :
{
public:
// construction/destruction
- bbc_atplsw_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_atplsw_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
@@ -56,7 +56,7 @@ class bbc_atplswp_device :
{
public:
// construction/destruction
- bbc_atplswp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_atplswp_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/bbc/internal/cumana68k.cpp b/src/devices/bus/bbc/internal/cumana68k.cpp
index 19e71ee8692..d6245606707 100644
--- a/src/devices/bus/bbc/internal/cumana68k.cpp
+++ b/src/devices/bus/bbc/internal/cumana68k.cpp
@@ -96,7 +96,7 @@ void bbc_cumana68k_device::device_add_mconfig(machine_config &config)
downcast<nscsi_callback_device&>(*device).req_callback().append(m_pia_sasi, FUNC(pia6821_device::ca1_w));
});
- PIA6821(config, m_pia_sasi, 0);
+ PIA6821(config, m_pia_sasi);
m_pia_sasi->readpa_handler().set(m_sasi, FUNC(nscsi_callback_device::read));
m_pia_sasi->writepa_handler().set(m_sasi, FUNC(nscsi_callback_device::write));
m_pia_sasi->writepb_handler().set(FUNC(bbc_cumana68k_device::pia_sasi_pb_w));
@@ -106,7 +106,7 @@ void bbc_cumana68k_device::device_add_mconfig(machine_config &config)
m_pia_sasi->irqa_handler().set(m_irqs, FUNC(input_merger_device::in_w<0>));
m_pia_sasi->irqb_handler().set(m_irqs, FUNC(input_merger_device::in_w<1>));
- PIA6821(config, m_pia_rtc, 0);
+ PIA6821(config, m_pia_rtc);
m_pia_rtc->readpa_handler().set([this]() { return m_mc146818_data; });
m_pia_rtc->writepa_handler().set([this](uint8_t data) { m_mc146818_data = data; });
m_pia_rtc->writepb_handler().set(FUNC(bbc_cumana68k_device::pia_rtc_pb_w));
@@ -142,7 +142,7 @@ const tiny_rom_entry *bbc_cumana68k_device::device_rom_region() const
// bbc_cumana68k_device - constructor
//-------------------------------------------------
-bbc_cumana68k_device::bbc_cumana68k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_cumana68k_device::bbc_cumana68k_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_CUMANA68K, tag, owner, clock)
, device_bbc_internal_interface(mconfig, *this)
, m_m68008(*this, "m68008")
diff --git a/src/devices/bus/bbc/internal/cumana68k.h b/src/devices/bus/bbc/internal/cumana68k.h
index 84f545db295..2ff26571974 100644
--- a/src/devices/bus/bbc/internal/cumana68k.h
+++ b/src/devices/bus/bbc/internal/cumana68k.h
@@ -32,7 +32,7 @@ class bbc_cumana68k_device :
{
public:
// construction/destruction
- bbc_cumana68k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_cumana68k_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
void pia_rtc_pb_w(uint8_t data);
void pia_sasi_pb_w(uint8_t data);
diff --git a/src/devices/bus/bbc/internal/integrab.cpp b/src/devices/bus/bbc/internal/integrab.cpp
index 6d69b9c34c0..b6fe1c052c1 100644
--- a/src/devices/bus/bbc/internal/integrab.cpp
+++ b/src/devices/bus/bbc/internal/integrab.cpp
@@ -107,7 +107,7 @@ const tiny_rom_entry *bbc_integrab_device::device_rom_region() const
// bbc_integrab_device - constructor
//-------------------------------------------------
-bbc_integrab_device::bbc_integrab_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_integrab_device::bbc_integrab_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_INTEGRAB, tag, owner, clock)
, device_bbc_internal_interface(mconfig, *this)
, m_ibos(*this, "ibos")
diff --git a/src/devices/bus/bbc/internal/integrab.h b/src/devices/bus/bbc/internal/integrab.h
index 679bdc44526..a804ec40190 100644
--- a/src/devices/bus/bbc/internal/integrab.h
+++ b/src/devices/bus/bbc/internal/integrab.h
@@ -25,7 +25,7 @@ class bbc_integrab_device :
{
public:
// construction/destruction
- bbc_integrab_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_integrab_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/bbc/internal/internal.cpp b/src/devices/bus/bbc/internal/internal.cpp
index a365b5729dc..1442b0bf5fc 100644
--- a/src/devices/bus/bbc/internal/internal.cpp
+++ b/src/devices/bus/bbc/internal/internal.cpp
@@ -52,7 +52,7 @@ device_bbc_internal_interface::device_bbc_internal_interface(const machine_confi
// bbc_internal_slot_device - constructor
//-------------------------------------------------
-bbc_internal_slot_device::bbc_internal_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_internal_slot_device::bbc_internal_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_INTERNAL_SLOT, tag, owner, clock)
, device_single_card_slot_interface<device_bbc_internal_interface>(mconfig, *this)
, m_irq_handler(*this)
diff --git a/src/devices/bus/bbc/internal/internal.h b/src/devices/bus/bbc/internal/internal.h
index 3042dd30a0b..1ffdb0186fa 100644
--- a/src/devices/bus/bbc/internal/internal.h
+++ b/src/devices/bus/bbc/internal/internal.h
@@ -60,7 +60,7 @@ class bbc_internal_slot_device : public device_t, public device_single_card_slot
public:
// construction/destruction
template <typename T>
- bbc_internal_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock, T &&slot_options, const char *default_option)
+ bbc_internal_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock, T &&slot_options, const char *default_option)
: bbc_internal_slot_device(mconfig, tag, owner, clock)
{
option_reset();
@@ -69,7 +69,7 @@ public:
set_fixed(false);
}
- bbc_internal_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_internal_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
// inline configuration
auto irq_handler() { return m_irq_handler.bind(); }
diff --git a/src/devices/bus/bbc/internal/memex.cpp b/src/devices/bus/bbc/internal/memex.cpp
index 809313e4c68..d49dca9f09f 100644
--- a/src/devices/bus/bbc/internal/memex.cpp
+++ b/src/devices/bus/bbc/internal/memex.cpp
@@ -48,7 +48,7 @@ const tiny_rom_entry *bbc_memexb20_device::device_rom_region() const
// bbc_memexb20_device - constructor
//-------------------------------------------------
-bbc_memexb20_device::bbc_memexb20_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_memexb20_device::bbc_memexb20_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_MEMEXB20, tag, owner, clock)
, device_bbc_internal_interface(mconfig, *this)
, m_shadow(false)
diff --git a/src/devices/bus/bbc/internal/memex.h b/src/devices/bus/bbc/internal/memex.h
index 1e4f07bcb16..6ab35c7ba5a 100644
--- a/src/devices/bus/bbc/internal/memex.h
+++ b/src/devices/bus/bbc/internal/memex.h
@@ -21,7 +21,7 @@ class bbc_memexb20_device : public device_t, public device_bbc_internal_interfac
{
public:
// construction/destruction
- bbc_memexb20_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_memexb20_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/bbc/internal/morleyaa.cpp b/src/devices/bus/bbc/internal/morleyaa.cpp
index e01336c3b5c..f93a886109f 100644
--- a/src/devices/bus/bbc/internal/morleyaa.cpp
+++ b/src/devices/bus/bbc/internal/morleyaa.cpp
@@ -71,7 +71,7 @@ const tiny_rom_entry *bbc_morleyaa_device::device_rom_region() const
// bbc_morleyaa_device - constructor
//-------------------------------------------------
-bbc_morleyaa_device::bbc_morleyaa_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_morleyaa_device::bbc_morleyaa_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_MORLEYAA, tag, owner, clock)
, device_bbc_internal_interface(mconfig, *this)
, m_aa_rom(*this, "aa_rom")
diff --git a/src/devices/bus/bbc/internal/morleyaa.h b/src/devices/bus/bbc/internal/morleyaa.h
index f2debcff982..0d26f2b45c8 100644
--- a/src/devices/bus/bbc/internal/morleyaa.h
+++ b/src/devices/bus/bbc/internal/morleyaa.h
@@ -23,7 +23,7 @@ class bbc_morleyaa_device :
{
public:
// construction/destruction
- bbc_morleyaa_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_morleyaa_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/bbc/internal/overlay.cpp b/src/devices/bus/bbc/internal/overlay.cpp
index c46a280a316..f5959af0196 100644
--- a/src/devices/bus/bbc/internal/overlay.cpp
+++ b/src/devices/bus/bbc/internal/overlay.cpp
@@ -87,7 +87,7 @@ void bbc_overlay_device::device_add_mconfig(machine_config &config)
// bbc_overlay_device - constructor
//-------------------------------------------------
-bbc_overlay_device::bbc_overlay_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_overlay_device::bbc_overlay_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_OVERLAY, tag, owner, clock)
, device_bbc_internal_interface(mconfig, *this)
, m_rom(*this, "romslot%u", 0U)
diff --git a/src/devices/bus/bbc/internal/overlay.h b/src/devices/bus/bbc/internal/overlay.h
index 3800687f5ac..6f1ac8bad30 100644
--- a/src/devices/bus/bbc/internal/overlay.h
+++ b/src/devices/bus/bbc/internal/overlay.h
@@ -25,7 +25,7 @@ class bbc_overlay_device :
{
public:
// construction/destruction
- bbc_overlay_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_overlay_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/bbc/internal/peartree.cpp b/src/devices/bus/bbc/internal/peartree.cpp
index 49281731097..8953c43cdfe 100644
--- a/src/devices/bus/bbc/internal/peartree.cpp
+++ b/src/devices/bus/bbc/internal/peartree.cpp
@@ -101,19 +101,19 @@ void bbc_mr4800_device::device_add_mconfig(machine_config &config)
// bbc_mr3000_device - constructor
//-------------------------------------------------
-bbc_mr3000_device::bbc_mr3000_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+bbc_mr3000_device::bbc_mr3000_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_bbc_internal_interface(mconfig, *this)
, m_rom(*this, "romslot%u", 0U)
{
}
-bbc_mr3000_device::bbc_mr3000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_mr3000_device::bbc_mr3000_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_mr3000_device(mconfig, BBC_MR3000, tag, owner, clock)
{
}
-bbc_mr4200_device::bbc_mr4200_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_mr4200_device::bbc_mr4200_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_mr3000_device(mconfig, BBC_MR4200, tag, owner, clock)
, m_wp(*this, "wp")
{
@@ -123,7 +123,7 @@ bbc_mr4200_device::bbc_mr4200_device(const machine_config &mconfig, const char *
// bbc_mr4300_device - constructor
//-------------------------------------------------
-bbc_mr4300_device::bbc_mr4300_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+bbc_mr4300_device::bbc_mr4300_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_bbc_internal_interface(mconfig, *this)
, m_rom(*this, "romslot%u", 0U)
@@ -131,12 +131,12 @@ bbc_mr4300_device::bbc_mr4300_device(const machine_config &mconfig, device_type
{
}
-bbc_mr4300_device::bbc_mr4300_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_mr4300_device::bbc_mr4300_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_mr4300_device(mconfig, BBC_MR4300, tag, owner, clock)
{
}
-bbc_mr4800_device::bbc_mr4800_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_mr4800_device::bbc_mr4800_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_mr4300_device(mconfig, BBC_MR4800, tag, owner, clock)
{
}
diff --git a/src/devices/bus/bbc/internal/peartree.h b/src/devices/bus/bbc/internal/peartree.h
index 9f9ed683396..6b893fc3522 100644
--- a/src/devices/bus/bbc/internal/peartree.h
+++ b/src/devices/bus/bbc/internal/peartree.h
@@ -25,10 +25,10 @@ class bbc_mr3000_device :
{
public:
// construction/destruction
- bbc_mr3000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_mr3000_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- bbc_mr3000_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ bbc_mr3000_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
// device-level overrides
virtual void device_start() override;
@@ -51,7 +51,7 @@ class bbc_mr4200_device : public bbc_mr3000_device
{
public:
// construction/destruction
- bbc_mr4200_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_mr4200_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// optional information overrides
@@ -70,10 +70,10 @@ class bbc_mr4300_device :
{
public:
// construction/destruction
- bbc_mr4300_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_mr4300_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- bbc_mr4300_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ bbc_mr4300_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
// device-level overrides
virtual void device_start() override;
@@ -98,7 +98,7 @@ class bbc_mr4800_device : public bbc_mr4300_device
{
public:
// construction/destruction
- bbc_mr4800_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_mr4800_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// optional information overrides
diff --git a/src/devices/bus/bbc/internal/ramamp.cpp b/src/devices/bus/bbc/internal/ramamp.cpp
index 586159377aa..24c95856307 100644
--- a/src/devices/bus/bbc/internal/ramamp.cpp
+++ b/src/devices/bus/bbc/internal/ramamp.cpp
@@ -65,7 +65,7 @@ void bbc_ramamp_device::device_add_mconfig(machine_config &config)
// bbc_ramamp_device - constructor
//-------------------------------------------------
-bbc_ramamp_device::bbc_ramamp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_ramamp_device::bbc_ramamp_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_RAMAMP, tag, owner, clock)
, device_bbc_internal_interface(mconfig, *this)
, m_rom(*this, "romslot%u", 0U)
diff --git a/src/devices/bus/bbc/internal/ramamp.h b/src/devices/bus/bbc/internal/ramamp.h
index d8f9b62408b..39870217a06 100644
--- a/src/devices/bus/bbc/internal/ramamp.h
+++ b/src/devices/bus/bbc/internal/ramamp.h
@@ -25,7 +25,7 @@ class bbc_ramamp_device :
{
public:
// construction/destruction
- bbc_ramamp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_ramamp_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/bbc/internal/raven20.cpp b/src/devices/bus/bbc/internal/raven20.cpp
index f6bb3efdb4b..86f371f259d 100644
--- a/src/devices/bus/bbc/internal/raven20.cpp
+++ b/src/devices/bus/bbc/internal/raven20.cpp
@@ -51,7 +51,7 @@ const tiny_rom_entry *bbc_raven20_device::device_rom_region() const
// bbc_raven20_device - constructor
//-------------------------------------------------
-bbc_raven20_device::bbc_raven20_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_raven20_device::bbc_raven20_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_RAVEN20, tag, owner, clock)
, device_bbc_internal_interface(mconfig, *this)
{
diff --git a/src/devices/bus/bbc/internal/raven20.h b/src/devices/bus/bbc/internal/raven20.h
index 0e04137afa6..3962b280690 100644
--- a/src/devices/bus/bbc/internal/raven20.h
+++ b/src/devices/bus/bbc/internal/raven20.h
@@ -23,7 +23,7 @@ class bbc_raven20_device :
{
public:
// construction/destruction
- bbc_raven20_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_raven20_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/bbc/internal/romex.cpp b/src/devices/bus/bbc/internal/romex.cpp
index 9d7932db81f..60eeb3b8e49 100644
--- a/src/devices/bus/bbc/internal/romex.cpp
+++ b/src/devices/bus/bbc/internal/romex.cpp
@@ -53,7 +53,7 @@ void bbc_romex13_device::device_add_mconfig(machine_config &config)
// bbc_romex13_device - constructor
//-------------------------------------------------
-bbc_romex13_device::bbc_romex13_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_romex13_device::bbc_romex13_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_ROMEX13, tag, owner, clock)
, device_bbc_internal_interface(mconfig, *this)
, m_rom(*this, "romslot%u", 0U)
diff --git a/src/devices/bus/bbc/internal/romex.h b/src/devices/bus/bbc/internal/romex.h
index b9542937ebf..8da974be33e 100644
--- a/src/devices/bus/bbc/internal/romex.h
+++ b/src/devices/bus/bbc/internal/romex.h
@@ -25,7 +25,7 @@ class bbc_romex13_device :
{
public:
// construction/destruction
- bbc_romex13_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_romex13_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/bbc/internal/stl2m128.cpp b/src/devices/bus/bbc/internal/stl2m128.cpp
index 46b595aedfa..dd1d6e14a8d 100644
--- a/src/devices/bus/bbc/internal/stl2m128.cpp
+++ b/src/devices/bus/bbc/internal/stl2m128.cpp
@@ -87,7 +87,7 @@ const tiny_rom_entry *bbc_stl2m128_device::device_rom_region() const
// bbc_stl2m128_device - constructor
//-------------------------------------------------
-bbc_stl2m128_device::bbc_stl2m128_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_stl2m128_device::bbc_stl2m128_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_STL2M128, tag, owner, clock)
, device_bbc_internal_interface(mconfig, *this)
, m_rom(*this, "romslot%u", 0U)
diff --git a/src/devices/bus/bbc/internal/stl2m128.h b/src/devices/bus/bbc/internal/stl2m128.h
index 2c5f327ab19..bb61e166c2b 100644
--- a/src/devices/bus/bbc/internal/stl2m128.h
+++ b/src/devices/bus/bbc/internal/stl2m128.h
@@ -23,7 +23,7 @@ class bbc_stl2m128_device :
{
public:
// construction/destruction
- bbc_stl2m128_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_stl2m128_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/bbc/internal/stl4m32.cpp b/src/devices/bus/bbc/internal/stl4m32.cpp
index 5d3782c36ac..fb4703d5fdf 100644
--- a/src/devices/bus/bbc/internal/stl4m32.cpp
+++ b/src/devices/bus/bbc/internal/stl4m32.cpp
@@ -86,7 +86,7 @@ const tiny_rom_entry *bbc_stl4m32_device::device_rom_region() const
// bbc_stl4m32_device - constructor
//-------------------------------------------------
-bbc_stl4m32_device::bbc_stl4m32_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_stl4m32_device::bbc_stl4m32_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_STL4M32, tag, owner, clock)
, device_bbc_internal_interface(mconfig, *this)
, m_rom(*this, "romslot%u", 0U)
diff --git a/src/devices/bus/bbc/internal/stl4m32.h b/src/devices/bus/bbc/internal/stl4m32.h
index ac939d6d4ff..f45d24876d5 100644
--- a/src/devices/bus/bbc/internal/stl4m32.h
+++ b/src/devices/bus/bbc/internal/stl4m32.h
@@ -25,7 +25,7 @@ class bbc_stl4m32_device :
{
public:
// construction/destruction
- bbc_stl4m32_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_stl4m32_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
DECLARE_INPUT_CHANGED_MEMBER(clock_switch);
diff --git a/src/devices/bus/bbc/internal/stlswr.cpp b/src/devices/bus/bbc/internal/stlswr.cpp
index f4992197453..bdbf1c17d29 100644
--- a/src/devices/bus/bbc/internal/stlswr.cpp
+++ b/src/devices/bus/bbc/internal/stlswr.cpp
@@ -94,29 +94,29 @@ const tiny_rom_entry *bbc_stlswr_device::device_rom_region() const
// bbc_stlswr_device - constructor
//-------------------------------------------------
-bbc_stlswr_device::bbc_stlswr_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+bbc_stlswr_device::bbc_stlswr_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_bbc_internal_interface(mconfig, *this)
, m_rom(*this, "romslot%u", 0U)
{
}
-bbc_stlswr16_device::bbc_stlswr16_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_stlswr16_device::bbc_stlswr16_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_stlswr_device(mconfig, BBC_STLSWR16, tag, owner, clock)
{
}
-bbc_stlswr32_device::bbc_stlswr32_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_stlswr32_device::bbc_stlswr32_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_stlswr_device(mconfig, BBC_STLSWR32, tag, owner, clock)
{
}
-bbc_stlswr64_device::bbc_stlswr64_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_stlswr64_device::bbc_stlswr64_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_stlswr_device(mconfig, BBC_STLSWR64, tag, owner, clock)
{
}
-bbc_stlswr128_device::bbc_stlswr128_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_stlswr128_device::bbc_stlswr128_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_stlswr_device(mconfig, BBC_STLSWR128, tag, owner, clock)
{
}
diff --git a/src/devices/bus/bbc/internal/stlswr.h b/src/devices/bus/bbc/internal/stlswr.h
index db7e263ce28..3ff46bfd349 100644
--- a/src/devices/bus/bbc/internal/stlswr.h
+++ b/src/devices/bus/bbc/internal/stlswr.h
@@ -25,10 +25,10 @@ class bbc_stlswr_device :
{
public:
// construction/destruction
- bbc_stlswr_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_stlswr_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- bbc_stlswr_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ bbc_stlswr_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
// device-level overrides
virtual void device_start() override;
@@ -53,7 +53,7 @@ class bbc_stlswr16_device : public bbc_stlswr_device
{
public:
// construction/destruction
- bbc_stlswr16_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_stlswr16_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// optional information overrides
@@ -65,7 +65,7 @@ class bbc_stlswr32_device : public bbc_stlswr_device
{
public:
// construction/destruction
- bbc_stlswr32_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_stlswr32_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// optional information overrides
@@ -77,7 +77,7 @@ class bbc_stlswr64_device : public bbc_stlswr_device
{
public:
// construction/destruction
- bbc_stlswr64_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_stlswr64_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// optional information overrides
@@ -89,7 +89,7 @@ class bbc_stlswr128_device : public bbc_stlswr_device
{
public:
// construction/destruction
- bbc_stlswr128_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_stlswr128_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// optional information overrides
diff --git a/src/devices/bus/bbc/internal/we32kram.cpp b/src/devices/bus/bbc/internal/we32kram.cpp
index 4e0e084e655..cfe6a252d24 100644
--- a/src/devices/bus/bbc/internal/we32kram.cpp
+++ b/src/devices/bus/bbc/internal/we32kram.cpp
@@ -56,7 +56,7 @@ const tiny_rom_entry *bbc_we32kram_device::device_rom_region() const
// bbc_we32kram_device - constructor
//-------------------------------------------------
-bbc_we32kram_device::bbc_we32kram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_we32kram_device::bbc_we32kram_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_WE32KRAM, tag, owner, clock)
, device_bbc_internal_interface(mconfig, *this)
{
diff --git a/src/devices/bus/bbc/internal/we32kram.h b/src/devices/bus/bbc/internal/we32kram.h
index aa10005292b..d5fc6a0a1f5 100644
--- a/src/devices/bus/bbc/internal/we32kram.h
+++ b/src/devices/bus/bbc/internal/we32kram.h
@@ -25,7 +25,7 @@ class bbc_we32kram_device :
{
public:
// construction/destruction
- bbc_we32kram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_we32kram_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/bbc/internal/werom.cpp b/src/devices/bus/bbc/internal/werom.cpp
index bc38500dee8..90937325851 100644
--- a/src/devices/bus/bbc/internal/werom.cpp
+++ b/src/devices/bus/bbc/internal/werom.cpp
@@ -94,20 +94,20 @@ void bbc_we13rom_device::device_add_mconfig(machine_config &config)
// bbc_werom_device - constructor
//-------------------------------------------------
-bbc_werom_device::bbc_werom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+bbc_werom_device::bbc_werom_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_bbc_internal_interface(mconfig, *this)
, m_rom(*this, "romslot%u", 0U)
{
}
-bbc_we12rom_device::bbc_we12rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_we12rom_device::bbc_we12rom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_werom_device(mconfig, BBC_WE12ROM, tag, owner, clock)
, m_wp(*this, "wp")
{
}
-bbc_we13rom_device::bbc_we13rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_we13rom_device::bbc_we13rom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_werom_device(mconfig, BBC_WE13ROM, tag, owner, clock)
{
}
diff --git a/src/devices/bus/bbc/internal/werom.h b/src/devices/bus/bbc/internal/werom.h
index 4e95ba120d8..87985297cf4 100644
--- a/src/devices/bus/bbc/internal/werom.h
+++ b/src/devices/bus/bbc/internal/werom.h
@@ -27,10 +27,10 @@ class bbc_werom_device :
{
public:
// construction/destruction
- bbc_werom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_werom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- bbc_werom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ bbc_werom_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
optional_device_array<bbc_romslot_device, 16> m_rom;
@@ -45,7 +45,7 @@ class bbc_we12rom_device : public bbc_werom_device
{
public:
// construction/destruction
- bbc_we12rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_we12rom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
@@ -67,7 +67,7 @@ class bbc_we13rom_device : public bbc_werom_device
{
public:
// construction/destruction
- bbc_we13rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_we13rom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/bbc/internal/weromram.cpp b/src/devices/bus/bbc/internal/weromram.cpp
index ceb8be3e270..cf429706721 100644
--- a/src/devices/bus/bbc/internal/weromram.cpp
+++ b/src/devices/bus/bbc/internal/weromram.cpp
@@ -50,7 +50,7 @@ void bbc_weromram_device::device_add_mconfig(machine_config &config)
// bbc_weromram_device - constructor
//-------------------------------------------------
-bbc_weromram_device::bbc_weromram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_weromram_device::bbc_weromram_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_WEROMRAM, tag, owner, clock)
, device_bbc_internal_interface(mconfig, *this)
, m_rom(*this, "romslot%u", 0U)
diff --git a/src/devices/bus/bbc/internal/weromram.h b/src/devices/bus/bbc/internal/weromram.h
index b85c9d031ab..fa853944e51 100644
--- a/src/devices/bus/bbc/internal/weromram.h
+++ b/src/devices/bus/bbc/internal/weromram.h
@@ -25,7 +25,7 @@ class bbc_weromram_device :
{
public:
// construction/destruction
- bbc_weromram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_weromram_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/bbc/joyport/joyport.cpp b/src/devices/bus/bbc/joyport/joyport.cpp
index 59173030724..161b32a0a0d 100644
--- a/src/devices/bus/bbc/joyport/joyport.cpp
+++ b/src/devices/bus/bbc/joyport/joyport.cpp
@@ -40,7 +40,7 @@ device_bbc_joyport_interface::device_bbc_joyport_interface(const machine_config
// bbcmc_joyport_slot_device - constructor
//-------------------------------------------------
-bbc_joyport_slot_device::bbc_joyport_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_joyport_slot_device::bbc_joyport_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_JOYPORT_SLOT, tag, owner, clock)
, device_single_card_slot_interface(mconfig, *this)
, m_device(nullptr)
diff --git a/src/devices/bus/bbc/joyport/joyport.h b/src/devices/bus/bbc/joyport/joyport.h
index 15d81243d84..94814633a34 100644
--- a/src/devices/bus/bbc/joyport/joyport.h
+++ b/src/devices/bus/bbc/joyport/joyport.h
@@ -55,7 +55,7 @@ public:
set_fixed(false);
}
- bbc_joyport_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock = 0);
+ bbc_joyport_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock = XTAL());
// callbacks
auto cb1_handler() { return m_cb1_handler.bind(); }
diff --git a/src/devices/bus/bbc/joyport/joystick.cpp b/src/devices/bus/bbc/joyport/joystick.cpp
index 1f5a9f89c98..527c7668e10 100644
--- a/src/devices/bus/bbc/joyport/joystick.cpp
+++ b/src/devices/bus/bbc/joyport/joystick.cpp
@@ -48,7 +48,7 @@ ioport_constructor bbcmc_joystick_device::device_input_ports() const
// bbcmc_joystick_device - constructor
//-------------------------------------------------
-bbcmc_joystick_device::bbcmc_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbcmc_joystick_device::bbcmc_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBCMC_JOYSTICK, tag, owner, clock)
, device_bbc_joyport_interface(mconfig, *this)
, m_joy(*this, "JOY")
diff --git a/src/devices/bus/bbc/joyport/joystick.h b/src/devices/bus/bbc/joyport/joystick.h
index b30ef3ae51c..50872e7f810 100644
--- a/src/devices/bus/bbc/joyport/joystick.h
+++ b/src/devices/bus/bbc/joyport/joystick.h
@@ -26,7 +26,7 @@ class bbcmc_joystick_device :
{
public:
// construction/destruction
- bbcmc_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbcmc_joystick_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override;
diff --git a/src/devices/bus/bbc/joyport/mouse.cpp b/src/devices/bus/bbc/joyport/mouse.cpp
index 1cd91caeaa5..ae8fe92b348 100644
--- a/src/devices/bus/bbc/joyport/mouse.cpp
+++ b/src/devices/bus/bbc/joyport/mouse.cpp
@@ -59,7 +59,7 @@ ioport_constructor bbcmc_mouse_device::device_input_ports() const
// bbcmc_mouse_device - constructor
//-------------------------------------------------
-bbcmc_mouse_device::bbcmc_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbcmc_mouse_device::bbcmc_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBCMC_MOUSE, tag, owner, clock)
, device_bbc_joyport_interface(mconfig, *this)
, m_mouse_x(*this, "mouse_x")
diff --git a/src/devices/bus/bbc/joyport/mouse.h b/src/devices/bus/bbc/joyport/mouse.h
index 0e2c6947104..6347d6bbb3f 100644
--- a/src/devices/bus/bbc/joyport/mouse.h
+++ b/src/devices/bus/bbc/joyport/mouse.h
@@ -25,7 +25,7 @@ class bbcmc_mouse_device :
{
public:
// construction/destruction
- bbcmc_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbcmc_mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/bbc/modem/meup.cpp b/src/devices/bus/bbc/modem/meup.cpp
index 128db2b0297..eb24a25e66c 100644
--- a/src/devices/bus/bbc/modem/meup.cpp
+++ b/src/devices/bus/bbc/modem/meup.cpp
@@ -45,7 +45,7 @@ void bbc_meup_device::device_add_mconfig(machine_config &config)
// bbc_meup_device - constructor
//-------------------------------------------------
-bbc_meup_device::bbc_meup_device(const machine_config &mconfig, const char* tag, device_t* owner, uint32_t clock)
+bbc_meup_device::bbc_meup_device(const machine_config &mconfig, const char* tag, device_t* owner, const XTAL &clock)
: device_t(mconfig, BBC_MEUP, tag, owner, clock)
, device_bbc_modem_interface(mconfig, *this)
, m_via(*this, "via")
diff --git a/src/devices/bus/bbc/modem/meup.h b/src/devices/bus/bbc/modem/meup.h
index 95d0a536c50..4be0245071d 100644
--- a/src/devices/bus/bbc/modem/meup.h
+++ b/src/devices/bus/bbc/modem/meup.h
@@ -22,7 +22,7 @@ class bbc_meup_device: public device_t, public device_bbc_modem_interface
{
public:
// construction/destruction
- bbc_meup_device(const machine_config &mconfig, const char* tag, device_t* owner, uint32_t clock);
+ bbc_meup_device(const machine_config &mconfig, const char* tag, device_t* owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/bbc/modem/modem.cpp b/src/devices/bus/bbc/modem/modem.cpp
index e3b4d164fac..43af8978c4b 100644
--- a/src/devices/bus/bbc/modem/modem.cpp
+++ b/src/devices/bus/bbc/modem/modem.cpp
@@ -41,7 +41,7 @@ device_bbc_modem_interface::device_bbc_modem_interface(const machine_config &mco
// bbc_modem_slot_device - constructor
//-------------------------------------------------
-bbc_modem_slot_device::bbc_modem_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_modem_slot_device::bbc_modem_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_MODEM_SLOT, tag, owner, clock)
, device_single_card_slot_interface<device_bbc_modem_interface>(mconfig, *this)
, m_card(nullptr)
diff --git a/src/devices/bus/bbc/modem/modem.h b/src/devices/bus/bbc/modem/modem.h
index 6c1e7840637..17d7076aa28 100644
--- a/src/devices/bus/bbc/modem/modem.h
+++ b/src/devices/bus/bbc/modem/modem.h
@@ -51,7 +51,7 @@ class bbc_modem_slot_device : public device_t, public device_single_card_slot_in
public:
// construction/destruction
template <typename T>
- bbc_modem_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock, T &&slot_options, const char *default_option)
+ bbc_modem_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock, T &&slot_options, const char *default_option)
: bbc_modem_slot_device(mconfig, tag, owner, clock)
{
option_reset();
@@ -60,7 +60,7 @@ public:
set_fixed(false);
}
- bbc_modem_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock);
+ bbc_modem_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock);
// callbacks
auto irq_handler() { return m_irq_handler.bind(); }
diff --git a/src/devices/bus/bbc/modem/scsiaiv.cpp b/src/devices/bus/bbc/modem/scsiaiv.cpp
index 603b36c9a8a..c4c3e5243d5 100644
--- a/src/devices/bus/bbc/modem/scsiaiv.cpp
+++ b/src/devices/bus/bbc/modem/scsiaiv.cpp
@@ -54,19 +54,19 @@ void bbc_scsiaiv_device::device_add_mconfig(machine_config& config)
// bbc_scsiaiv_device - constructor
//-------------------------------------------------
-bbc_scsiaiv_device::bbc_scsiaiv_device(const machine_config& mconfig, device_type type, const char* tag, device_t* owner, uint32_t clock)
+bbc_scsiaiv_device::bbc_scsiaiv_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_bbc_modem_interface(mconfig, *this)
, m_scsi(*this, "scsi:7:scsicb")
{
}
-bbc_scsiaiv_device::bbc_scsiaiv_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock)
+bbc_scsiaiv_device::bbc_scsiaiv_device(const machine_config& mconfig, const char* tag, device_t* owner, const XTAL &clock)
: bbc_scsiaiv_device(mconfig, BBC_SCSIAIV, tag, owner, clock)
{
}
-//bbc_vp415_device::bbc_vp415_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock)
+//bbc_vp415_device::bbc_vp415_device(const machine_config& mconfig, const char* tag, device_t* owner, const XTAL &clock)
// : bbc_scsiaiv_device(mconfig, BBC_VP415, tag, owner, clock)
//{
//}
diff --git a/src/devices/bus/bbc/modem/scsiaiv.h b/src/devices/bus/bbc/modem/scsiaiv.h
index 0b244bb71e3..8cbb8602d9b 100644
--- a/src/devices/bus/bbc/modem/scsiaiv.h
+++ b/src/devices/bus/bbc/modem/scsiaiv.h
@@ -24,13 +24,13 @@ class bbc_scsiaiv_device:
{
public:
// construction/destruction
- bbc_scsiaiv_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock);
+ bbc_scsiaiv_device(const machine_config& mconfig, const char* tag, device_t* owner, const XTAL &clock);
DECLARE_WRITE_LINE_MEMBER(bsy_w);
DECLARE_WRITE_LINE_MEMBER(req_w);
protected:
- bbc_scsiaiv_device(const machine_config& mconfig, device_type type, const char* tag, device_t* owner, uint32_t clock);
+ bbc_scsiaiv_device(const machine_config& mconfig, device_type type, const char* tag, device_t* owner, const XTAL &clock);
// device-level overrides
virtual void device_start() override;
@@ -55,7 +55,7 @@ private:
//{
//public:
// // construction/destruction
-// bbc_vp415_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock);
+// bbc_vp415_device(const machine_config& mconfig, const char* tag, device_t* owner, const XTAL &clock);
//
//protected:
// // optional information overrides
diff --git a/src/devices/bus/bbc/rom/datagem.cpp b/src/devices/bus/bbc/rom/datagem.cpp
index 11f2cfdb631..d516d2d1487 100644
--- a/src/devices/bus/bbc/rom/datagem.cpp
+++ b/src/devices/bus/bbc/rom/datagem.cpp
@@ -25,7 +25,7 @@ DEFINE_DEVICE_TYPE(BBC_DATAGEM, bbc_datagem_device, "bbc_datagem", "Gemini DataG
// bbc_datagem_device - constructor
//-------------------------------------------------
-bbc_datagem_device::bbc_datagem_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_datagem_device::bbc_datagem_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_DATAGEM, tag, owner, clock)
, device_bbc_rom_interface(mconfig, *this)
, m_bank(0)
diff --git a/src/devices/bus/bbc/rom/datagem.h b/src/devices/bus/bbc/rom/datagem.h
index 0d78f754e44..f5c1bb29dbf 100644
--- a/src/devices/bus/bbc/rom/datagem.h
+++ b/src/devices/bus/bbc/rom/datagem.h
@@ -25,7 +25,7 @@ class bbc_datagem_device : public device_t,
{
public:
// construction/destruction
- bbc_datagem_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_datagem_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/bbc/rom/dfs.cpp b/src/devices/bus/bbc/rom/dfs.cpp
index 7395b31dae9..4dc8dd6bb0d 100644
--- a/src/devices/bus/bbc/rom/dfs.cpp
+++ b/src/devices/bus/bbc/rom/dfs.cpp
@@ -27,7 +27,7 @@ DEFINE_DEVICE_TYPE(BBC_DFSE00, bbc_dfse00_device, "bbc_dfse00", "BBC Micro E00 D
// bbc_rom_device - constructor
//-------------------------------------------------
-bbc_dfse00_device::bbc_dfse00_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_dfse00_device::bbc_dfse00_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_DFSE00, tag, owner, clock)
, device_bbc_rom_interface(mconfig, *this)
{
diff --git a/src/devices/bus/bbc/rom/dfs.h b/src/devices/bus/bbc/rom/dfs.h
index 13d6d94d079..8f5824d1146 100644
--- a/src/devices/bus/bbc/rom/dfs.h
+++ b/src/devices/bus/bbc/rom/dfs.h
@@ -23,7 +23,7 @@ class bbc_dfse00_device : public device_t, public device_bbc_rom_interface
{
public:
// construction/destruction
- bbc_dfse00_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_dfse00_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/bbc/rom/genie.cpp b/src/devices/bus/bbc/rom/genie.cpp
index 28b9b42644a..c3b1ef8afc0 100644
--- a/src/devices/bus/bbc/rom/genie.cpp
+++ b/src/devices/bus/bbc/rom/genie.cpp
@@ -26,7 +26,7 @@ DEFINE_DEVICE_TYPE(BBC_PMSGENIE, bbc_pmsgenie_device, "bbc_pmsgenie", "PMS Genie
// bbc_palprom_device - constructor
//-------------------------------------------------
-bbc_pmsgenie_device::bbc_pmsgenie_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_pmsgenie_device::bbc_pmsgenie_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_PMSGENIE, tag, owner, clock)
, device_bbc_rom_interface(mconfig, *this)
, m_write_latch(0)
diff --git a/src/devices/bus/bbc/rom/genie.h b/src/devices/bus/bbc/rom/genie.h
index 82813b2b166..81ffb542e9b 100644
--- a/src/devices/bus/bbc/rom/genie.h
+++ b/src/devices/bus/bbc/rom/genie.h
@@ -25,7 +25,7 @@ class bbc_pmsgenie_device : public device_t,
{
public:
// construction/destruction
- bbc_pmsgenie_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_pmsgenie_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/bbc/rom/nvram.cpp b/src/devices/bus/bbc/rom/nvram.cpp
index 0d24f30c8bd..686b2afcc6a 100644
--- a/src/devices/bus/bbc/rom/nvram.cpp
+++ b/src/devices/bus/bbc/rom/nvram.cpp
@@ -24,7 +24,7 @@ DEFINE_DEVICE_TYPE(BBC_NVRAM, bbc_nvram_device, "bbc_nvram", "BBC Micro Sideways
// bbc_nvram_device - constructor
//-------------------------------------------------
-bbc_nvram_device::bbc_nvram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_nvram_device::bbc_nvram_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_NVRAM, tag, owner, clock)
, device_bbc_rom_interface(mconfig, *this)
{
diff --git a/src/devices/bus/bbc/rom/nvram.h b/src/devices/bus/bbc/rom/nvram.h
index d10025c6acd..a9134c44ac1 100644
--- a/src/devices/bus/bbc/rom/nvram.h
+++ b/src/devices/bus/bbc/rom/nvram.h
@@ -24,7 +24,7 @@ class bbc_nvram_device : public device_t,
{
public:
// construction/destruction
- bbc_nvram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_nvram_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/bbc/rom/pal.cpp b/src/devices/bus/bbc/rom/pal.cpp
index 51667f70955..80c838a1a4c 100644
--- a/src/devices/bus/bbc/rom/pal.cpp
+++ b/src/devices/bus/bbc/rom/pal.cpp
@@ -63,54 +63,54 @@ DEFINE_DEVICE_TYPE(BBC_PALMO2, bbc_palmo2_device, "bbc_palmo2", "Instant Mini Of
// bbc_palprom_device - constructor
//-------------------------------------------------
-bbc_pal_device::bbc_pal_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+bbc_pal_device::bbc_pal_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_bbc_rom_interface(mconfig, *this)
, m_bank(0)
{
}
-bbc_cciword_device::bbc_cciword_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_cciword_device::bbc_cciword_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_pal_device(mconfig, BBC_CCIWORD, tag, owner, clock)
{
}
-bbc_ccibase_device::bbc_ccibase_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_ccibase_device::bbc_ccibase_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_pal_device(mconfig, BBC_CCIBASE, tag, owner, clock)
{
}
-bbc_ccispell_device::bbc_ccispell_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_ccispell_device::bbc_ccispell_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_pal_device(mconfig, BBC_CCISPELL, tag, owner, clock)
{
}
-bbc_palqst_device::bbc_palqst_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_palqst_device::bbc_palqst_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_pal_device(mconfig, BBC_PALQST, tag, owner, clock)
{
}
-bbc_palwap_device::bbc_palwap_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_palwap_device::bbc_palwap_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_pal_device(mconfig, BBC_PALWAP, tag, owner, clock)
{
}
-bbc_palted_device::bbc_palted_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_palted_device::bbc_palted_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_pal_device(mconfig, BBC_PALTED, tag, owner, clock)
{
}
-bbc_palabep_device::bbc_palabep_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_palabep_device::bbc_palabep_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_pal_device(mconfig, BBC_PALABEP, tag, owner, clock)
{
}
-bbc_palabe_device::bbc_palabe_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_palabe_device::bbc_palabe_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_pal_device(mconfig, BBC_PALABE, tag, owner, clock)
{
}
-bbc_palmo2_device::bbc_palmo2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_palmo2_device::bbc_palmo2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_pal_device(mconfig, BBC_PALMO2, tag, owner, clock)
{
}
diff --git a/src/devices/bus/bbc/rom/pal.h b/src/devices/bus/bbc/rom/pal.h
index 31c8dcd0d78..5fda03fd656 100644
--- a/src/devices/bus/bbc/rom/pal.h
+++ b/src/devices/bus/bbc/rom/pal.h
@@ -25,7 +25,7 @@ class bbc_pal_device : public device_t,
{
protected:
// construction/destruction
- bbc_pal_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ bbc_pal_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
// device-level overrides
virtual void device_start() override;
@@ -42,7 +42,7 @@ class bbc_cciword_device : public bbc_pal_device
{
public:
// construction/destruction
- bbc_cciword_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_cciword_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device_bbc_rom_interface overrides
@@ -55,7 +55,7 @@ class bbc_ccibase_device : public bbc_pal_device
{
public:
// construction/destruction
- bbc_ccibase_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_ccibase_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device_bbc_rom_interface overrides
@@ -68,7 +68,7 @@ class bbc_ccispell_device : public bbc_pal_device
{
public:
// construction/destruction
- bbc_ccispell_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_ccispell_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device_bbc_rom_interface overrides
@@ -80,7 +80,7 @@ protected:
class bbc_palqst_device : public bbc_pal_device
{
public:
- bbc_palqst_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_palqst_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device_bbc_rom_interface overrides
@@ -92,7 +92,7 @@ protected:
class bbc_palwap_device : public bbc_pal_device
{
public:
- bbc_palwap_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_palwap_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device_bbc_rom_interface overrides
@@ -105,7 +105,7 @@ class bbc_palted_device : public bbc_pal_device
{
public:
// construction/destruction
- bbc_palted_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_palted_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device_bbc_rom_interface overrides
@@ -118,7 +118,7 @@ class bbc_palabep_device : public bbc_pal_device
{
public:
// construction/destruction
- bbc_palabep_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_palabep_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device_bbc_rom_interface overrides
@@ -131,7 +131,7 @@ class bbc_palabe_device : public bbc_pal_device
{
public:
// construction/destruction
- bbc_palabe_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_palabe_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device_bbc_rom_interface overrides
@@ -144,7 +144,7 @@ class bbc_palmo2_device : public bbc_pal_device
{
public:
// construction/destruction
- bbc_palmo2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_palmo2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device_bbc_rom_interface overrides
diff --git a/src/devices/bus/bbc/rom/ram.cpp b/src/devices/bus/bbc/rom/ram.cpp
index bbe5d956006..d3cb0cea3b8 100644
--- a/src/devices/bus/bbc/rom/ram.cpp
+++ b/src/devices/bus/bbc/rom/ram.cpp
@@ -24,7 +24,7 @@ DEFINE_DEVICE_TYPE(BBC_RAM, bbc_ram_device, "bbc_ram", "BBC Micro Sideways RAM")
// bbc_ram_device - constructor
//-------------------------------------------------
-bbc_ram_device::bbc_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_ram_device::bbc_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_RAM, tag, owner, clock)
, device_bbc_rom_interface(mconfig, *this)
{
diff --git a/src/devices/bus/bbc/rom/ram.h b/src/devices/bus/bbc/rom/ram.h
index 85267147a35..adb538fce2e 100644
--- a/src/devices/bus/bbc/rom/ram.h
+++ b/src/devices/bus/bbc/rom/ram.h
@@ -24,7 +24,7 @@ class bbc_ram_device : public device_t,
{
public:
// construction/destruction
- bbc_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_ram_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/bbc/rom/rom.cpp b/src/devices/bus/bbc/rom/rom.cpp
index f419998510b..09df9d47ba1 100644
--- a/src/devices/bus/bbc/rom/rom.cpp
+++ b/src/devices/bus/bbc/rom/rom.cpp
@@ -24,7 +24,7 @@ DEFINE_DEVICE_TYPE(BBC_ROM, bbc_rom_device, "bbc_rom", "BBC Micro Sideways ROM")
// bbc_rom_device - constructor
//-------------------------------------------------
-bbc_rom_device::bbc_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_rom_device::bbc_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_ROM, tag, owner, clock)
, device_bbc_rom_interface(mconfig, *this)
{
diff --git a/src/devices/bus/bbc/rom/rom.h b/src/devices/bus/bbc/rom/rom.h
index 282e5471781..4405d3d313f 100644
--- a/src/devices/bus/bbc/rom/rom.h
+++ b/src/devices/bus/bbc/rom/rom.h
@@ -24,7 +24,7 @@ class bbc_rom_device : public device_t,
{
public:
// construction/destruction
- bbc_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/bbc/rom/rtc.cpp b/src/devices/bus/bbc/rom/rtc.cpp
index 7d73c24b53e..14f58489a3c 100644
--- a/src/devices/bus/bbc/rom/rtc.cpp
+++ b/src/devices/bus/bbc/rom/rtc.cpp
@@ -34,7 +34,7 @@ void bbc_stlrtc_device::device_add_mconfig(machine_config &config)
void bbc_pmsrtc_device::device_add_mconfig(machine_config &config)
{
/* Dallas DS1216 SmartWatch RAM */
- DS1315(config, m_rtc, 0);
+ DS1315(config, m_rtc);
}
//**************************************************************************
@@ -45,14 +45,14 @@ void bbc_pmsrtc_device::device_add_mconfig(machine_config &config)
// bbc_stlrtc_device - constructor
//-------------------------------------------------
-bbc_stlrtc_device::bbc_stlrtc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_stlrtc_device::bbc_stlrtc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_STLRTC, tag, owner, clock)
, device_bbc_rom_interface(mconfig, *this)
, m_rtc(*this, "rtc")
{
}
-bbc_pmsrtc_device::bbc_pmsrtc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_pmsrtc_device::bbc_pmsrtc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_PMSRTC, tag, owner, clock)
, device_bbc_rom_interface(mconfig, *this)
, m_rtc(*this, "rtc")
diff --git a/src/devices/bus/bbc/rom/rtc.h b/src/devices/bus/bbc/rom/rtc.h
index d37b2174b9b..0cdb9819352 100644
--- a/src/devices/bus/bbc/rom/rtc.h
+++ b/src/devices/bus/bbc/rom/rtc.h
@@ -28,7 +28,7 @@ class bbc_stlrtc_device : public device_t,
{
public:
// construction/destruction
- bbc_stlrtc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_stlrtc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
@@ -50,7 +50,7 @@ class bbc_pmsrtc_device : public device_t,
{
public:
// construction/destruction
- bbc_pmsrtc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_pmsrtc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/bbc/rom/slot.cpp b/src/devices/bus/bbc/rom/slot.cpp
index b7ea541bbc2..b015306c86a 100644
--- a/src/devices/bus/bbc/rom/slot.cpp
+++ b/src/devices/bus/bbc/rom/slot.cpp
@@ -82,7 +82,7 @@ void device_bbc_rom_interface::nvram_alloc(uint32_t size)
//-------------------------------------------------
// bbc_romslot_device - constructor
//-------------------------------------------------
-bbc_romslot_device::bbc_romslot_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+bbc_romslot_device::bbc_romslot_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_rom_image_interface(mconfig, *this)
, device_single_card_slot_interface<device_bbc_rom_interface>(mconfig, *this)
@@ -90,12 +90,12 @@ bbc_romslot_device::bbc_romslot_device(const machine_config &mconfig, device_typ
{
}
-bbc_romslot16_device::bbc_romslot16_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_romslot16_device::bbc_romslot16_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_romslot_device(mconfig, BBC_ROMSLOT16, tag, owner, clock)
{
}
-bbc_romslot32_device::bbc_romslot32_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_romslot32_device::bbc_romslot32_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_romslot_device(mconfig, BBC_ROMSLOT32, tag, owner, clock)
{
}
diff --git a/src/devices/bus/bbc/rom/slot.h b/src/devices/bus/bbc/rom/slot.h
index 986d796dd0d..c0d6b87b831 100644
--- a/src/devices/bus/bbc/rom/slot.h
+++ b/src/devices/bus/bbc/rom/slot.h
@@ -53,7 +53,7 @@ public:
protected:
// construction/destruction
- bbc_romslot_device(const machine_config &mconfig, device_type type, char const *tag, device_t *owner, uint32_t clock);
+ bbc_romslot_device(const machine_config &mconfig, device_type type, char const *tag, device_t *owner, const XTAL &clock);
// device-level overrides
virtual void device_start() override;
@@ -81,7 +81,7 @@ public:
m_slot_size = 0x4000;
}
- bbc_romslot16_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
+ bbc_romslot16_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL());
};
// ======================> bbc_romslot32_device
@@ -101,7 +101,7 @@ public:
m_slot_size = 0x8000;
}
- bbc_romslot32_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
+ bbc_romslot32_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL());
};
diff --git a/src/devices/bus/bbc/tube/tube.cpp b/src/devices/bus/bbc/tube/tube.cpp
index 505b7a25030..0b833e38651 100644
--- a/src/devices/bus/bbc/tube/tube.cpp
+++ b/src/devices/bus/bbc/tube/tube.cpp
@@ -42,7 +42,7 @@ device_bbc_tube_interface::device_bbc_tube_interface(const machine_config &mconf
// bbc_tube_slot_device - constructor
//-------------------------------------------------
-bbc_tube_slot_device::bbc_tube_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+bbc_tube_slot_device::bbc_tube_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, BBC_TUBE_SLOT, tag, owner, clock),
device_single_card_slot_interface<device_bbc_tube_interface>(mconfig, *this),
m_card(nullptr),
diff --git a/src/devices/bus/bbc/tube/tube.h b/src/devices/bus/bbc/tube/tube.h
index 97c18ab0d34..400292366ae 100644
--- a/src/devices/bus/bbc/tube/tube.h
+++ b/src/devices/bus/bbc/tube/tube.h
@@ -62,7 +62,7 @@ public:
set_insert_rom(true);
}
- bbc_tube_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock = 0);
+ bbc_tube_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock = XTAL());
void set_insert_rom(bool insert_rom) { m_insert_rom = insert_rom; }
bool insert_rom() { return m_insert_rom; }
diff --git a/src/devices/bus/bbc/tube/tube_32016.cpp b/src/devices/bus/bbc/tube/tube_32016.cpp
index e62e3003998..781f84e55cd 100644
--- a/src/devices/bus/bbc/tube/tube_32016.cpp
+++ b/src/devices/bus/bbc/tube/tube_32016.cpp
@@ -199,7 +199,7 @@ ioport_constructor bbc_tube_32016_device::device_input_ports() const
// bbc_tube_32016_device - constructor
//-------------------------------------------------
-bbc_tube_32016_device::bbc_tube_32016_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+bbc_tube_32016_device::bbc_tube_32016_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_bbc_tube_interface(mconfig, *this)
, m_maincpu(*this, "maincpu")
@@ -210,17 +210,17 @@ bbc_tube_32016_device::bbc_tube_32016_device(const machine_config &mconfig, devi
{
}
-bbc_tube_32016_device::bbc_tube_32016_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_tube_32016_device::bbc_tube_32016_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_tube_32016_device(mconfig, BBC_TUBE_32016, tag, owner, clock)
{
}
-bbc_tube_16032_device::bbc_tube_16032_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_tube_16032_device::bbc_tube_16032_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_tube_32016_device(mconfig, BBC_TUBE_16032, tag, owner, clock)
{
}
-bbc_tube_32016l_device::bbc_tube_32016l_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_tube_32016l_device::bbc_tube_32016l_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_tube_32016_device(mconfig, BBC_TUBE_32016L, tag, owner, clock)
{
}
diff --git a/src/devices/bus/bbc/tube/tube_32016.h b/src/devices/bus/bbc/tube/tube_32016.h
index 242b4eb773b..318f72c9d09 100644
--- a/src/devices/bus/bbc/tube/tube_32016.h
+++ b/src/devices/bus/bbc/tube/tube_32016.h
@@ -34,10 +34,10 @@ class bbc_tube_32016_device :
{
public:
// construction/destruction
- bbc_tube_32016_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_tube_32016_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- bbc_tube_32016_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ bbc_tube_32016_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
// device-level overrides
virtual void device_start() override;
@@ -68,7 +68,7 @@ protected:
class bbc_tube_16032_device : public bbc_tube_32016_device
{
public:
- bbc_tube_16032_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_tube_16032_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// optional information overrides
@@ -80,7 +80,7 @@ protected:
class bbc_tube_32016l_device : public bbc_tube_32016_device
{
public:
- bbc_tube_32016l_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_tube_32016l_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// optional information overrides
diff --git a/src/devices/bus/bbc/tube/tube_6502.cpp b/src/devices/bus/bbc/tube/tube_6502.cpp
index e7cc3157c90..b680b1eff41 100644
--- a/src/devices/bus/bbc/tube/tube_6502.cpp
+++ b/src/devices/bus/bbc/tube/tube_6502.cpp
@@ -200,7 +200,7 @@ const tiny_rom_entry *bbc_tube_65c102_device::device_rom_region() const
// bbc_tube_6502_device - constructor
//-------------------------------------------------
-bbc_tube_6502_device::bbc_tube_6502_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+bbc_tube_6502_device::bbc_tube_6502_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_bbc_tube_interface(mconfig, *this)
, m_maincpu(*this, "maincpu")
@@ -211,17 +211,17 @@ bbc_tube_6502_device::bbc_tube_6502_device(const machine_config &mconfig, device
{
}
-bbc_tube_6502_device::bbc_tube_6502_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_tube_6502_device::bbc_tube_6502_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_tube_6502_device(mconfig, BBC_TUBE_6502, tag, owner, clock)
{
}
-bbc_tube_6502p_device::bbc_tube_6502p_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_tube_6502p_device::bbc_tube_6502p_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_tube_6502_device(mconfig, BBC_TUBE_6502P, tag, owner, clock)
{
}
-bbc_tube_6502e_device::bbc_tube_6502e_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_tube_6502e_device::bbc_tube_6502e_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_tube_6502_device(mconfig, BBC_TUBE_6502E, tag, owner, clock)
, m_opcode_ind_y(false)
, m_page(0)
@@ -229,7 +229,7 @@ bbc_tube_6502e_device::bbc_tube_6502e_device(const machine_config &mconfig, cons
{
}
-bbc_tube_65c102_device::bbc_tube_65c102_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_tube_65c102_device::bbc_tube_65c102_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_tube_6502_device(mconfig, BBC_TUBE_65C102, tag, owner, clock)
{
}
diff --git a/src/devices/bus/bbc/tube/tube_6502.h b/src/devices/bus/bbc/tube/tube_6502.h
index a68e9c3f51e..b34aa903e8b 100644
--- a/src/devices/bus/bbc/tube/tube_6502.h
+++ b/src/devices/bus/bbc/tube/tube_6502.h
@@ -33,10 +33,10 @@ class bbc_tube_6502_device
{
public:
// construction/destruction
- bbc_tube_6502_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_tube_6502_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- bbc_tube_6502_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ bbc_tube_6502_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
// device-level overrides
virtual void device_start() override;
@@ -67,7 +67,7 @@ protected:
class bbc_tube_6502p_device : public bbc_tube_6502_device
{
public:
- bbc_tube_6502p_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_tube_6502p_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// optional information overrides
@@ -82,7 +82,7 @@ private:
class bbc_tube_6502e_device : public bbc_tube_6502_device
{
public:
- bbc_tube_6502e_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_tube_6502e_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
@@ -107,7 +107,7 @@ private:
class bbc_tube_65c102_device : public bbc_tube_6502_device
{
public:
- bbc_tube_65c102_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_tube_65c102_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// optional information overrides
diff --git a/src/devices/bus/bbc/tube/tube_80186.cpp b/src/devices/bus/bbc/tube/tube_80186.cpp
index 07456c67a38..4b657a60b86 100644
--- a/src/devices/bus/bbc/tube/tube_80186.cpp
+++ b/src/devices/bus/bbc/tube/tube_80186.cpp
@@ -72,7 +72,7 @@ void bbc_tube_80186_device::device_add_mconfig(machine_config &config)
m_i80186->tmrout0_handler().set_inputline(m_i80186, INPUT_LINE_HALT).invert();
m_i80186->tmrout1_handler().set_inputline(m_i80186, INPUT_LINE_NMI).invert();
- TUBE(config, m_ula, 0);
+ TUBE(config, m_ula);
m_ula->pirq_handler().set(m_i80186, FUNC(i80186_cpu_device::int0_w));
m_ula->drq_handler().set(m_i80186, FUNC(i80186_cpu_device::drq0_w));
m_ula->prst_handler().set(FUNC(bbc_tube_80186_device::prst_w));
@@ -115,7 +115,7 @@ const tiny_rom_entry *bbc_tube_pcplus_device::device_rom_region() const
// bbc_tube_80186_device - constructor
//-------------------------------------------------
-bbc_tube_80186_device::bbc_tube_80186_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+bbc_tube_80186_device::bbc_tube_80186_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_bbc_tube_interface(mconfig, *this)
, m_i80186(*this, "i80186")
@@ -125,12 +125,12 @@ bbc_tube_80186_device::bbc_tube_80186_device(const machine_config &mconfig, devi
{
}
-bbc_tube_80186_device::bbc_tube_80186_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_tube_80186_device::bbc_tube_80186_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_tube_80186_device(mconfig, BBC_TUBE_80186, tag, owner, clock)
{
}
-bbc_tube_pcplus_device::bbc_tube_pcplus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_tube_pcplus_device::bbc_tube_pcplus_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_tube_80186_device(mconfig, BBC_TUBE_PCPLUS, tag, owner, clock)
{
}
diff --git a/src/devices/bus/bbc/tube/tube_80186.h b/src/devices/bus/bbc/tube/tube_80186.h
index 448ef06cc7f..f7903ee2810 100644
--- a/src/devices/bus/bbc/tube/tube_80186.h
+++ b/src/devices/bus/bbc/tube/tube_80186.h
@@ -29,10 +29,10 @@ class bbc_tube_80186_device :
{
public:
// construction/destruction
- bbc_tube_80186_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_tube_80186_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- bbc_tube_80186_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ bbc_tube_80186_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
// device-level overrides
virtual void device_start() override;
@@ -60,7 +60,7 @@ protected:
class bbc_tube_pcplus_device : public bbc_tube_80186_device
{
public:
- bbc_tube_pcplus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_tube_pcplus_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/bbc/tube/tube_80286.cpp b/src/devices/bus/bbc/tube/tube_80286.cpp
index ffdfc0edb6f..863990a6bdb 100644
--- a/src/devices/bus/bbc/tube/tube_80286.cpp
+++ b/src/devices/bus/bbc/tube/tube_80286.cpp
@@ -94,7 +94,7 @@ const tiny_rom_entry *bbc_tube_80286_device::device_rom_region() const
// bbc_tube_80286_device - constructor
//-------------------------------------------------
-bbc_tube_80286_device::bbc_tube_80286_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_tube_80286_device::bbc_tube_80286_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_TUBE_80286, tag, owner, clock)
, device_bbc_tube_interface(mconfig, *this)
, m_i80286(*this, "i80286")
diff --git a/src/devices/bus/bbc/tube/tube_80286.h b/src/devices/bus/bbc/tube/tube_80286.h
index 6ac75975fa7..eefef58de50 100644
--- a/src/devices/bus/bbc/tube/tube_80286.h
+++ b/src/devices/bus/bbc/tube/tube_80286.h
@@ -27,7 +27,7 @@ class bbc_tube_80286_device :
{
public:
// construction/destruction
- bbc_tube_80286_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_tube_80286_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/bbc/tube/tube_a500.cpp b/src/devices/bus/bbc/tube/tube_a500.cpp
index f9406f2d2f0..f2653db1099 100644
--- a/src/devices/bus/bbc/tube/tube_a500.cpp
+++ b/src/devices/bus/bbc/tube/tube_a500.cpp
@@ -114,7 +114,7 @@ const tiny_rom_entry *bbc_tube_a500_device::device_rom_region() const
// bbc_tube_a500_device - constructor
//-------------------------------------------------
-bbc_tube_a500_device::bbc_tube_a500_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_tube_a500_device::bbc_tube_a500_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_TUBE_A500, tag, owner, clock)
, device_bbc_tube_interface(mconfig, *this)
, m_maincpu(*this, "maincpu")
diff --git a/src/devices/bus/bbc/tube/tube_a500.h b/src/devices/bus/bbc/tube/tube_a500.h
index 31af8f227f1..f5f6af9658f 100644
--- a/src/devices/bus/bbc/tube/tube_a500.h
+++ b/src/devices/bus/bbc/tube/tube_a500.h
@@ -36,7 +36,7 @@ class bbc_tube_a500_device :
{
public:
// construction/destruction
- bbc_tube_a500_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_tube_a500_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/bbc/tube/tube_arm.cpp b/src/devices/bus/bbc/tube/tube_arm.cpp
index c015871ffa5..dfc2c3f8760 100644
--- a/src/devices/bus/bbc/tube/tube_arm.cpp
+++ b/src/devices/bus/bbc/tube/tube_arm.cpp
@@ -85,7 +85,7 @@ const tiny_rom_entry *bbc_tube_arm_device::device_rom_region() const
// bbc_tube_arm_device - constructor
//-------------------------------------------------
-bbc_tube_arm_device::bbc_tube_arm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_tube_arm_device::bbc_tube_arm_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_TUBE_ARM, tag, owner, clock)
, device_bbc_tube_interface(mconfig, *this)
, m_maincpu(*this, "maincpu")
diff --git a/src/devices/bus/bbc/tube/tube_arm.h b/src/devices/bus/bbc/tube/tube_arm.h
index c84ddc97748..125228b5f03 100644
--- a/src/devices/bus/bbc/tube/tube_arm.h
+++ b/src/devices/bus/bbc/tube/tube_arm.h
@@ -27,7 +27,7 @@ class bbc_tube_arm_device :
{
public:
// construction/destruction
- bbc_tube_arm_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_tube_arm_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/bbc/tube/tube_arm7.cpp b/src/devices/bus/bbc/tube/tube_arm7.cpp
index e79b83ad997..f4ce41f2f05 100644
--- a/src/devices/bus/bbc/tube/tube_arm7.cpp
+++ b/src/devices/bus/bbc/tube/tube_arm7.cpp
@@ -87,7 +87,7 @@ const tiny_rom_entry *bbc_tube_arm7_device::device_rom_region() const
// bbc_tube_arm7_device - constructor
//-------------------------------------------------
-bbc_tube_arm7_device::bbc_tube_arm7_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_tube_arm7_device::bbc_tube_arm7_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_TUBE_ARM7, tag, owner, clock)
, device_bbc_tube_interface(mconfig, *this)
, m_maincpu(*this, "maincpu")
diff --git a/src/devices/bus/bbc/tube/tube_arm7.h b/src/devices/bus/bbc/tube/tube_arm7.h
index e203c26388a..cd903e39598 100644
--- a/src/devices/bus/bbc/tube/tube_arm7.h
+++ b/src/devices/bus/bbc/tube/tube_arm7.h
@@ -44,7 +44,7 @@ class bbc_tube_arm7_device :
public:
// construction/destruction
- bbc_tube_arm7_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_tube_arm7_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/bbc/tube/tube_casper.cpp b/src/devices/bus/bbc/tube/tube_casper.cpp
index ea2734159f9..b035b3e6f26 100644
--- a/src/devices/bus/bbc/tube/tube_casper.cpp
+++ b/src/devices/bus/bbc/tube/tube_casper.cpp
@@ -85,7 +85,7 @@ const tiny_rom_entry *bbc_tube_casper_device::device_rom_region() const
// bbc_tube_casper_device - constructor
//-------------------------------------------------
-bbc_tube_casper_device::bbc_tube_casper_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_tube_casper_device::bbc_tube_casper_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_TUBE_CASPER, tag, owner, clock),
device_bbc_tube_interface(mconfig, *this),
m_m68000(*this, "m68000"),
diff --git a/src/devices/bus/bbc/tube/tube_casper.h b/src/devices/bus/bbc/tube/tube_casper.h
index 5f4187c80a7..b9760d3b6c3 100644
--- a/src/devices/bus/bbc/tube/tube_casper.h
+++ b/src/devices/bus/bbc/tube/tube_casper.h
@@ -26,7 +26,7 @@ class bbc_tube_casper_device :
{
public:
// construction/destruction
- bbc_tube_casper_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_tube_casper_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/bbc/tube/tube_cms6809.cpp b/src/devices/bus/bbc/tube/tube_cms6809.cpp
index 43c86628f2a..c2d8a220da7 100644
--- a/src/devices/bus/bbc/tube/tube_cms6809.cpp
+++ b/src/devices/bus/bbc/tube/tube_cms6809.cpp
@@ -89,7 +89,7 @@ const tiny_rom_entry *bbc_tube_cms6809_device::device_rom_region() const
// bbc_tube_cms6809_device - constructor
//-------------------------------------------------
-bbc_tube_cms6809_device::bbc_tube_cms6809_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_tube_cms6809_device::bbc_tube_cms6809_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_TUBE_CMS6809, tag, owner, clock)
, device_bbc_tube_interface(mconfig, *this)
, m_maincpu(*this, "maincpu")
diff --git a/src/devices/bus/bbc/tube/tube_cms6809.h b/src/devices/bus/bbc/tube/tube_cms6809.h
index 79336974246..0fac81f17ea 100644
--- a/src/devices/bus/bbc/tube/tube_cms6809.h
+++ b/src/devices/bus/bbc/tube/tube_cms6809.h
@@ -26,7 +26,7 @@ class bbc_tube_cms6809_device :
{
public:
// construction/destruction
- bbc_tube_cms6809_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_tube_cms6809_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/bbc/tube/tube_rc6502.cpp b/src/devices/bus/bbc/tube/tube_rc6502.cpp
index 7aeeee283a2..550755e72d3 100644
--- a/src/devices/bus/bbc/tube/tube_rc6502.cpp
+++ b/src/devices/bus/bbc/tube/tube_rc6502.cpp
@@ -175,7 +175,7 @@ const tiny_rom_entry *bbc_tube_rc65816_device::device_rom_region() const
// bbc_tube_rc6502_device - constructor
//-------------------------------------------------
-bbc_tube_rc6502_device::bbc_tube_rc6502_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+bbc_tube_rc6502_device::bbc_tube_rc6502_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_bbc_tube_interface(mconfig, *this)
, m_maincpu(*this, "maincpu")
@@ -188,12 +188,12 @@ bbc_tube_rc6502_device::bbc_tube_rc6502_device(const machine_config &mconfig, de
{
}
-bbc_tube_rc6502_device::bbc_tube_rc6502_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_tube_rc6502_device::bbc_tube_rc6502_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_tube_rc6502_device(mconfig, BBC_TUBE_RC6502, tag, owner, clock)
{
}
-bbc_tube_rc65816_device::bbc_tube_rc65816_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_tube_rc65816_device::bbc_tube_rc65816_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_tube_rc6502_device(mconfig, BBC_TUBE_RC65816, tag, owner, clock)
{
}
diff --git a/src/devices/bus/bbc/tube/tube_rc6502.h b/src/devices/bus/bbc/tube/tube_rc6502.h
index cc1e12d71c8..9e0e926d507 100644
--- a/src/devices/bus/bbc/tube/tube_rc6502.h
+++ b/src/devices/bus/bbc/tube/tube_rc6502.h
@@ -31,10 +31,10 @@ class bbc_tube_rc6502_device :
{
public:
// construction/destruction
- bbc_tube_rc6502_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_tube_rc6502_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- bbc_tube_rc6502_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ bbc_tube_rc6502_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
// device-level overrides
virtual void device_start() override;
@@ -78,7 +78,7 @@ private:
class bbc_tube_rc65816_device : public bbc_tube_rc6502_device
{
public:
- bbc_tube_rc65816_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_tube_rc65816_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// optional information overrides
diff --git a/src/devices/bus/bbc/tube/tube_x25.cpp b/src/devices/bus/bbc/tube/tube_x25.cpp
index 21e03217201..d68273edc06 100644
--- a/src/devices/bus/bbc/tube/tube_x25.cpp
+++ b/src/devices/bus/bbc/tube/tube_x25.cpp
@@ -135,7 +135,7 @@ const tiny_rom_entry *bbc_tube_x25_device::device_rom_region() const
// bbc_tube_x25_device - constructor
//-------------------------------------------------
-bbc_tube_x25_device::bbc_tube_x25_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_tube_x25_device::bbc_tube_x25_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_TUBE_X25, tag, owner, clock)
, device_bbc_tube_interface(mconfig, *this)
, m_z80(*this, "z80_%u", 0)
diff --git a/src/devices/bus/bbc/tube/tube_x25.h b/src/devices/bus/bbc/tube/tube_x25.h
index 6e63c45bfa5..72bfd360ca5 100644
--- a/src/devices/bus/bbc/tube/tube_x25.h
+++ b/src/devices/bus/bbc/tube/tube_x25.h
@@ -30,7 +30,7 @@ class bbc_tube_x25_device :
{
public:
// construction/destruction
- bbc_tube_x25_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_tube_x25_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
static constexpr feature_type unemulated_features() { return feature::LAN; }
diff --git a/src/devices/bus/bbc/tube/tube_z80.cpp b/src/devices/bus/bbc/tube/tube_z80.cpp
index f273c2f37d4..0868335657f 100644
--- a/src/devices/bus/bbc/tube/tube_z80.cpp
+++ b/src/devices/bus/bbc/tube/tube_z80.cpp
@@ -108,7 +108,7 @@ const tiny_rom_entry *bbc_tube_z80w_device::device_rom_region() const
// bbc_tube_z80_device - constructor
//-------------------------------------------------
-bbc_tube_z80_device::bbc_tube_z80_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+bbc_tube_z80_device::bbc_tube_z80_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_bbc_tube_interface(mconfig, *this)
, m_z80(*this, "z80")
@@ -118,12 +118,12 @@ bbc_tube_z80_device::bbc_tube_z80_device(const machine_config &mconfig, device_t
{
}
-bbc_tube_z80_device::bbc_tube_z80_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_tube_z80_device::bbc_tube_z80_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_tube_z80_device(mconfig, BBC_TUBE_Z80, tag, owner, clock)
{
}
-bbc_tube_z80w_device::bbc_tube_z80w_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_tube_z80w_device::bbc_tube_z80w_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_tube_z80_device(mconfig, BBC_TUBE_Z80W, tag, owner, clock)
{
}
diff --git a/src/devices/bus/bbc/tube/tube_z80.h b/src/devices/bus/bbc/tube/tube_z80.h
index e878f61627d..ac8050ccd5c 100644
--- a/src/devices/bus/bbc/tube/tube_z80.h
+++ b/src/devices/bus/bbc/tube/tube_z80.h
@@ -28,10 +28,10 @@ class bbc_tube_z80_device :
{
public:
// construction/destruction
- bbc_tube_z80_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_tube_z80_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- bbc_tube_z80_device(const machine_config& mconfig, device_type type, const char* tag, device_t* owner, uint32_t clock);
+ bbc_tube_z80_device(const machine_config& mconfig, device_type type, const char* tag, device_t* owner, const XTAL &clock);
// device-level overrides
virtual void device_start() override;
@@ -70,7 +70,7 @@ private:
class bbc_tube_z80w_device : public bbc_tube_z80_device
{
public:
- bbc_tube_z80w_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock);
+ bbc_tube_z80w_device(const machine_config& mconfig, const char* tag, device_t* owner, const XTAL &clock);
protected:
// optional information overrides
diff --git a/src/devices/bus/bbc/tube/tube_zep100.cpp b/src/devices/bus/bbc/tube/tube_zep100.cpp
index 0d5b0d18948..7a066ed56a6 100644
--- a/src/devices/bus/bbc/tube/tube_zep100.cpp
+++ b/src/devices/bus/bbc/tube/tube_zep100.cpp
@@ -111,7 +111,7 @@ void bbc_tube_zep100_device::device_add_mconfig(machine_config &config)
m_via->ca2_handler().set(m_ppi, FUNC(i8255_device::pc6_w));
m_via->irq_handler().set(DEVICE_SELF_OWNER, FUNC(bbc_tube_slot_device::irq_w));
- I8255A(config, m_ppi, 0);
+ I8255A(config, m_ppi);
m_ppi->out_pa_callback().set(m_via, FUNC(via6522_device::write_pa));
m_ppi->in_pb_callback().set(FUNC(bbc_tube_zep100_device::ppi_pb_r));
m_ppi->out_pc_callback().set(FUNC(bbc_tube_zep100_device::ppi_pc_w));
@@ -152,7 +152,7 @@ const tiny_rom_entry *bbc_tube_zep100m_device::device_rom_region() const
// bbc_tube_zep100_device - constructor
//-------------------------------------------------
-bbc_tube_zep100_device::bbc_tube_zep100_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+bbc_tube_zep100_device::bbc_tube_zep100_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_bbc_tube_interface(mconfig, *this)
, m_rom_enabled(true)
@@ -164,22 +164,22 @@ bbc_tube_zep100_device::bbc_tube_zep100_device(const machine_config &mconfig, de
{
}
-bbc_tube_zep100_device::bbc_tube_zep100_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_tube_zep100_device::bbc_tube_zep100_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_tube_zep100_device(mconfig, BBC_TUBE_ZEP100, tag, owner, clock)
{
}
-bbc_tube_zep100l_device::bbc_tube_zep100l_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_tube_zep100l_device::bbc_tube_zep100l_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_tube_zep100_device(mconfig, BBC_TUBE_ZEP100L, tag, owner, clock)
{
}
-bbc_tube_zep100w_device::bbc_tube_zep100w_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_tube_zep100w_device::bbc_tube_zep100w_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_tube_zep100_device(mconfig, BBC_TUBE_ZEP100W, tag, owner, clock)
{
}
-bbc_tube_zep100m_device::bbc_tube_zep100m_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_tube_zep100m_device::bbc_tube_zep100m_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_tube_zep100_device(mconfig, BBC_TUBE_ZEP100M, tag, owner, clock)
{
}
diff --git a/src/devices/bus/bbc/tube/tube_zep100.h b/src/devices/bus/bbc/tube/tube_zep100.h
index a4f0dd58d92..1c5a292c551 100644
--- a/src/devices/bus/bbc/tube/tube_zep100.h
+++ b/src/devices/bus/bbc/tube/tube_zep100.h
@@ -29,10 +29,10 @@ class bbc_tube_zep100_device :
{
public:
// construction/destruction
- bbc_tube_zep100_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_tube_zep100_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- bbc_tube_zep100_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ bbc_tube_zep100_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
// device-level overrides
virtual void device_start() override;
@@ -73,7 +73,7 @@ private:
class bbc_tube_zep100l_device : public bbc_tube_zep100_device
{
public:
- bbc_tube_zep100l_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_tube_zep100l_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;
@@ -82,7 +82,7 @@ protected:
class bbc_tube_zep100w_device : public bbc_tube_zep100_device
{
public:
- bbc_tube_zep100w_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_tube_zep100w_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;
@@ -91,7 +91,7 @@ protected:
class bbc_tube_zep100m_device : public bbc_tube_zep100_device
{
public:
- bbc_tube_zep100m_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_tube_zep100m_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/bbc/userport/beebspch.cpp b/src/devices/bus/bbc/userport/beebspch.cpp
index 728d8ae6658..666802ea546 100644
--- a/src/devices/bus/bbc/userport/beebspch.cpp
+++ b/src/devices/bus/bbc/userport/beebspch.cpp
@@ -47,7 +47,7 @@ const tiny_rom_entry *bbc_beebspch_device::device_rom_region() const
void bbc_beebspch_device::device_add_mconfig(machine_config &config)
{
SPEAKER(config, "mono").front_center();
- SP0256(config, m_nsp, 3120000); // TODO: generated by a LS269
+ SP0256(config, m_nsp, XTAL::u(3120000)); // TODO: generated by a LS269
m_nsp->data_request_callback().set(FUNC(bbc_beebspch_device::cb1_w));
m_nsp->standby_callback().set(FUNC(bbc_beebspch_device::cb2_w));
m_nsp->add_route(ALL_OUTPUTS, "mono", 1.0);
@@ -62,7 +62,7 @@ void bbc_beebspch_device::device_add_mconfig(machine_config &config)
// bbc_beebspch_device - constructor
//-------------------------------------------------
-bbc_beebspch_device::bbc_beebspch_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_beebspch_device::bbc_beebspch_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_BEEBSPCH, tag, owner, clock)
, device_bbc_userport_interface(mconfig, *this)
, m_nsp(*this, "sp0256")
@@ -88,11 +88,11 @@ void bbc_beebspch_device::pb_w(uint8_t data)
{
case 0x40:
// intonation high
- m_nsp->set_clock(3800000); // TODO: the exact frequency is unknown
+ m_nsp->set_clock(XTAL::u(3800000)); // TODO: the exact frequency is unknown
break;
case 0x80:
// intonation low
- m_nsp->set_clock(3500000); // CK / 4 ??
+ m_nsp->set_clock(XTAL::u(3500000)); // CK / 4 ??
break;
}
diff --git a/src/devices/bus/bbc/userport/beebspch.h b/src/devices/bus/bbc/userport/beebspch.h
index 79e6abf64ab..67a5bbb82bf 100644
--- a/src/devices/bus/bbc/userport/beebspch.h
+++ b/src/devices/bus/bbc/userport/beebspch.h
@@ -25,7 +25,7 @@ class bbc_beebspch_device :
{
public:
// construction/destruction
- bbc_beebspch_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_beebspch_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
DECLARE_WRITE_LINE_MEMBER(cb1_w);
DECLARE_WRITE_LINE_MEMBER(cb2_w);
diff --git a/src/devices/bus/bbc/userport/cfa3000kbd.cpp b/src/devices/bus/bbc/userport/cfa3000kbd.cpp
index 5b2d5586f56..36420596a12 100644
--- a/src/devices/bus/bbc/userport/cfa3000kbd.cpp
+++ b/src/devices/bus/bbc/userport/cfa3000kbd.cpp
@@ -83,7 +83,7 @@ ioport_constructor cfa3000_kbd_device::device_input_ports() const
// cfa3000_kbd_device - constructor
//-------------------------------------------------
-cfa3000_kbd_device::cfa3000_kbd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+cfa3000_kbd_device::cfa3000_kbd_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, CFA3000_KBD, tag, owner, clock),
device_bbc_userport_interface(mconfig, *this),
m_kbd(*this, "KBD.%u", 0)
diff --git a/src/devices/bus/bbc/userport/cfa3000kbd.h b/src/devices/bus/bbc/userport/cfa3000kbd.h
index ff9951399c8..7b4d66372ea 100644
--- a/src/devices/bus/bbc/userport/cfa3000kbd.h
+++ b/src/devices/bus/bbc/userport/cfa3000kbd.h
@@ -26,7 +26,7 @@ class cfa3000_kbd_device :
{
public:
// construction/destruction
- cfa3000_kbd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ cfa3000_kbd_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/bbc/userport/lcd.cpp b/src/devices/bus/bbc/userport/lcd.cpp
index f5f92270ca9..b693b28957e 100644
--- a/src/devices/bus/bbc/userport/lcd.cpp
+++ b/src/devices/bus/bbc/userport/lcd.cpp
@@ -51,7 +51,7 @@ void bbc_lcd_device::device_add_mconfig(machine_config &config)
// bbc_lcd_device - constructor
//-------------------------------------------------
-bbc_lcd_device::bbc_lcd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_lcd_device::bbc_lcd_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_LCD, tag, owner, clock)
, device_bbc_userport_interface(mconfig, *this)
, m_lcdc(*this, "lcdc")
diff --git a/src/devices/bus/bbc/userport/lcd.h b/src/devices/bus/bbc/userport/lcd.h
index c4aecfbd00e..99d0fad96e6 100644
--- a/src/devices/bus/bbc/userport/lcd.h
+++ b/src/devices/bus/bbc/userport/lcd.h
@@ -28,7 +28,7 @@ class bbc_lcd_device :
{
public:
// construction/destruction
- bbc_lcd_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_lcd_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/bbc/userport/m4000.cpp b/src/devices/bus/bbc/userport/m4000.cpp
index 910f2f8b3f1..e374b727c46 100644
--- a/src/devices/bus/bbc/userport/m4000.cpp
+++ b/src/devices/bus/bbc/userport/m4000.cpp
@@ -113,7 +113,7 @@ ioport_constructor bbc_m4000_device::device_input_ports() const
// bbc_m4000_device - constructor
//-------------------------------------------------
-bbc_m4000_device::bbc_m4000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_m4000_device::bbc_m4000_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_M4000, tag, owner, clock)
, device_bbc_userport_interface(mconfig, *this)
, m_kbd(*this, "KBLOCK_%u", 1)
diff --git a/src/devices/bus/bbc/userport/m4000.h b/src/devices/bus/bbc/userport/m4000.h
index df9c5e556cf..a04adb626a0 100644
--- a/src/devices/bus/bbc/userport/m4000.h
+++ b/src/devices/bus/bbc/userport/m4000.h
@@ -29,7 +29,7 @@ class bbc_m4000_device :
{
public:
// construction/destruction
- bbc_m4000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_m4000_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/bbc/userport/palext.cpp b/src/devices/bus/bbc/userport/palext.cpp
index dab527e478b..d44d5a8cfaa 100644
--- a/src/devices/bus/bbc/userport/palext.cpp
+++ b/src/devices/bus/bbc/userport/palext.cpp
@@ -51,7 +51,7 @@ const tiny_rom_entry* bbc_chameleon_device::device_rom_region() const
// bbc_palext_device - constructor
//-------------------------------------------------
-bbc_palext_device::bbc_palext_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+bbc_palext_device::bbc_palext_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_bbc_userport_interface(mconfig, *this)
, m_palette(*this, ":palette")
@@ -59,12 +59,12 @@ bbc_palext_device::bbc_palext_device(const machine_config &mconfig, device_type
{
}
-bbc_chameleon_device::bbc_chameleon_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_chameleon_device::bbc_chameleon_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_palext_device(mconfig, BBC_CHAMELEON, tag, owner, clock)
{
}
-bbc_cpalette_device::bbc_cpalette_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_cpalette_device::bbc_cpalette_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_palext_device(mconfig, BBC_CPALETTE, tag, owner, clock)
{
}
diff --git a/src/devices/bus/bbc/userport/palext.h b/src/devices/bus/bbc/userport/palext.h
index bca159103cb..6caa44793ca 100644
--- a/src/devices/bus/bbc/userport/palext.h
+++ b/src/devices/bus/bbc/userport/palext.h
@@ -27,7 +27,7 @@ class bbc_palext_device :
{
protected:
// construction/destruction
- bbc_palext_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ bbc_palext_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
// device-level overrides
virtual void device_start() override;
@@ -45,7 +45,7 @@ class bbc_chameleon_device : public bbc_palext_device
{
public:
// construction/destruction
- bbc_chameleon_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_chameleon_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// optional information overrides
@@ -63,7 +63,7 @@ public:
static constexpr feature_type imperfect_features() { return feature::PALETTE; }
// construction/destruction
- bbc_cpalette_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_cpalette_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
virtual void pb_w(uint8_t data) override;
diff --git a/src/devices/bus/bbc/userport/pointer.cpp b/src/devices/bus/bbc/userport/pointer.cpp
index cff7c1570e2..1ae9fbde8ad 100644
--- a/src/devices/bus/bbc/userport/pointer.cpp
+++ b/src/devices/bus/bbc/userport/pointer.cpp
@@ -120,7 +120,7 @@ ioport_constructor bbc_tracker_device::device_input_ports() const
// bbc_pointer_device - constructor
//-------------------------------------------------
-bbc_pointer_device::bbc_pointer_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+bbc_pointer_device::bbc_pointer_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_bbc_userport_interface(mconfig, *this)
, m_pointer_x(*this, "POINTER_X")
@@ -129,17 +129,17 @@ bbc_pointer_device::bbc_pointer_device(const machine_config &mconfig, device_typ
{
}
-bbc_amxmouse_device::bbc_amxmouse_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_amxmouse_device::bbc_amxmouse_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_pointer_device(mconfig, BBC_AMXMOUSE, tag, owner, clock)
{
}
-bbc_m512mouse_device::bbc_m512mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_m512mouse_device::bbc_m512mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_pointer_device(mconfig, BBC_M512MOUSE, tag, owner, clock)
{
}
-bbc_tracker_device::bbc_tracker_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_tracker_device::bbc_tracker_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_pointer_device(mconfig, BBC_TRACKER, tag, owner, clock)
{
}
diff --git a/src/devices/bus/bbc/userport/pointer.h b/src/devices/bus/bbc/userport/pointer.h
index 865a9c91270..d903afbe331 100644
--- a/src/devices/bus/bbc/userport/pointer.h
+++ b/src/devices/bus/bbc/userport/pointer.h
@@ -24,7 +24,7 @@ class bbc_pointer_device :
{
protected:
// construction/destruction
- bbc_pointer_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ bbc_pointer_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
// device-level overrides
virtual void device_start() override;
@@ -53,7 +53,7 @@ class bbc_amxmouse_device : public bbc_pointer_device
{
public:
// construction/destruction
- bbc_amxmouse_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_amxmouse_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
uint8_t pb_r() override;
@@ -68,7 +68,7 @@ class bbc_m512mouse_device : public bbc_pointer_device
{
public:
// construction/destruction
- bbc_m512mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_m512mouse_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
uint8_t pb_r() override;
@@ -83,7 +83,7 @@ class bbc_tracker_device : public bbc_pointer_device
{
public:
// construction/destruction
- bbc_tracker_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_tracker_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
uint8_t pb_r() override;
diff --git a/src/devices/bus/bbc/userport/sdcard.cpp b/src/devices/bus/bbc/userport/sdcard.cpp
index ccd5337d840..c6509f56f65 100644
--- a/src/devices/bus/bbc/userport/sdcard.cpp
+++ b/src/devices/bus/bbc/userport/sdcard.cpp
@@ -57,13 +57,13 @@ DEFINE_DEVICE_TYPE(BBC_SDCARDT, bbc_sdcardt_device, "bbc_sdcardt", "BBC Micro Tu
void bbc_sdcard_device::device_add_mconfig(machine_config &config)
{
- SPI_SDCARD(config, m_sdcard, 0);
+ SPI_SDCARD(config, m_sdcard);
m_sdcard->spi_miso_callback().set([this](int state) { m_slot->cb2_w(state); });
}
void bbc_sdcardt_device::device_add_mconfig(machine_config &config)
{
- SPI_SDCARD(config, m_sdcard, 0);
+ SPI_SDCARD(config, m_sdcard);
m_sdcard->spi_miso_callback().set([this](int state) { if (!m_turbo) m_slot->cb2_w(state); });
}
@@ -76,19 +76,19 @@ void bbc_sdcardt_device::device_add_mconfig(machine_config &config)
// bbc_sdcard_device - constructor
//-------------------------------------------------
-bbc_sdcard_device::bbc_sdcard_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+bbc_sdcard_device::bbc_sdcard_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_bbc_userport_interface(mconfig, *this)
, m_sdcard(*this, "sdcard")
{
}
-bbc_sdcard_device::bbc_sdcard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_sdcard_device::bbc_sdcard_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_sdcard_device(mconfig, BBC_SDCARD, tag, owner, clock)
{
}
-bbc_sdcardt_device::bbc_sdcardt_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_sdcardt_device::bbc_sdcardt_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: bbc_sdcard_device(mconfig, BBC_SDCARDT, tag, owner, clock)
, m_turbo(false)
{
diff --git a/src/devices/bus/bbc/userport/sdcard.h b/src/devices/bus/bbc/userport/sdcard.h
index bfa86ad359b..07e5756974d 100644
--- a/src/devices/bus/bbc/userport/sdcard.h
+++ b/src/devices/bus/bbc/userport/sdcard.h
@@ -25,10 +25,10 @@ class bbc_sdcard_device : public device_t, public device_bbc_userport_interface
{
public:
// construction/destruction
- bbc_sdcard_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_sdcard_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- bbc_sdcard_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ bbc_sdcard_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
// device-level overrides
virtual void device_start() override;
@@ -49,7 +49,7 @@ class bbc_sdcardt_device : public bbc_sdcard_device
{
public:
// construction/destruction
- bbc_sdcardt_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_sdcardt_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/bbc/userport/userport.cpp b/src/devices/bus/bbc/userport/userport.cpp
index 6bf5476db9c..71cc4782fe9 100644
--- a/src/devices/bus/bbc/userport/userport.cpp
+++ b/src/devices/bus/bbc/userport/userport.cpp
@@ -51,7 +51,7 @@ device_bbc_userport_interface::~device_bbc_userport_interface()
// bbc_userport_slot_device - constructor
//-------------------------------------------------
-bbc_userport_slot_device::bbc_userport_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_userport_slot_device::bbc_userport_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_USERPORT_SLOT, tag, owner, clock)
, device_single_card_slot_interface<device_bbc_userport_interface>(mconfig, *this)
, m_device(nullptr)
diff --git a/src/devices/bus/bbc/userport/userport.h b/src/devices/bus/bbc/userport/userport.h
index 29374eb9058..6785a9c4832 100644
--- a/src/devices/bus/bbc/userport/userport.h
+++ b/src/devices/bus/bbc/userport/userport.h
@@ -55,7 +55,7 @@ public:
set_fixed(false);
}
- bbc_userport_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock = 0);
+ bbc_userport_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock = XTAL());
// callbacks
auto cb1_handler() { return m_cb1_handler.bind(); }
diff --git a/src/devices/bus/bbc/userport/usersplit.cpp b/src/devices/bus/bbc/userport/usersplit.cpp
index 520abaebdb9..5f9f3ca5608 100644
--- a/src/devices/bus/bbc/userport/usersplit.cpp
+++ b/src/devices/bus/bbc/userport/usersplit.cpp
@@ -64,7 +64,7 @@ void bbc_usersplit_device::device_add_mconfig(machine_config &config)
// bbc_usersplit_device - constructor
//-------------------------------------------------
-bbc_usersplit_device::bbc_usersplit_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_usersplit_device::bbc_usersplit_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_USERSPLIT, tag, owner, clock)
, device_bbc_userport_interface(mconfig, *this)
, m_userport(*this, "userport%u", 1)
diff --git a/src/devices/bus/bbc/userport/usersplit.h b/src/devices/bus/bbc/userport/usersplit.h
index 27ce11a9fde..0c359a59fc9 100644
--- a/src/devices/bus/bbc/userport/usersplit.h
+++ b/src/devices/bus/bbc/userport/usersplit.h
@@ -26,7 +26,7 @@ class bbc_usersplit_device :
{
public:
// construction/destruction
- bbc_usersplit_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_usersplit_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
DECLARE_INPUT_CHANGED_MEMBER(userport_changed) { m_selected = newval; }
diff --git a/src/devices/bus/bbc/userport/voicebox.cpp b/src/devices/bus/bbc/userport/voicebox.cpp
index c42d71a2456..8c726b659a5 100644
--- a/src/devices/bus/bbc/userport/voicebox.cpp
+++ b/src/devices/bus/bbc/userport/voicebox.cpp
@@ -40,7 +40,7 @@ const tiny_rom_entry *bbc_voicebox_device::device_rom_region() const
void bbc_voicebox_device::device_add_mconfig(machine_config &config)
{
SPEAKER(config, "mono").front_center();
- SP0256(config, m_nsp, 3120000); // TODO: unknown crystal
+ SP0256(config, m_nsp, XTAL::u(3120000)); // TODO: unknown crystal
m_nsp->data_request_callback().set(DEVICE_SELF_OWNER, FUNC(bbc_userport_slot_device::cb1_w)).invert();
m_nsp->add_route(ALL_OUTPUTS, "mono", 1.0);
}
@@ -54,7 +54,7 @@ void bbc_voicebox_device::device_add_mconfig(machine_config &config)
// bbc_voicebox_device - constructor
//-------------------------------------------------
-bbc_voicebox_device::bbc_voicebox_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+bbc_voicebox_device::bbc_voicebox_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, BBC_VOICEBOX, tag, owner, clock)
, device_bbc_userport_interface(mconfig, *this)
, m_nsp(*this, "sp0256")
diff --git a/src/devices/bus/bbc/userport/voicebox.h b/src/devices/bus/bbc/userport/voicebox.h
index 0f479e27c1d..33bc693d6a1 100644
--- a/src/devices/bus/bbc/userport/voicebox.h
+++ b/src/devices/bus/bbc/userport/voicebox.h
@@ -25,7 +25,7 @@ class bbc_voicebox_device :
{
public:
// construction/destruction
- bbc_voicebox_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ bbc_voicebox_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides