summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/cpu/z80
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/cpu/z80
parent5c14bcdfcb4aefb71b5b62387c4ad05dbeb3814e (diff)
full xtal conversionxtal
Diffstat (limited to 'src/devices/cpu/z80')
-rw-r--r--src/devices/cpu/z80/ez80.cpp4
-rw-r--r--src/devices/cpu/z80/ez80.h4
-rw-r--r--src/devices/cpu/z80/kc82.cpp2
-rw-r--r--src/devices/cpu/z80/kc82.h2
-rw-r--r--src/devices/cpu/z80/kl5c80a12.cpp2
-rw-r--r--src/devices/cpu/z80/kl5c80a12.h2
-rw-r--r--src/devices/cpu/z80/kl5c80a16.cpp2
-rw-r--r--src/devices/cpu/z80/kl5c80a16.h2
-rw-r--r--src/devices/cpu/z80/kp63.cpp6
-rw-r--r--src/devices/cpu/z80/kp63.h6
-rw-r--r--src/devices/cpu/z80/kp64.cpp2
-rw-r--r--src/devices/cpu/z80/kp64.h2
-rw-r--r--src/devices/cpu/z80/kp69.cpp4
-rw-r--r--src/devices/cpu/z80/kp69.h4
-rw-r--r--src/devices/cpu/z80/ky80.cpp2
-rw-r--r--src/devices/cpu/z80/ky80.h2
-rw-r--r--src/devices/cpu/z80/lz8420m.cpp2
-rw-r--r--src/devices/cpu/z80/lz8420m.h2
-rw-r--r--src/devices/cpu/z80/mc8123.cpp2
-rw-r--r--src/devices/cpu/z80/mc8123.h2
-rw-r--r--src/devices/cpu/z80/r800.cpp2
-rw-r--r--src/devices/cpu/z80/r800.h2
-rw-r--r--src/devices/cpu/z80/tmpz84c011.cpp2
-rw-r--r--src/devices/cpu/z80/tmpz84c011.h2
-rw-r--r--src/devices/cpu/z80/tmpz84c015.cpp2
-rw-r--r--src/devices/cpu/z80/tmpz84c015.h2
-rw-r--r--src/devices/cpu/z80/z80.cpp6
-rw-r--r--src/devices/cpu/z80/z80.h6
28 files changed, 40 insertions, 40 deletions
diff --git a/src/devices/cpu/z80/ez80.cpp b/src/devices/cpu/z80/ez80.cpp
index 525dc1c3b11..042a8535e4f 100644
--- a/src/devices/cpu/z80/ez80.cpp
+++ b/src/devices/cpu/z80/ez80.cpp
@@ -28,12 +28,12 @@ DEFINE_DEVICE_TYPE(EZ80, ez80_device, "ez80", "Zilog eZ80")
// ez80_device - constructor
//-------------------------------------------------
-ez80_device::ez80_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock)
+ez80_device::ez80_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock)
: z80_device(mconfig, type, tag, owner, clock)
{
}
-ez80_device::ez80_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+ez80_device::ez80_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: ez80_device(mconfig, EZ80, tag, owner, clock)
{
}
diff --git a/src/devices/cpu/z80/ez80.h b/src/devices/cpu/z80/ez80.h
index 2ae563d5b80..3cc5cbec604 100644
--- a/src/devices/cpu/z80/ez80.h
+++ b/src/devices/cpu/z80/ez80.h
@@ -22,11 +22,11 @@ class ez80_device : public z80_device
{
public:
// device type constructor
- ez80_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ ez80_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// construction/destruction
- ez80_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock);
+ ez80_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
};
// device type declaration
diff --git a/src/devices/cpu/z80/kc82.cpp b/src/devices/cpu/z80/kc82.cpp
index bf0a26290c4..0dcac14e9e2 100644
--- a/src/devices/cpu/z80/kc82.cpp
+++ b/src/devices/cpu/z80/kc82.cpp
@@ -17,7 +17,7 @@
// kc82_device - constructor
//-------------------------------------------------
-kc82_device::kc82_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, address_map_constructor mem_map, address_map_constructor io_map)
+kc82_device::kc82_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, address_map_constructor mem_map, address_map_constructor io_map)
: z80_device(mconfig, type, tag, owner, clock)
, m_program_config("program", ENDIANNESS_LITTLE, 8, 20, 0, 16, 10, mem_map)
, m_opcodes_config("opcodes", ENDIANNESS_LITTLE, 8, 20, 0, 16, 10, mem_map)
diff --git a/src/devices/cpu/z80/kc82.h b/src/devices/cpu/z80/kc82.h
index c78269c77fe..b9ef94c5ab2 100644
--- a/src/devices/cpu/z80/kc82.h
+++ b/src/devices/cpu/z80/kc82.h
@@ -29,7 +29,7 @@ public:
protected:
// construction/destruction
- kc82_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, address_map_constructor mem_map, address_map_constructor io_map);
+ kc82_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, address_map_constructor mem_map, address_map_constructor io_map);
// device-level overrides
virtual void device_start() override;
diff --git a/src/devices/cpu/z80/kl5c80a12.cpp b/src/devices/cpu/z80/kl5c80a12.cpp
index 495a0ab4afd..4a8c4e30bd5 100644
--- a/src/devices/cpu/z80/kl5c80a12.cpp
+++ b/src/devices/cpu/z80/kl5c80a12.cpp
@@ -35,7 +35,7 @@ static const z80_daisy_config pseudo_daisy_config[] = { { "kp69" }, { nullptr }
// kl5c80a12_device - constructor
//-------------------------------------------------
-kl5c80a12_device::kl5c80a12_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+kl5c80a12_device::kl5c80a12_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: kc82_device(mconfig, KL5C80A12, tag, owner, clock,
address_map_constructor(FUNC(kl5c80a12_device::internal_ram), this),
address_map_constructor(FUNC(kl5c80a12_device::internal_io), this))
diff --git a/src/devices/cpu/z80/kl5c80a12.h b/src/devices/cpu/z80/kl5c80a12.h
index 28434f8c8f6..c50fdca6297 100644
--- a/src/devices/cpu/z80/kl5c80a12.h
+++ b/src/devices/cpu/z80/kl5c80a12.h
@@ -28,7 +28,7 @@ public:
};
// device type constructor
- kl5c80a12_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ kl5c80a12_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
// callback configuration
auto in_p0_callback() { return m_porta_in_callback[0].bind(); }
diff --git a/src/devices/cpu/z80/kl5c80a16.cpp b/src/devices/cpu/z80/kl5c80a16.cpp
index d92cc9142de..92cf6b56c77 100644
--- a/src/devices/cpu/z80/kl5c80a16.cpp
+++ b/src/devices/cpu/z80/kl5c80a16.cpp
@@ -30,7 +30,7 @@ static const z80_daisy_config pseudo_daisy_config[] = { { "kp69" }, { nullptr }
// kl5c80a16_device - constructor
//-------------------------------------------------
-kl5c80a16_device::kl5c80a16_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+kl5c80a16_device::kl5c80a16_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: kc82_device(mconfig, KL5C80A16, tag, owner, clock,
address_map_constructor(),
address_map_constructor(FUNC(kl5c80a16_device::internal_io), this))
diff --git a/src/devices/cpu/z80/kl5c80a16.h b/src/devices/cpu/z80/kl5c80a16.h
index d3ac8eda636..34d71bb90d9 100644
--- a/src/devices/cpu/z80/kl5c80a16.h
+++ b/src/devices/cpu/z80/kl5c80a16.h
@@ -28,7 +28,7 @@ public:
};
// device type constructor
- kl5c80a16_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ kl5c80a16_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
// callback configuration
auto in_p0_callback() { return m_port_in_callback[0].bind(); }
diff --git a/src/devices/cpu/z80/kp63.cpp b/src/devices/cpu/z80/kp63.cpp
index db42ef30ecb..356fcbc17ed 100644
--- a/src/devices/cpu/z80/kp63.cpp
+++ b/src/devices/cpu/z80/kp63.cpp
@@ -58,7 +58,7 @@ const char *const kp63_device::s_count_modes[4] =
// kp63_device - constructor
//-------------------------------------------------
-kp63_device::kp63_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, u8 num_counters, u8 mode_mask)
+kp63_device::kp63_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, u8 num_counters, u8 mode_mask)
: device_t(mconfig, type, tag, owner, clock)
, m_out_pulse_callback(*this)
, m_out_strobe_callback(*this)
@@ -82,7 +82,7 @@ kp63_device::kp63_device(const machine_config &mconfig, device_type type, const
// kp63_3channel_device - constructor
//-------------------------------------------------
-kp63_3channel_device::kp63_3channel_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+kp63_3channel_device::kp63_3channel_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: kp63_device(mconfig, KP63_3CHANNEL, tag, owner, clock, 3, 0x1f)
{
}
@@ -92,7 +92,7 @@ kp63_3channel_device::kp63_3channel_device(const machine_config &mconfig, const
// kp63a_device - constructor
//-------------------------------------------------
-kp63a_device::kp63a_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+kp63a_device::kp63a_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: kp63_device(mconfig, KP63A, tag, owner, clock, 4, 0x3f)
{
}
diff --git a/src/devices/cpu/z80/kp63.h b/src/devices/cpu/z80/kp63.h
index 73e269fb72b..ec00fbea789 100644
--- a/src/devices/cpu/z80/kp63.h
+++ b/src/devices/cpu/z80/kp63.h
@@ -32,7 +32,7 @@ public:
protected:
// construction/destruction
- kp63_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, u8 num_counters, u8 mode_mask);
+ kp63_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, u8 num_counters, u8 mode_mask);
// device-level overrides
virtual void device_resolve_objects() override;
@@ -81,14 +81,14 @@ class kp63_3channel_device : public kp63_device
{
public:
// device type constructor
- kp63_3channel_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ kp63_3channel_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
};
class kp63a_device : public kp63_device
{
public:
// device type constructor
- kp63a_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ kp63a_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
};
// device type declarations
diff --git a/src/devices/cpu/z80/kp64.cpp b/src/devices/cpu/z80/kp64.cpp
index 697ed65268a..52e418f35dc 100644
--- a/src/devices/cpu/z80/kp64.cpp
+++ b/src/devices/cpu/z80/kp64.cpp
@@ -68,7 +68,7 @@ DEFINE_DEVICE_TYPE(KP64, kp64_device, "kp64", "Kawasaki Steel KP64 Timer/Counter
// kp64_device - constructor
//-------------------------------------------------
-kp64_device::kp64_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+kp64_device::kp64_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, KP64, tag, owner, clock)
, m_out_callback(*this)
, m_count_timer(nullptr)
diff --git a/src/devices/cpu/z80/kp64.h b/src/devices/cpu/z80/kp64.h
index 954076430d0..b5d62212dfa 100644
--- a/src/devices/cpu/z80/kp64.h
+++ b/src/devices/cpu/z80/kp64.h
@@ -20,7 +20,7 @@ class kp64_device : public device_t
{
public:
// device type constructor
- kp64_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ kp64_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
// callback configuration
auto out_callback() { return m_out_callback.bind(); }
diff --git a/src/devices/cpu/z80/kp69.cpp b/src/devices/cpu/z80/kp69.cpp
index 0e194138b2c..a03931c3292 100644
--- a/src/devices/cpu/z80/kp69.cpp
+++ b/src/devices/cpu/z80/kp69.cpp
@@ -35,7 +35,7 @@ DEFINE_DEVICE_TYPE(KP69, kp69_device, "kp69", "Kawasaki Steel KP69 Interrupt Con
// kp69_base_device - constructor
//-------------------------------------------------
-kp69_base_device::kp69_base_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock)
+kp69_base_device::kp69_base_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_z80daisy_interface(mconfig, *this)
, m_int_callback(*this)
@@ -56,7 +56,7 @@ kp69_base_device::kp69_base_device(const machine_config &mconfig, device_type ty
// kp69_device - constructor
//-------------------------------------------------
-kp69_device::kp69_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+kp69_device::kp69_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: kp69_base_device(mconfig, KP69, tag, owner, clock)
, m_ivr_written(false)
{
diff --git a/src/devices/cpu/z80/kp69.h b/src/devices/cpu/z80/kp69.h
index f7747f795d6..dec9255f8fc 100644
--- a/src/devices/cpu/z80/kp69.h
+++ b/src/devices/cpu/z80/kp69.h
@@ -41,7 +41,7 @@ public:
protected:
// construction/destruction
- kp69_base_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock);
+ kp69_base_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
// device-level overrides
virtual void device_resolve_objects() override;
@@ -82,7 +82,7 @@ class kp69_device : public kp69_base_device
{
public:
// device type constructor
- kp69_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0);
+ kp69_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL());
// write handlers
void lerl_pgrl_w(u8 data);
diff --git a/src/devices/cpu/z80/ky80.cpp b/src/devices/cpu/z80/ky80.cpp
index b55237efa95..067c412022d 100644
--- a/src/devices/cpu/z80/ky80.cpp
+++ b/src/devices/cpu/z80/ky80.cpp
@@ -28,7 +28,7 @@ DEFINE_DEVICE_TYPE(KY80, ky80_device, "ky80", "Taxan KY-80")
// ky80_device - constructor
//-------------------------------------------------
-ky80_device::ky80_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+ky80_device::ky80_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: kc82_device(mconfig, KY80, tag, owner, clock,
address_map_constructor(FUNC(ky80_device::internal_ram), this),
address_map_constructor(FUNC(ky80_device::internal_io), this))
diff --git a/src/devices/cpu/z80/ky80.h b/src/devices/cpu/z80/ky80.h
index fce065a9c8f..0e977689db9 100644
--- a/src/devices/cpu/z80/ky80.h
+++ b/src/devices/cpu/z80/ky80.h
@@ -22,7 +22,7 @@ class ky80_device : public kc82_device
{
public:
// device type constructor
- ky80_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ ky80_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device_execute_interface overrides
diff --git a/src/devices/cpu/z80/lz8420m.cpp b/src/devices/cpu/z80/lz8420m.cpp
index 26e41a6b248..8b6093d4d97 100644
--- a/src/devices/cpu/z80/lz8420m.cpp
+++ b/src/devices/cpu/z80/lz8420m.cpp
@@ -15,7 +15,7 @@
DEFINE_DEVICE_TYPE(LZ8420M, lz8420m_device, "lz8420m", "Sharp LZ8420M")
-lz8420m_device::lz8420m_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+lz8420m_device::lz8420m_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: z80_device(mconfig, LZ8420M, tag, owner, clock)
{
}
diff --git a/src/devices/cpu/z80/lz8420m.h b/src/devices/cpu/z80/lz8420m.h
index afa653c340d..ce1e06389aa 100644
--- a/src/devices/cpu/z80/lz8420m.h
+++ b/src/devices/cpu/z80/lz8420m.h
@@ -29,7 +29,7 @@
class lz8420m_device : public z80_device
{
public:
- lz8420m_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t);
+ lz8420m_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/cpu/z80/mc8123.cpp b/src/devices/cpu/z80/mc8123.cpp
index 33acc77b096..7581ea4afe8 100644
--- a/src/devices/cpu/z80/mc8123.cpp
+++ b/src/devices/cpu/z80/mc8123.cpp
@@ -90,7 +90,7 @@ DEFINE_DEVICE_TYPE(MC8123, mc8123_device, "mc8123", "MC-8123")
// mc8123_device - constructor
//-------------------------------------------------
-mc8123_device::mc8123_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+mc8123_device::mc8123_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: z80_device(mconfig, MC8123, tag, owner, clock)
, m_key(*this, "key")
{
diff --git a/src/devices/cpu/z80/mc8123.h b/src/devices/cpu/z80/mc8123.h
index 8fad72dbee7..90cbeec6ca1 100644
--- a/src/devices/cpu/z80/mc8123.h
+++ b/src/devices/cpu/z80/mc8123.h
@@ -17,7 +17,7 @@ class mc8123_device : public z80_device
{
public:
// construction/destruction
- mc8123_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ mc8123_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
// this function assumes a fixed portion of ROM at 0000-7FFF, and
// an arbitrary amount of banks at 8000-BFFF.
diff --git a/src/devices/cpu/z80/r800.cpp b/src/devices/cpu/z80/r800.cpp
index 1748f8eca39..bef404155bf 100644
--- a/src/devices/cpu/z80/r800.cpp
+++ b/src/devices/cpu/z80/r800.cpp
@@ -29,7 +29,7 @@ DEFINE_DEVICE_TYPE(R800, r800_device, "r800", "ASCII R800")
// r800_device - constructor
//-------------------------------------------------
-r800_device::r800_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+r800_device::r800_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: z80_device(mconfig, R800, tag, owner, clock)
{
}
diff --git a/src/devices/cpu/z80/r800.h b/src/devices/cpu/z80/r800.h
index bad16f8cfdd..2ed0aa1672e 100644
--- a/src/devices/cpu/z80/r800.h
+++ b/src/devices/cpu/z80/r800.h
@@ -22,7 +22,7 @@ class r800_device : public z80_device
{
public:
// device type constructor
- r800_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ r800_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device_execute_interface overrides
diff --git a/src/devices/cpu/z80/tmpz84c011.cpp b/src/devices/cpu/z80/tmpz84c011.cpp
index c28aa2b243a..df79ffe59cc 100644
--- a/src/devices/cpu/z80/tmpz84c011.cpp
+++ b/src/devices/cpu/z80/tmpz84c011.cpp
@@ -32,7 +32,7 @@ void tmpz84c011_device::tmpz84c011_internal_io_map(address_map &map)
}
-tmpz84c011_device::tmpz84c011_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+tmpz84c011_device::tmpz84c011_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: z80_device(mconfig, TMPZ84C011, tag, owner, clock),
m_io_space_config( "io", ENDIANNESS_LITTLE, 8, 16, 0, address_map_constructor(FUNC(tmpz84c011_device::tmpz84c011_internal_io_map), this)),
m_ctc(*this, "tmpz84c011_ctc"),
diff --git a/src/devices/cpu/z80/tmpz84c011.h b/src/devices/cpu/z80/tmpz84c011.h
index 89b40a9f6aa..ab63642518e 100644
--- a/src/devices/cpu/z80/tmpz84c011.h
+++ b/src/devices/cpu/z80/tmpz84c011.h
@@ -30,7 +30,7 @@
class tmpz84c011_device : public z80_device
{
public:
- tmpz84c011_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t);
+ tmpz84c011_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
// configuration helpers
auto zc0_callback() { return m_zc0_cb.bind(); }
diff --git a/src/devices/cpu/z80/tmpz84c015.cpp b/src/devices/cpu/z80/tmpz84c015.cpp
index 3df10f19c6c..ebba77d423c 100644
--- a/src/devices/cpu/z80/tmpz84c015.cpp
+++ b/src/devices/cpu/z80/tmpz84c015.cpp
@@ -28,7 +28,7 @@ void tmpz84c015_device::internal_io_map(address_map &map)
}
-tmpz84c015_device::tmpz84c015_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+tmpz84c015_device::tmpz84c015_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
z80_device(mconfig, TMPZ84C015, tag, owner, clock),
m_io_space_config( "io", ENDIANNESS_LITTLE, 8, 16, 0, address_map_constructor(FUNC(tmpz84c015_device::internal_io_map), this)),
m_ctc(*this, "tmpz84c015_ctc"),
diff --git a/src/devices/cpu/z80/tmpz84c015.h b/src/devices/cpu/z80/tmpz84c015.h
index 99b6f095714..0d982496879 100644
--- a/src/devices/cpu/z80/tmpz84c015.h
+++ b/src/devices/cpu/z80/tmpz84c015.h
@@ -25,7 +25,7 @@
class tmpz84c015_device : public z80_device
{
public:
- tmpz84c015_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t);
+ tmpz84c015_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
// configuration helpers
diff --git a/src/devices/cpu/z80/z80.cpp b/src/devices/cpu/z80/z80.cpp
index 86d9d29469b..b4b9ed4fdb5 100644
--- a/src/devices/cpu/z80/z80.cpp
+++ b/src/devices/cpu/z80/z80.cpp
@@ -3814,12 +3814,12 @@ void z80_device::z80_set_cycle_tables(const uint8_t *op, const uint8_t *cb, cons
}
-z80_device::z80_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+z80_device::z80_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
z80_device(mconfig, Z80, tag, owner, clock)
{
}
-z80_device::z80_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+z80_device::z80_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) :
cpu_device(mconfig, type, tag, owner, clock),
z80_daisy_chain_interface(mconfig, *this),
m_program_config("program", ENDIANNESS_LITTLE, 8, 16, 0),
@@ -3849,7 +3849,7 @@ device_memory_interface::space_config_vector z80_device::memory_space_config() c
DEFINE_DEVICE_TYPE(Z80, z80_device, "z80", "Zilog Z80")
-nsc800_device::nsc800_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+nsc800_device::nsc800_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: z80_device(mconfig, NSC800, tag, owner, clock)
{
}
diff --git a/src/devices/cpu/z80/z80.h b/src/devices/cpu/z80/z80.h
index 8d3ac158325..52c0ebab583 100644
--- a/src/devices/cpu/z80/z80.h
+++ b/src/devices/cpu/z80/z80.h
@@ -30,7 +30,7 @@ enum
class z80_device : public cpu_device, public z80_daisy_chain_interface
{
public:
- z80_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ z80_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
void z80_set_cycle_tables(const uint8_t *op, const uint8_t *cb, const uint8_t *ed, const uint8_t *xy, const uint8_t *xycb, const uint8_t *ex);
template <typename... T> void set_memory_map(T &&... args) { set_addrmap(AS_PROGRAM, std::forward<T>(args)...); }
@@ -42,7 +42,7 @@ public:
auto halt_cb() { return m_halt_cb.bind(); }
protected:
- z80_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ 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;
@@ -298,7 +298,7 @@ DECLARE_DEVICE_TYPE(Z80, z80_device)
class nsc800_device : public z80_device
{
public:
- nsc800_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ nsc800_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides