summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/bbc/internal
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/bbc/internal')
-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
36 files changed, 71 insertions, 71 deletions
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