summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/cpu/h8
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/cpu/h8')
-rw-r--r--src/devices/cpu/h8/gt913.cpp4
-rw-r--r--src/devices/cpu/h8/gt913.h2
-rw-r--r--src/devices/cpu/h8/h8.cpp2
-rw-r--r--src/devices/cpu/h8/h8.h2
-rw-r--r--src/devices/cpu/h8/h83002.cpp2
-rw-r--r--src/devices/cpu/h8/h83002.h2
-rw-r--r--src/devices/cpu/h8/h83003.cpp2
-rw-r--r--src/devices/cpu/h8/h83003.h2
-rw-r--r--src/devices/cpu/h8/h83006.cpp6
-rw-r--r--src/devices/cpu/h8/h83006.h6
-rw-r--r--src/devices/cpu/h8/h83008.cpp2
-rw-r--r--src/devices/cpu/h8/h83008.h2
-rw-r--r--src/devices/cpu/h8/h83032.cpp8
-rw-r--r--src/devices/cpu/h8/h83032.h8
-rw-r--r--src/devices/cpu/h8/h83042.cpp8
-rw-r--r--src/devices/cpu/h8/h83042.h8
-rw-r--r--src/devices/cpu/h8/h83048.cpp10
-rw-r--r--src/devices/cpu/h8/h83048.h10
-rw-r--r--src/devices/cpu/h8/h83337.cpp8
-rw-r--r--src/devices/cpu/h8/h83337.h8
-rw-r--r--src/devices/cpu/h8/h8_adc.cpp14
-rw-r--r--src/devices/cpu/h8/h8_adc.h26
-rw-r--r--src/devices/cpu/h8/h8_dma.cpp4
-rw-r--r--src/devices/cpu/h8/h8_dma.h6
-rw-r--r--src/devices/cpu/h8/h8_dtc.cpp2
-rw-r--r--src/devices/cpu/h8/h8_dtc.h4
-rw-r--r--src/devices/cpu/h8/h8_intc.cpp14
-rw-r--r--src/devices/cpu/h8/h8_intc.h14
-rw-r--r--src/devices/cpu/h8/h8_port.cpp2
-rw-r--r--src/devices/cpu/h8/h8_port.h4
-rw-r--r--src/devices/cpu/h8/h8_sci.cpp2
-rw-r--r--src/devices/cpu/h8/h8_sci.h4
-rw-r--r--src/devices/cpu/h8/h8_timer16.cpp10
-rw-r--r--src/devices/cpu/h8/h8_timer16.h18
-rw-r--r--src/devices/cpu/h8/h8_timer8.cpp6
-rw-r--r--src/devices/cpu/h8/h8_timer8.h10
-rw-r--r--src/devices/cpu/h8/h8_watchdog.cpp2
-rw-r--r--src/devices/cpu/h8/h8_watchdog.h4
-rw-r--r--src/devices/cpu/h8/h8h.cpp2
-rw-r--r--src/devices/cpu/h8/h8h.h2
-rw-r--r--src/devices/cpu/h8/h8s2000.cpp2
-rw-r--r--src/devices/cpu/h8/h8s2000.h2
-rw-r--r--src/devices/cpu/h8/h8s2245.cpp10
-rw-r--r--src/devices/cpu/h8/h8s2245.h10
-rw-r--r--src/devices/cpu/h8/h8s2320.cpp20
-rw-r--r--src/devices/cpu/h8/h8s2320.h20
-rw-r--r--src/devices/cpu/h8/h8s2357.cpp14
-rw-r--r--src/devices/cpu/h8/h8s2357.h14
-rw-r--r--src/devices/cpu/h8/h8s2600.cpp2
-rw-r--r--src/devices/cpu/h8/h8s2600.h2
-rw-r--r--src/devices/cpu/h8/h8s2655.cpp6
-rw-r--r--src/devices/cpu/h8/h8s2655.h6
52 files changed, 180 insertions, 180 deletions
diff --git a/src/devices/cpu/h8/gt913.cpp b/src/devices/cpu/h8/gt913.cpp
index c56c8ed94f3..ef9edb1bb8b 100644
--- a/src/devices/cpu/h8/gt913.cpp
+++ b/src/devices/cpu/h8/gt913.cpp
@@ -25,7 +25,7 @@
DEFINE_DEVICE_TYPE(GT913, gt913_device, "gt913", "Casio GT913F")
-gt913_device::gt913_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+gt913_device::gt913_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
h8_device(mconfig, GT913, tag, owner, clock, address_map_constructor(FUNC(gt913_device::map), this)),
device_mixer_interface(mconfig, *this, 2),
m_rom(*this, DEVICE_SELF),
@@ -104,7 +104,7 @@ void gt913_device::device_add_mconfig(machine_config &config)
m_sound->add_route(0, *this, 1.0, AUTO_ALLOC_INPUT, 0);
m_sound->add_route(1, *this, 1.0, AUTO_ALLOC_INPUT, 1);
- GT913_KBD_HLE(config, m_kbd, 0);
+ GT913_KBD_HLE(config, m_kbd);
m_kbd->irq_cb().set([this] (int val)
{
if (val)
diff --git a/src/devices/cpu/h8/gt913.h b/src/devices/cpu/h8/gt913.h
index 4ba89661abb..07ea286a5aa 100644
--- a/src/devices/cpu/h8/gt913.h
+++ b/src/devices/cpu/h8/gt913.h
@@ -23,7 +23,7 @@
class gt913_device : public h8_device, public device_mixer_interface {
public:
- gt913_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ gt913_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
virtual std::unique_ptr<util::disasm_interface> create_disassembler() override;
diff --git a/src/devices/cpu/h8/h8.cpp b/src/devices/cpu/h8/h8.cpp
index cd40624586c..dc5e394bcc1 100644
--- a/src/devices/cpu/h8/h8.cpp
+++ b/src/devices/cpu/h8/h8.cpp
@@ -15,7 +15,7 @@
#include "h8_dtc.h"
#include "h8d.h"
-h8_device::h8_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, address_map_constructor map_delegate) :
+h8_device::h8_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, address_map_constructor map_delegate) :
cpu_device(mconfig, type, tag, owner, clock),
program_config("program", ENDIANNESS_BIG, 16, 16, 0, map_delegate),
io_config("io", ENDIANNESS_BIG, 16, 16, -1), PPC(0), NPC(0), PC(0), PIR(0), EXR(0), CCR(0), MAC(0), MACF(0),
diff --git a/src/devices/cpu/h8/h8.h b/src/devices/cpu/h8/h8.h
index 78ee9425142..7f744ad3709 100644
--- a/src/devices/cpu/h8/h8.h
+++ b/src/devices/cpu/h8/h8.h
@@ -87,7 +87,7 @@ protected:
EXR_I = 0x07
};
- h8_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, address_map_constructor map_delegate);
+ h8_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, address_map_constructor map_delegate);
// device-level overrides
virtual void device_config_complete() override;
diff --git a/src/devices/cpu/h8/h83002.cpp b/src/devices/cpu/h8/h83002.cpp
index 664134669c9..beeb917f05b 100644
--- a/src/devices/cpu/h8/h83002.cpp
+++ b/src/devices/cpu/h8/h83002.cpp
@@ -5,7 +5,7 @@
DEFINE_DEVICE_TYPE(H83002, h83002_device, "h83002", "Hitachi H8/3002")
-h83002_device::h83002_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+h83002_device::h83002_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
h8h_device(mconfig, H83002, tag, owner, clock, address_map_constructor(FUNC(h83002_device::map), this)),
intc(*this, "intc"),
adc(*this, "adc"),
diff --git a/src/devices/cpu/h8/h83002.h b/src/devices/cpu/h8/h83002.h
index 94c1d603230..dce30bd0b3d 100644
--- a/src/devices/cpu/h8/h83002.h
+++ b/src/devices/cpu/h8/h83002.h
@@ -27,7 +27,7 @@
class h83002_device : public h8h_device {
public:
- h83002_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ h83002_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
auto tend0() { return tend0_cb.bind(); }
auto tend1() { return tend1_cb.bind(); }
diff --git a/src/devices/cpu/h8/h83003.cpp b/src/devices/cpu/h8/h83003.cpp
index 39829d5de12..31e60831bce 100644
--- a/src/devices/cpu/h8/h83003.cpp
+++ b/src/devices/cpu/h8/h83003.cpp
@@ -5,7 +5,7 @@
DEFINE_DEVICE_TYPE(H83003, h83003_device, "h83003", "Hitachi H8/3003")
-h83003_device::h83003_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+h83003_device::h83003_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
h8h_device(mconfig, H83003, tag, owner, clock, address_map_constructor(FUNC(h83003_device::map), this)),
intc(*this, "intc"),
adc(*this, "adc"),
diff --git a/src/devices/cpu/h8/h83003.h b/src/devices/cpu/h8/h83003.h
index 6c4f7cfaced..b2fc17a7eb6 100644
--- a/src/devices/cpu/h8/h83003.h
+++ b/src/devices/cpu/h8/h83003.h
@@ -27,7 +27,7 @@
class h83003_device : public h8h_device {
public:
- h83003_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ h83003_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
auto tend0() { return tend0_cb.bind(); }
auto tend1() { return tend1_cb.bind(); }
diff --git a/src/devices/cpu/h8/h83006.cpp b/src/devices/cpu/h8/h83006.cpp
index d19937e93dc..cb562bfbb87 100644
--- a/src/devices/cpu/h8/h83006.cpp
+++ b/src/devices/cpu/h8/h83006.cpp
@@ -7,7 +7,7 @@ DEFINE_DEVICE_TYPE(H83006, h83006_device, "h83006", "Hitachi H8/3006")
DEFINE_DEVICE_TYPE(H83007, h83007_device, "h83007", "Hitachi H8/3007")
-h83006_device::h83006_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, uint32_t start) :
+h83006_device::h83006_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, uint32_t start) :
h8h_device(mconfig, type, tag, owner, clock, address_map_constructor(FUNC(h83006_device::map), this)),
intc(*this, "intc"),
adc(*this, "adc"),
@@ -35,13 +35,13 @@ h83006_device::h83006_device(const machine_config &mconfig, device_type type, co
{
}
-h83006_device::h83006_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+h83006_device::h83006_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
h83006_device(mconfig, H83006, tag, owner, clock, 0xff720)
{
}
-h83007_device::h83007_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+h83007_device::h83007_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
h83006_device(mconfig, H83007, tag, owner, clock, 0xfef20)
{
}
diff --git a/src/devices/cpu/h8/h83006.h b/src/devices/cpu/h8/h83006.h
index 083b91ea664..65fdc9fe211 100644
--- a/src/devices/cpu/h8/h83006.h
+++ b/src/devices/cpu/h8/h83006.h
@@ -27,7 +27,7 @@
class h83006_device : public h8h_device {
public:
- h83006_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ h83006_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
void set_mode_a20() { mode_a20 = true; }
void set_mode_a24() { mode_a20 = false; }
@@ -36,7 +36,7 @@ public:
void syscr_w(uint8_t data);
protected:
- h83006_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, uint32_t start);
+ h83006_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, uint32_t start);
required_device<h8h_intc_device> intc;
required_device<h8_adc_device> adc;
@@ -79,7 +79,7 @@ protected:
class h83007_device : public h83006_device {
public:
- h83007_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ h83007_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
};
DECLARE_DEVICE_TYPE(H83006, h83006_device)
diff --git a/src/devices/cpu/h8/h83008.cpp b/src/devices/cpu/h8/h83008.cpp
index 3db7c5a71aa..2f515c22192 100644
--- a/src/devices/cpu/h8/h83008.cpp
+++ b/src/devices/cpu/h8/h83008.cpp
@@ -5,7 +5,7 @@
DEFINE_DEVICE_TYPE(H83008, h83008_device, "h83008", "Hitachi H8/3008")
-h83008_device::h83008_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+h83008_device::h83008_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
h8h_device(mconfig, H83008, tag, owner, clock, address_map_constructor(FUNC(h83008_device::map), this)),
intc(*this, "intc"),
adc(*this, "adc"),
diff --git a/src/devices/cpu/h8/h83008.h b/src/devices/cpu/h8/h83008.h
index bb65adfcc9d..62858dfd537 100644
--- a/src/devices/cpu/h8/h83008.h
+++ b/src/devices/cpu/h8/h83008.h
@@ -27,7 +27,7 @@
class h83008_device : public h8h_device {
public:
- h83008_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ h83008_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
void set_mode_a20() { mode_a20 = true; }
void set_mode_a24() { mode_a20 = false; }
diff --git a/src/devices/cpu/h8/h83032.cpp b/src/devices/cpu/h8/h83032.cpp
index f1abc18b912..613606440b7 100644
--- a/src/devices/cpu/h8/h83032.cpp
+++ b/src/devices/cpu/h8/h83032.cpp
@@ -7,7 +7,7 @@ DEFINE_DEVICE_TYPE(H83032, h83032_device, "h83032", "Hitachi H8/3032")
DEFINE_DEVICE_TYPE(H83031, h83031_device, "h83031", "Hitachi H8/3031")
DEFINE_DEVICE_TYPE(H83030, h83030_device, "h83030", "Hitachi H8/3030")
-h83032_device::h83032_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, uint32_t start) :
+h83032_device::h83032_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, uint32_t start) :
h8h_device(mconfig, type, tag, owner, clock, address_map_constructor(FUNC(h83032_device::map), this)),
intc(*this, "intc"),
adc(*this, "adc"),
@@ -36,17 +36,17 @@ h83032_device::h83032_device(const machine_config &mconfig, device_type type, co
mode_a20 = true;
}
-h83032_device::h83032_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+h83032_device::h83032_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
h83032_device(mconfig, H83032, tag, owner, clock, 0xf710)
{
}
-h83031_device::h83031_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+h83031_device::h83031_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
h83032_device(mconfig, H83031, tag, owner, clock, 0xfb10)
{
}
-h83030_device::h83030_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+h83030_device::h83030_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
h83032_device(mconfig, H83030, tag, owner, clock, 0xfd10)
{
}
diff --git a/src/devices/cpu/h8/h83032.h b/src/devices/cpu/h8/h83032.h
index fd2d99593da..58d0a2170b1 100644
--- a/src/devices/cpu/h8/h83032.h
+++ b/src/devices/cpu/h8/h83032.h
@@ -29,13 +29,13 @@
class h83032_device : public h8h_device {
public:
- h83032_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ h83032_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
uint8_t syscr_r();
void syscr_w(uint8_t data);
protected:
- h83032_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, uint32_t start);
+ h83032_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, uint32_t start);
required_device<h8h_intc_device> intc;
required_device<h8_adc_device> adc;
@@ -77,12 +77,12 @@ protected:
class h83031_device : public h83032_device {
public:
- h83031_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ h83031_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
};
class h83030_device : public h83032_device {
public:
- h83030_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ h83030_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
};
DECLARE_DEVICE_TYPE(H83032, h83032_device)
diff --git a/src/devices/cpu/h8/h83042.cpp b/src/devices/cpu/h8/h83042.cpp
index 2b0631d201e..a0896f68ad5 100644
--- a/src/devices/cpu/h8/h83042.cpp
+++ b/src/devices/cpu/h8/h83042.cpp
@@ -7,7 +7,7 @@ DEFINE_DEVICE_TYPE(H83040, h83040_device, "h83040", "Hitachi H8/3040")
DEFINE_DEVICE_TYPE(H83041, h83041_device, "h83041", "Hitachi H8/3041")
DEFINE_DEVICE_TYPE(H83042, h83042_device, "h83042", "Hitachi H8/3042")
-h83042_device::h83042_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+h83042_device::h83042_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) :
h8h_device(mconfig, type, tag, owner, clock, address_map_constructor(FUNC(h83042_device::map), this)),
intc(*this, "intc"),
adc(*this, "adc"),
@@ -36,17 +36,17 @@ h83042_device::h83042_device(const machine_config &mconfig, device_type type, co
mode_a20 = true;
}
-h83040_device::h83040_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+h83040_device::h83040_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
h83042_device(mconfig, H83040, tag, owner, clock)
{
}
-h83041_device::h83041_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+h83041_device::h83041_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
h83042_device(mconfig, H83041, tag, owner, clock)
{
}
-h83042_device::h83042_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+h83042_device::h83042_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
h83042_device(mconfig, H83042, tag, owner, clock)
{
}
diff --git a/src/devices/cpu/h8/h83042.h b/src/devices/cpu/h8/h83042.h
index 8caa5a4e690..5037d05e165 100644
--- a/src/devices/cpu/h8/h83042.h
+++ b/src/devices/cpu/h8/h83042.h
@@ -32,13 +32,13 @@
class h83042_device : public h8h_device {
public:
- h83042_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ h83042_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
uint8_t syscr_r();
void syscr_w(uint8_t data);
protected:
- h83042_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ h83042_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
required_device<h8h_intc_device> intc;
required_device<h8_adc_device> adc;
@@ -80,12 +80,12 @@ protected:
class h83040_device : public h83042_device {
public:
- h83040_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ h83040_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
};
class h83041_device : public h83042_device {
public:
- h83041_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ h83041_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
};
DECLARE_DEVICE_TYPE(H83040, h83040_device)
diff --git a/src/devices/cpu/h8/h83048.cpp b/src/devices/cpu/h8/h83048.cpp
index 2358914e6cf..3e4372bb221 100644
--- a/src/devices/cpu/h8/h83048.cpp
+++ b/src/devices/cpu/h8/h83048.cpp
@@ -8,7 +8,7 @@ DEFINE_DEVICE_TYPE(H83045, h83045_device, "h83045", "Hitachi H8/3045")
DEFINE_DEVICE_TYPE(H83047, h83047_device, "h83047", "Hitachi H8/3047")
DEFINE_DEVICE_TYPE(H83048, h83048_device, "h83048", "Hitachi H8/3048")
-h83048_device::h83048_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, uint32_t start) :
+h83048_device::h83048_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, uint32_t start) :
h8h_device(mconfig, type, tag, owner, clock, address_map_constructor(FUNC(h83048_device::map), this)),
intc(*this, "intc"),
adc(*this, "adc"),
@@ -37,22 +37,22 @@ h83048_device::h83048_device(const machine_config &mconfig, device_type type, co
{
}
-h83048_device::h83048_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+h83048_device::h83048_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
h83048_device(mconfig, H83048, tag, owner, clock, 0xef10)
{
}
-h83044_device::h83044_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+h83044_device::h83044_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
h83048_device(mconfig, H83044, tag, owner, clock, 0xf710)
{
}
-h83045_device::h83045_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+h83045_device::h83045_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
h83048_device(mconfig, H83045, tag, owner, clock, 0xf710)
{
}
-h83047_device::h83047_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+h83047_device::h83047_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
h83048_device(mconfig, H83047, tag, owner, clock, 0xef10)
{
}
diff --git a/src/devices/cpu/h8/h83048.h b/src/devices/cpu/h8/h83048.h
index d5afb5e67c8..3df24384c6e 100644
--- a/src/devices/cpu/h8/h83048.h
+++ b/src/devices/cpu/h8/h83048.h
@@ -32,7 +32,7 @@
class h83048_device : public h8h_device {
public:
- h83048_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ h83048_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
void set_mode_a20() { mode_a20 = true; }
void set_mode_a24() { mode_a20 = false; }
@@ -41,7 +41,7 @@ public:
void syscr_w(uint8_t data);
protected:
- h83048_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, uint32_t start);
+ h83048_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, uint32_t start);
required_device<h8h_intc_device> intc;
required_device<h8_adc_device> adc;
@@ -84,17 +84,17 @@ protected:
class h83044_device : public h83048_device {
public:
- h83044_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ h83044_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
};
class h83045_device : public h83048_device {
public:
- h83045_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ h83045_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
};
class h83047_device : public h83048_device {
public:
- h83047_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ h83047_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
};
DECLARE_DEVICE_TYPE(H83044, h83044_device)
diff --git a/src/devices/cpu/h8/h83337.cpp b/src/devices/cpu/h8/h83337.cpp
index 7f9e835513c..3ed10f5ae97 100644
--- a/src/devices/cpu/h8/h83337.cpp
+++ b/src/devices/cpu/h8/h83337.cpp
@@ -8,7 +8,7 @@ DEFINE_DEVICE_TYPE(H83336, h83336_device, "h83336", "Hitachi H8/3336")
DEFINE_DEVICE_TYPE(H83337, h83337_device, "h83337", "Hitachi H8/3337")
-h83337_device::h83337_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, uint32_t start) :
+h83337_device::h83337_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, uint32_t start) :
h8_device(mconfig, type, tag, owner, clock, address_map_constructor(FUNC(h83337_device::map), this)),
intc(*this, "intc"),
adc(*this, "adc"),
@@ -33,17 +33,17 @@ h83337_device::h83337_device(const machine_config &mconfig, device_type type, co
{
}
-h83337_device::h83337_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+h83337_device::h83337_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
h83337_device(mconfig, H83337, tag, owner, clock, 0xf780)
{
}
-h83334_device::h83334_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+h83334_device::h83334_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
h83337_device(mconfig, H83334, tag, owner, clock, 0xfb80)
{
}
-h83336_device::h83336_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+h83336_device::h83336_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
h83337_device(mconfig, H83336, tag, owner, clock, 0xf780)
{
}
diff --git a/src/devices/cpu/h8/h83337.h b/src/devices/cpu/h8/h83337.h
index cc0d9735a34..9ed5958b47a 100644
--- a/src/devices/cpu/h8/h83337.h
+++ b/src/devices/cpu/h8/h83337.h
@@ -34,7 +34,7 @@
class h83337_device : public h8_device {
public:
- h83337_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ h83337_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
uint8_t wscr_r();
void wscr_w(uint8_t data);
@@ -46,7 +46,7 @@ public:
void mdcr_w(uint8_t data);
protected:
- h83337_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, uint32_t start);
+ h83337_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, uint32_t start);
required_device<h8_intc_device> intc;
required_device<h8_adc_device> adc;
@@ -84,12 +84,12 @@ protected:
class h83334_device : public h83337_device {
public:
- h83334_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ h83334_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
};
class h83336_device : public h83337_device {
public:
- h83336_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ h83336_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
};
DECLARE_DEVICE_TYPE(H83334, h83334_device)
diff --git a/src/devices/cpu/h8/h8_adc.cpp b/src/devices/cpu/h8/h8_adc.cpp
index 3235ac8c6c8..73176384a31 100644
--- a/src/devices/cpu/h8/h8_adc.cpp
+++ b/src/devices/cpu/h8/h8_adc.cpp
@@ -15,7 +15,7 @@ DEFINE_DEVICE_TYPE(H8_ADC_2320, h8_adc_2320_device, "h8_adc_2320", "H8/2320 ADC"
DEFINE_DEVICE_TYPE(H8_ADC_2357, h8_adc_2357_device, "h8_adc_2357", "H8/2357 ADC")
DEFINE_DEVICE_TYPE(H8_ADC_2655, h8_adc_2655_device, "h8_adc_2655", "H8/2655 ADC")
-h8_adc_device::h8_adc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+h8_adc_device::h8_adc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, type, tag, owner, clock),
cpu(*this, DEVICE_SELF_OWNER),
intc(nullptr), io(nullptr), intc_tag(nullptr), intc_vector(0), adcsr(0), adcr(0), register_mask(0), trigger(0), start_mode(0), start_channel(0),
@@ -272,7 +272,7 @@ int h8_adc_device::get_channel_index(int count)
}
-h8_adc_3337_device::h8_adc_3337_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+h8_adc_3337_device::h8_adc_3337_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
h8_adc_device(mconfig, H8_ADC_3337, tag, owner, clock)
{
register_mask = 3;
@@ -303,7 +303,7 @@ void h8_adc_3337_device::mode_update()
}
-h8_adc_3006_device::h8_adc_3006_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+h8_adc_3006_device::h8_adc_3006_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
h8_adc_device(mconfig, H8_ADC_3006, tag, owner, clock)
{
register_mask = 3;
@@ -334,7 +334,7 @@ void h8_adc_3006_device::mode_update()
}
-h8_adc_2245_device::h8_adc_2245_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+h8_adc_2245_device::h8_adc_2245_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
h8_adc_device(mconfig, H8_ADC_2245, tag, owner, clock)
{
register_mask = 3;
@@ -365,7 +365,7 @@ void h8_adc_2245_device::mode_update()
}
-h8_adc_2320_device::h8_adc_2320_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+h8_adc_2320_device::h8_adc_2320_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
h8_adc_device(mconfig, H8_ADC_2320, tag, owner, clock)
{
register_mask = 3;
@@ -402,7 +402,7 @@ void h8_adc_2320_device::mode_update()
}
-h8_adc_2357_device::h8_adc_2357_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+h8_adc_2357_device::h8_adc_2357_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
h8_adc_device(mconfig, H8_ADC_2357, tag, owner, clock)
{
register_mask = 3;
@@ -433,7 +433,7 @@ void h8_adc_2357_device::mode_update()
}
-h8_adc_2655_device::h8_adc_2655_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+h8_adc_2655_device::h8_adc_2655_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
h8_adc_device(mconfig, H8_ADC_2655, tag, owner, clock)
{
suspend_on_interrupt = true;
diff --git a/src/devices/cpu/h8/h8_adc.h b/src/devices/cpu/h8/h8_adc.h
index e54d3b747d9..8b4008eb4eb 100644
--- a/src/devices/cpu/h8/h8_adc.h
+++ b/src/devices/cpu/h8/h8_adc.h
@@ -33,7 +33,7 @@ public:
uint64_t internal_update(uint64_t current_time);
protected:
- h8_adc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ h8_adc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
required_device<h8_device> cpu;
h8_intc_device *intc;
@@ -93,9 +93,9 @@ protected:
class h8_adc_3337_device : public h8_adc_device {
public:
- h8_adc_3337_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ h8_adc_3337_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL());
h8_adc_3337_device(const machine_config &mconfig, const char *tag, device_t *owner, const char *intc_tag, int vect)
- : h8_adc_3337_device(mconfig, tag, owner, 0)
+ : h8_adc_3337_device(mconfig, tag, owner)
{
set_info(intc_tag, vect);
}
@@ -107,9 +107,9 @@ protected:
class h8_adc_3006_device : public h8_adc_device {
public:
- h8_adc_3006_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ h8_adc_3006_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL());
h8_adc_3006_device(const machine_config &mconfig, const char *tag, device_t *owner, const char *intc_tag, int vect)
- : h8_adc_3006_device(mconfig, tag, owner, 0)
+ : h8_adc_3006_device(mconfig, tag, owner)
{
set_info(intc_tag, vect);
}
@@ -121,9 +121,9 @@ protected:
class h8_adc_2245_device : public h8_adc_device {
public:
- h8_adc_2245_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ h8_adc_2245_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL());
h8_adc_2245_device(const machine_config &mconfig, const char *tag, device_t *owner, const char *intc_tag, int vect)
- : h8_adc_2245_device(mconfig, tag, owner, 0)
+ : h8_adc_2245_device(mconfig, tag, owner)
{
set_info(intc_tag, vect);
}
@@ -135,9 +135,9 @@ protected:
class h8_adc_2320_device : public h8_adc_device {
public:
- h8_adc_2320_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ h8_adc_2320_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL());
h8_adc_2320_device(const machine_config &mconfig, const char *tag, device_t *owner, const char *intc_tag, int vect)
- : h8_adc_2320_device(mconfig, tag, owner, 0)
+ : h8_adc_2320_device(mconfig, tag, owner)
{
set_info(intc_tag, vect);
}
@@ -149,9 +149,9 @@ protected:
class h8_adc_2357_device : public h8_adc_device {
public:
- h8_adc_2357_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ h8_adc_2357_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL());
h8_adc_2357_device(const machine_config &mconfig, const char *tag, device_t *owner, const char *intc_tag, int vect)
- : h8_adc_2357_device(mconfig, tag, owner, 0)
+ : h8_adc_2357_device(mconfig, tag, owner)
{
set_info(intc_tag, vect);
}
@@ -163,9 +163,9 @@ protected:
class h8_adc_2655_device : public h8_adc_device {
public:
- h8_adc_2655_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ h8_adc_2655_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL());
h8_adc_2655_device(const machine_config &mconfig, const char *tag, device_t *owner, const char *intc_tag, int vect)
- : h8_adc_2655_device(mconfig, tag, owner, 0)
+ : h8_adc_2655_device(mconfig, tag, owner)
{
set_info(intc_tag, vect);
}
diff --git a/src/devices/cpu/h8/h8_dma.cpp b/src/devices/cpu/h8/h8_dma.cpp
index d70cced09f3..ba014974ec3 100644
--- a/src/devices/cpu/h8/h8_dma.cpp
+++ b/src/devices/cpu/h8/h8_dma.cpp
@@ -4,7 +4,7 @@
DEFINE_DEVICE_TYPE(H8_DMA, h8_dma_device, "h8_dma", "H8 DMA controller")
DEFINE_DEVICE_TYPE(H8_DMA_CHANNEL, h8_dma_channel_device, "h8_dma_channel", "H8 DMA channel")
-h8_dma_device::h8_dma_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+h8_dma_device::h8_dma_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, H8_DMA, tag, owner, clock),
dmach0(*this, "0"),
dmach1(*this, "1")
@@ -118,7 +118,7 @@ void h8_dma_device::dmabcr_w(offs_t offset, uint16_t data, uint16_t mem_mask)
-h8_dma_channel_device::h8_dma_channel_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+h8_dma_channel_device::h8_dma_channel_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, H8_DMA_CHANNEL, tag, owner, clock),
dmac(*this, "^"),
cpu(*this, "^^")
diff --git a/src/devices/cpu/h8/h8_dma.h b/src/devices/cpu/h8/h8_dma.h
index 4a4eeda837b..7448300f4cd 100644
--- a/src/devices/cpu/h8/h8_dma.h
+++ b/src/devices/cpu/h8/h8_dma.h
@@ -43,7 +43,7 @@ enum {
class h8_dma_device : public device_t {
public:
- h8_dma_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
+ h8_dma_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL());
uint8_t dmawer_r();
void dmawer_w(uint8_t data);
@@ -88,7 +88,7 @@ public:
MODE16_MEM_DACK
};
- h8_dma_channel_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ h8_dma_channel_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL());
h8_dma_channel_device(const machine_config &mconfig, const char *tag, device_t *owner,
const char *intc, int irq_base, int v0, int v1, int v2, int v3, int v4, int v5, int v6, int v7, int v8,
int v9 = h8_dma_channel_device::NONE,
@@ -98,7 +98,7 @@ public:
int vd = h8_dma_channel_device::NONE,
int ve = h8_dma_channel_device::NONE,
int vf = h8_dma_channel_device::NONE)
- : h8_dma_channel_device(mconfig, tag, owner, 0)
+ : h8_dma_channel_device(mconfig, tag, owner)
{
set_info(intc, irq_base, v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, va, vb, vc, vd, ve, vf);
}
diff --git a/src/devices/cpu/h8/h8_dtc.cpp b/src/devices/cpu/h8/h8_dtc.cpp
index a2668456414..08aab92bfb7 100644
--- a/src/devices/cpu/h8/h8_dtc.cpp
+++ b/src/devices/cpu/h8/h8_dtc.cpp
@@ -24,7 +24,7 @@ const int h8_dtc_device::vector_to_enable[92] = {
-1, 40, 41, -1 // ERI2, RXI2, TXI2, TEI2
};
-h8_dtc_device::h8_dtc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+h8_dtc_device::h8_dtc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, H8_DTC, tag, owner, clock),
cpu(*this, DEVICE_SELF_OWNER)
{
diff --git a/src/devices/cpu/h8/h8_dtc.h b/src/devices/cpu/h8/h8_dtc.h
index 6b1a32b8a9b..22052b8a757 100644
--- a/src/devices/cpu/h8/h8_dtc.h
+++ b/src/devices/cpu/h8/h8_dtc.h
@@ -29,9 +29,9 @@ class h8_dtc_device : public device_t {
public:
enum { DTC_CHAINED = 1000 };
- h8_dtc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ h8_dtc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL());
h8_dtc_device(const machine_config &mconfig, const char *tag, device_t *owner, const char *intc, int irq)
- : h8_dtc_device(mconfig, tag, owner, 0)
+ : h8_dtc_device(mconfig, tag, owner)
{
set_info(intc, irq);
}
diff --git a/src/devices/cpu/h8/h8_intc.cpp b/src/devices/cpu/h8/h8_intc.cpp
index f2a7b192164..465b346e604 100644
--- a/src/devices/cpu/h8/h8_intc.cpp
+++ b/src/devices/cpu/h8/h8_intc.cpp
@@ -8,7 +8,7 @@ DEFINE_DEVICE_TYPE(H8H_INTC, h8h_intc_device, "h8h_intc", "H8H interrupt c
DEFINE_DEVICE_TYPE(H8S_INTC, h8s_intc_device, "h8s_intc", "H8S interrupt controller")
DEFINE_DEVICE_TYPE(GT913_INTC, gt913_intc_device, "gt913_intc", "Casio GT913F interrupt controller")
-h8_intc_device::h8_intc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+h8_intc_device::h8_intc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
h8_intc_device(mconfig, H8_INTC, tag, owner, clock)
{
irq_vector_base = 4;
@@ -16,7 +16,7 @@ h8_intc_device::h8_intc_device(const machine_config &mconfig, const char *tag, d
irq_vector_nmi = 3;
}
-h8_intc_device::h8_intc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+h8_intc_device::h8_intc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, type, tag, owner, clock), irq_vector_base(0), irq_vector_count(0), irq_vector_nmi(0),
cpu(*this, DEVICE_SELF_OWNER), nmi_input(false), irq_input(0), ier(0), isr(0), iscr(0), icr_filter(0), ipr_filter(0)
{
@@ -199,7 +199,7 @@ void h8_intc_device::get_priority(int vect, int &icr_pri, int &ipr_pri) const
}
-gt913_intc_device::gt913_intc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+gt913_intc_device::gt913_intc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
gt913_intc_device(mconfig, GT913_INTC, tag, owner, clock)
{
irq_vector_base = 4;
@@ -207,7 +207,7 @@ gt913_intc_device::gt913_intc_device(const machine_config &mconfig, const char *
irq_vector_nmi = 3;
}
-gt913_intc_device::gt913_intc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+gt913_intc_device::gt913_intc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) :
h8_intc_device(mconfig, type, tag, owner, clock)
{
}
@@ -226,7 +226,7 @@ void gt913_intc_device::clear_interrupt(int vector)
}
-h8h_intc_device::h8h_intc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+h8h_intc_device::h8h_intc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
h8h_intc_device(mconfig, H8H_INTC, tag, owner, clock)
{
irq_vector_base = 12;
@@ -234,7 +234,7 @@ h8h_intc_device::h8h_intc_device(const machine_config &mconfig, const char *tag,
irq_vector_nmi = 7;
}
-h8h_intc_device::h8h_intc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+h8h_intc_device::h8h_intc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) :
h8_intc_device(mconfig, type, tag, owner, clock)
{
}
@@ -353,7 +353,7 @@ void h8h_intc_device::get_priority(int vect, int &icr_pri, int &ipr_pri) const
icr_pri = (icr >> (slot ^ 7)) & 1;
}
-h8s_intc_device::h8s_intc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+h8s_intc_device::h8s_intc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
h8h_intc_device(mconfig, H8S_INTC, tag, owner, clock)
{
irq_vector_base = 16;
diff --git a/src/devices/cpu/h8/h8_intc.h b/src/devices/cpu/h8/h8_intc.h
index 43569dc3b9b..23ec3244cfa 100644
--- a/src/devices/cpu/h8/h8_intc.h
+++ b/src/devices/cpu/h8/h8_intc.h
@@ -19,7 +19,7 @@
class h8_intc_device : public device_t {
public:
- h8_intc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
+ h8_intc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL());
int interrupt_taken(int vector);
void internal_interrupt(int vector);
@@ -50,7 +50,7 @@ protected:
uint16_t iscr;
int icr_filter, ipr_filter;
- h8_intc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ h8_intc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
@@ -63,18 +63,18 @@ protected:
class gt913_intc_device : public h8_intc_device {
public:
- gt913_intc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
+ gt913_intc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL());
void clear_interrupt(int vector);
protected:
- gt913_intc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ gt913_intc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_reset() override;
};
class h8h_intc_device : public h8_intc_device {
public:
- h8h_intc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
+ h8h_intc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL());
uint8_t isr_r();
void isr_w(uint8_t data);
@@ -92,7 +92,7 @@ protected:
uint32_t icr;
- h8h_intc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ h8h_intc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
@@ -103,7 +103,7 @@ protected:
class h8s_intc_device : public h8h_intc_device {
public:
- h8s_intc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0);
+ h8s_intc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL());
uint8_t ipr_r(offs_t offset);
void ipr_w(offs_t offset, uint8_t data);
diff --git a/src/devices/cpu/h8/h8_port.cpp b/src/devices/cpu/h8/h8_port.cpp
index e366e0d49a5..86390382274 100644
--- a/src/devices/cpu/h8/h8_port.cpp
+++ b/src/devices/cpu/h8/h8_port.cpp
@@ -5,7 +5,7 @@
DEFINE_DEVICE_TYPE(H8_PORT, h8_port_device, "h8_digital_port", "H8 digital port")
-h8_port_device::h8_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+h8_port_device::h8_port_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, H8_PORT, tag, owner, clock),
cpu(*this, DEVICE_SELF_OWNER), io(nullptr), address(0), default_ddr(0), ddr(0), pcr(0), odr(0), mask(0), dr(0), last_output(0)
{
diff --git a/src/devices/cpu/h8/h8_port.h b/src/devices/cpu/h8/h8_port.h
index 6c60b0c7621..45e6d387599 100644
--- a/src/devices/cpu/h8/h8_port.h
+++ b/src/devices/cpu/h8/h8_port.h
@@ -18,9 +18,9 @@
class h8_port_device : public device_t {
public:
- h8_port_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ h8_port_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL());
h8_port_device(const machine_config &mconfig, const char *tag, device_t *owner, int address, uint8_t default_ddr, uint8_t mask)
- : h8_port_device(mconfig, tag, owner, 0)
+ : h8_port_device(mconfig, tag, owner)
{
set_info(address, default_ddr, mask);
}
diff --git a/src/devices/cpu/h8/h8_sci.cpp b/src/devices/cpu/h8/h8_sci.cpp
index 6bc650af5c6..c7ec19d382d 100644
--- a/src/devices/cpu/h8/h8_sci.cpp
+++ b/src/devices/cpu/h8/h8_sci.cpp
@@ -15,7 +15,7 @@ DEFINE_DEVICE_TYPE(H8_SCI, h8_sci_device, "h8_sci", "H8 Serial Communications In
const char *const h8_sci_device::state_names[] = { "idle", "start", "bit", "parity", "stop", "last-tick" };
-h8_sci_device::h8_sci_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+h8_sci_device::h8_sci_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, H8_SCI, tag, owner, clock),
cpu(*this, DEVICE_SELF_OWNER),
tx_cb(*this),
diff --git a/src/devices/cpu/h8/h8_sci.h b/src/devices/cpu/h8/h8_sci.h
index 8c07ffe5ec2..1c9c04b38fe 100644
--- a/src/devices/cpu/h8/h8_sci.h
+++ b/src/devices/cpu/h8/h8_sci.h
@@ -19,9 +19,9 @@
class h8_sci_device : public device_t {
public:
- h8_sci_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ h8_sci_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL());
h8_sci_device(const machine_config &mconfig, const char *tag, device_t *owner, const char *intc, int eri, int rxi, int txi, int tei)
- : h8_sci_device(mconfig, tag, owner, 0)
+ : h8_sci_device(mconfig, tag, owner)
{
set_info(intc, eri, rxi, txi, tei);
}
diff --git a/src/devices/cpu/h8/h8_timer16.cpp b/src/devices/cpu/h8/h8_timer16.cpp
index f74acb4816f..40d0d015db4 100644
--- a/src/devices/cpu/h8/h8_timer16.cpp
+++ b/src/devices/cpu/h8/h8_timer16.cpp
@@ -13,13 +13,13 @@ DEFINE_DEVICE_TYPE(H8_TIMER16_CHANNEL, h8_timer16_channel_device, "h8_timer16_
DEFINE_DEVICE_TYPE(H8H_TIMER16_CHANNEL, h8h_timer16_channel_device, "h8h_timer16_channel", "H8H 16-bit timer channel")
DEFINE_DEVICE_TYPE(H8S_TIMER16_CHANNEL, h8s_timer16_channel_device, "h8s_timer16_channel", "H8S 16-bit timer channel")
-h8_timer16_channel_device::h8_timer16_channel_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+h8_timer16_channel_device::h8_timer16_channel_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
h8_timer16_channel_device(mconfig, H8_TIMER16_CHANNEL, tag, owner, clock)
{
chain_tag = nullptr;
}
-h8_timer16_channel_device::h8_timer16_channel_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+h8_timer16_channel_device::h8_timer16_channel_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, type, tag, owner, clock),
cpu(*this, "^^"), chained_timer(nullptr), intc(nullptr), intc_tag(nullptr), tier_mask(0), tgr_count(0), tbr_count(0), tgr_clearing(0), tcr(0), tier(0), ier(0), isr(0), clock_type(0),
clock_divider(0), tcnt(0), last_clock_update(0), event_time(0), phase(0), counter_cycle(0), counter_incrementing(false), channel_active(false)
@@ -313,7 +313,7 @@ void h8_timer16_channel_device::recalc_event(uint64_t cur_time)
cpu->internal_update();
}
-h8_timer16_device::h8_timer16_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+h8_timer16_device::h8_timer16_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, H8_TIMER16, tag, owner, clock),
cpu(*this, DEVICE_SELF_OWNER)
{
@@ -519,7 +519,7 @@ uint8_t h8_timer16_channel_device::tisr_r(int offset) const
return 0x00;
}
-h8h_timer16_channel_device::h8h_timer16_channel_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+h8h_timer16_channel_device::h8h_timer16_channel_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
h8_timer16_channel_device(mconfig, H8H_TIMER16_CHANNEL, tag, owner, clock)
{
}
@@ -617,7 +617,7 @@ void h8h_timer16_channel_device::tcr_update()
}
}
-h8s_timer16_channel_device::h8s_timer16_channel_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+h8s_timer16_channel_device::h8s_timer16_channel_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
h8_timer16_channel_device(mconfig, H8S_TIMER16_CHANNEL, tag, owner, clock)
{
}
diff --git a/src/devices/cpu/h8/h8_timer16.h b/src/devices/cpu/h8/h8_timer16.h
index 6543b9ccb7c..a22e0a3caac 100644
--- a/src/devices/cpu/h8/h8_timer16.h
+++ b/src/devices/cpu/h8/h8_timer16.h
@@ -56,9 +56,9 @@ public:
};
- h8_timer16_channel_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ h8_timer16_channel_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL());
h8_timer16_channel_device(const machine_config &mconfig, const char *tag, device_t *owner, int tgr_count, int tbr_count, const char *intc, int irq_base)
- : h8_timer16_channel_device(mconfig, tag, owner, 0)
+ : h8_timer16_channel_device(mconfig, tag, owner)
{
set_info(tgr_count, tbr_count, intc, irq_base);
}
@@ -106,7 +106,7 @@ protected:
bool counter_incrementing;
bool channel_active;
- h8_timer16_channel_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ h8_timer16_channel_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
@@ -121,9 +121,9 @@ protected:
class h8h_timer16_channel_device : public h8_timer16_channel_device {
public:
- h8h_timer16_channel_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ h8h_timer16_channel_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL());
h8h_timer16_channel_device(const machine_config &mconfig, const char *tag, device_t *owner, int tgr_count, int tbr_count, const char *intc, int irq_base)
- : h8h_timer16_channel_device(mconfig, tag, owner, 0)
+ : h8h_timer16_channel_device(mconfig, tag, owner)
{
set_info(tgr_count, tbr_count, intc, irq_base);
}
@@ -140,10 +140,10 @@ protected:
class h8s_timer16_channel_device : public h8_timer16_channel_device {
public:
- h8s_timer16_channel_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ h8s_timer16_channel_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL());
h8s_timer16_channel_device(const machine_config &mconfig, const char *tag, device_t *owner, int tgr_count, int _tier_mask, const char *intc, int irq_base,
int t0, int t1, int t2, int t3, int t4, int t5, int t6, int t7)
- : h8s_timer16_channel_device(mconfig, tag, owner, 0)
+ : h8s_timer16_channel_device(mconfig, tag, owner)
{
set_info(tgr_count, _tier_mask, intc, irq_base, t0, t1, t2, t3, t4, t5, t6, t7);
}
@@ -164,9 +164,9 @@ protected:
class h8_timer16_device : public device_t {
public:
- h8_timer16_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ h8_timer16_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL());
h8_timer16_device(const machine_config &mconfig, const char *tag, device_t *owner, int timer_count, uint8_t default_tstr)
- : h8_timer16_device(mconfig, tag, owner, 0)
+ : h8_timer16_device(mconfig, tag, owner)
{
set_info(timer_count, default_tstr);
}
diff --git a/src/devices/cpu/h8/h8_timer8.cpp b/src/devices/cpu/h8/h8_timer8.cpp
index 352b4a7f7d9..07550cd7954 100644
--- a/src/devices/cpu/h8/h8_timer8.cpp
+++ b/src/devices/cpu/h8/h8_timer8.cpp
@@ -12,12 +12,12 @@ const int V = 1;
DEFINE_DEVICE_TYPE(H8_TIMER8_CHANNEL, h8_timer8_channel_device, "h8_timer8_channel", "H8 8-bit timer channel")
DEFINE_DEVICE_TYPE(H8H_TIMER8_CHANNEL, h8h_timer8_channel_device, "h8h_timer8_channel", "H8H 8-bit timer channel")
-h8_timer8_channel_device::h8_timer8_channel_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+h8_timer8_channel_device::h8_timer8_channel_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
h8_timer8_channel_device(mconfig, H8_TIMER8_CHANNEL, tag, owner, clock)
{
}
-h8_timer8_channel_device::h8_timer8_channel_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+h8_timer8_channel_device::h8_timer8_channel_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, type, tag, owner, clock),
cpu(*this, "^"), chained_timer(nullptr), intc(nullptr), chain_tag(nullptr), intc_tag(nullptr), irq_ca(0), irq_cb(0), irq_v(0), chain_type(0), tcr(0), tcsr(0), tcnt(0), extra_clock_bit(false),
has_adte(false), has_ice(false), clock_type(0), clock_divider(0), clear_type(0), counter_cycle(0), last_clock_update(0), event_time(0)
@@ -351,7 +351,7 @@ void h8_timer8_channel_device::timer_tick()
}
}
-h8h_timer8_channel_device::h8h_timer8_channel_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+h8h_timer8_channel_device::h8h_timer8_channel_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
h8_timer8_channel_device(mconfig, H8H_TIMER8_CHANNEL, tag, owner, clock)
{
}
diff --git a/src/devices/cpu/h8/h8_timer8.h b/src/devices/cpu/h8/h8_timer8.h
index 0ba06d933ba..fa4a6c1ac33 100644
--- a/src/devices/cpu/h8/h8_timer8.h
+++ b/src/devices/cpu/h8/h8_timer8.h
@@ -29,10 +29,10 @@ public:
DIV
};
- h8_timer8_channel_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ h8_timer8_channel_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL());
h8_timer8_channel_device(const machine_config &mconfig, const char *tag, device_t *owner, const char *intc, int irq_ca, int irq_cb, int irq_v,
int div1, int div2, int div3, int div4, int div5, int div6)
- : h8_timer8_channel_device(mconfig, tag, owner, 0)
+ : h8_timer8_channel_device(mconfig, tag, owner)
{
set_info(intc, irq_ca, irq_cb, irq_v, div1, div2, div3, div4, div5, div6);
}
@@ -88,7 +88,7 @@ protected:
int clock_type, clock_divider, clear_type, counter_cycle;
uint64_t last_clock_update, event_time;
- h8_timer8_channel_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ h8_timer8_channel_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual void device_start() override;
virtual void device_reset() override;
@@ -102,10 +102,10 @@ protected:
class h8h_timer8_channel_device : public h8_timer8_channel_device {
public:
- h8h_timer8_channel_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ h8h_timer8_channel_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL());
h8h_timer8_channel_device(const machine_config &mconfig, const char *tag, device_t *owner, const char *intc, int irq_ca, int irq_cb, int irq_v,
const char *chain_tag, int chain_type, bool has_adte, bool has_ice)
- : h8h_timer8_channel_device(mconfig, tag, owner, 0)
+ : h8h_timer8_channel_device(mconfig, tag, owner)
{
set_info(intc, irq_ca, irq_cb, irq_v, chain_tag, chain_type, has_adte, has_ice);
}
diff --git a/src/devices/cpu/h8/h8_watchdog.cpp b/src/devices/cpu/h8/h8_watchdog.cpp
index d3386b465fe..8770eddf4e0 100644
--- a/src/devices/cpu/h8/h8_watchdog.cpp
+++ b/src/devices/cpu/h8/h8_watchdog.cpp
@@ -6,7 +6,7 @@ DEFINE_DEVICE_TYPE(H8_WATCHDOG, h8_watchdog_device, "h8_watchdog", "H8 watchdog"
const int h8_watchdog_device::div_bh[8] = { 1, 6, 7, 9, 11, 13, 15, 17 };
const int h8_watchdog_device::div_s [8] = { 1, 5, 6, 7, 8, 9, 11, 12 };
-h8_watchdog_device::h8_watchdog_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+h8_watchdog_device::h8_watchdog_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, H8_WATCHDOG, tag, owner, clock),
cpu(*this, DEVICE_SELF_OWNER)
{
diff --git a/src/devices/cpu/h8/h8_watchdog.h b/src/devices/cpu/h8/h8_watchdog.h
index 1cb63025141..06d5f1b7bdf 100644
--- a/src/devices/cpu/h8/h8_watchdog.h
+++ b/src/devices/cpu/h8/h8_watchdog.h
@@ -49,9 +49,9 @@ class h8_watchdog_device : public device_t {
public:
enum { B, H, S };
- h8_watchdog_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ h8_watchdog_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL());
h8_watchdog_device(const machine_config &mconfig, const char *tag, device_t *owner, const char *intc, int irq, int type)
- : h8_watchdog_device(mconfig, tag, owner, 0)
+ : h8_watchdog_device(mconfig, tag, owner)
{
set_info(intc, irq, type);
}
diff --git a/src/devices/cpu/h8/h8h.cpp b/src/devices/cpu/h8/h8h.cpp
index 21f40f77600..829c1a01244 100644
--- a/src/devices/cpu/h8/h8h.cpp
+++ b/src/devices/cpu/h8/h8h.cpp
@@ -4,7 +4,7 @@
#include "h8h.h"
#include "h8hd.h"
-h8h_device::h8h_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, address_map_constructor map_delegate) :
+h8h_device::h8h_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, address_map_constructor map_delegate) :
h8_device(mconfig, type, tag, owner, clock, map_delegate)
{
supports_advanced = true;
diff --git a/src/devices/cpu/h8/h8h.h b/src/devices/cpu/h8/h8h.h
index 1b0c9b4b3ce..ad9a94e4400 100644
--- a/src/devices/cpu/h8/h8h.h
+++ b/src/devices/cpu/h8/h8h.h
@@ -20,7 +20,7 @@
class h8h_device : public h8_device {
protected:
- h8h_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, address_map_constructor map_delegate);
+ h8h_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, address_map_constructor map_delegate);
virtual std::unique_ptr<util::disasm_interface> create_disassembler() override;
diff --git a/src/devices/cpu/h8/h8s2000.cpp b/src/devices/cpu/h8/h8s2000.cpp
index 04da92cdee3..41279505e69 100644
--- a/src/devices/cpu/h8/h8s2000.cpp
+++ b/src/devices/cpu/h8/h8s2000.cpp
@@ -4,7 +4,7 @@
#include "h8s2000.h"
#include "h8s2000d.h"
-h8s2000_device::h8s2000_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, address_map_constructor map_delegate) :
+h8s2000_device::h8s2000_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, address_map_constructor map_delegate) :
h8h_device(mconfig, type, tag, owner, clock, map_delegate)
{
has_exr = true;
diff --git a/src/devices/cpu/h8/h8s2000.h b/src/devices/cpu/h8/h8s2000.h
index 8f7721928c3..a2f79b40fb4 100644
--- a/src/devices/cpu/h8/h8s2000.h
+++ b/src/devices/cpu/h8/h8s2000.h
@@ -22,7 +22,7 @@
class h8s2000_device : public h8h_device {
protected:
- h8s2000_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, address_map_constructor map_delegate);
+ h8s2000_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, address_map_constructor map_delegate);
virtual std::unique_ptr<util::disasm_interface> create_disassembler() override;
diff --git a/src/devices/cpu/h8/h8s2245.cpp b/src/devices/cpu/h8/h8s2245.cpp
index b5101017f07..2ce4124e6cc 100644
--- a/src/devices/cpu/h8/h8s2245.cpp
+++ b/src/devices/cpu/h8/h8s2245.cpp
@@ -9,7 +9,7 @@ DEFINE_DEVICE_TYPE(H8S2245, h8s2245_device, "h8s2245", "Hitachi H8S/2245")
DEFINE_DEVICE_TYPE(H8S2246, h8s2246_device, "h8s2246", "Hitachi H8S/2246")
-h8s2245_device::h8s2245_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, uint32_t start) :
+h8s2245_device::h8s2245_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, uint32_t start) :
h8s2000_device(mconfig, type, tag, owner, clock, address_map_constructor(FUNC(h8s2245_device::map), this)),
intc(*this, "intc"),
adc(*this, "adc"),
@@ -41,22 +41,22 @@ h8s2245_device::h8s2245_device(const machine_config &mconfig, device_type type,
{
}
-h8s2245_device::h8s2245_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+h8s2245_device::h8s2245_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
h8s2245_device(mconfig, H8S2245, tag, owner, clock, 0xffec00)
{
}
-h8s2241_device::h8s2241_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+h8s2241_device::h8s2241_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
h8s2245_device(mconfig, H8S2241, tag, owner, clock, 0xffec00)
{
}
-h8s2242_device::h8s2242_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+h8s2242_device::h8s2242_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
h8s2245_device(mconfig, H8S2242, tag, owner, clock, 0xffdc00)
{
}
-h8s2246_device::h8s2246_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+h8s2246_device::h8s2246_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
h8s2245_device(mconfig, H8S2246, tag, owner, clock, 0xffdc00)
{
}
diff --git a/src/devices/cpu/h8/h8s2245.h b/src/devices/cpu/h8/h8s2245.h
index 4fca522bbc5..342d9e8e854 100644
--- a/src/devices/cpu/h8/h8s2245.h
+++ b/src/devices/cpu/h8/h8s2245.h
@@ -35,7 +35,7 @@
class h8s2245_device : public h8s2000_device {
public:
- h8s2245_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ h8s2245_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
uint8_t syscr_r();
void syscr_w(uint8_t data);
@@ -73,7 +73,7 @@ protected:
uint16_t mstpcr;
uint8_t syscr;
- h8s2245_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, uint32_t start);
+ h8s2245_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, uint32_t start);
virtual bool exr_in_stack() const override;
virtual void update_irq_filter() override;
@@ -91,17 +91,17 @@ protected:
class h8s2241_device : public h8s2245_device {
public:
- h8s2241_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ h8s2241_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
};
class h8s2242_device : public h8s2245_device {
public:
- h8s2242_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ h8s2242_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
};
class h8s2246_device : public h8s2245_device {
public:
- h8s2246_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ h8s2246_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
};
DECLARE_DEVICE_TYPE(H8S2241, h8s2241_device)
diff --git a/src/devices/cpu/h8/h8s2320.cpp b/src/devices/cpu/h8/h8s2320.cpp
index 14cd0e0a396..8b359fa74f0 100644
--- a/src/devices/cpu/h8/h8s2320.cpp
+++ b/src/devices/cpu/h8/h8s2320.cpp
@@ -14,7 +14,7 @@ DEFINE_DEVICE_TYPE(H8S2328, h8s2328_device, "h8s2328", "Hitachi H8S/2328")
DEFINE_DEVICE_TYPE(H8S2329, h8s2329_device, "h8s2329", "Hitachi H8S/2329")
-h8s2320_device::h8s2320_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, uint32_t start) :
+h8s2320_device::h8s2320_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, uint32_t start) :
h8s2000_device(mconfig, type, tag, owner, clock, address_map_constructor(FUNC(h8s2320_device::map), this)),
intc(*this, "intc"),
adc(*this, "adc"),
@@ -53,47 +53,47 @@ h8s2320_device::h8s2320_device(const machine_config &mconfig, device_type type,
{
}
-h8s2320_device::h8s2320_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+h8s2320_device::h8s2320_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
h8s2320_device(mconfig, H8S2320, tag, owner, clock, 0xffec00)
{
}
-h8s2321_device::h8s2321_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+h8s2321_device::h8s2321_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
h8s2320_device(mconfig, H8S2321, tag, owner, clock, 0xffec00)
{
}
-h8s2322_device::h8s2322_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+h8s2322_device::h8s2322_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
h8s2320_device(mconfig, H8S2322, tag, owner, clock, 0xffdc00)
{
}
-h8s2323_device::h8s2323_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+h8s2323_device::h8s2323_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
h8s2320_device(mconfig, H8S2323, tag, owner, clock, 0xffdc00)
{
}
-h8s2324_device::h8s2324_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+h8s2324_device::h8s2324_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
h8s2320_device(mconfig, H8S2324, tag, owner, clock, 0xff7c00)
{
}
-h8s2326_device::h8s2326_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+h8s2326_device::h8s2326_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
h8s2320_device(mconfig, H8S2326, tag, owner, clock, 0xffdc00)
{
}
-h8s2327_device::h8s2327_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+h8s2327_device::h8s2327_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
h8s2320_device(mconfig, H8S2327, tag, owner, clock, 0xffdc00)
{
}
-h8s2328_device::h8s2328_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+h8s2328_device::h8s2328_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
h8s2320_device(mconfig, H8S2328, tag, owner, clock, 0xffdc00)
{
}
-h8s2329_device::h8s2329_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+h8s2329_device::h8s2329_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
h8s2320_device(mconfig, H8S2329, tag, owner, clock, 0xff7c00)
{
}
diff --git a/src/devices/cpu/h8/h8s2320.h b/src/devices/cpu/h8/h8s2320.h
index 4ea272d283f..ef8da4a9303 100644
--- a/src/devices/cpu/h8/h8s2320.h
+++ b/src/devices/cpu/h8/h8s2320.h
@@ -41,7 +41,7 @@
class h8s2320_device : public h8s2000_device {
public:
- h8s2320_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ h8s2320_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
uint8_t syscr_r();
void syscr_w(uint8_t data);
@@ -83,7 +83,7 @@ protected:
uint32_t ram_start;
uint8_t syscr;
- h8s2320_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, uint32_t start);
+ h8s2320_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, uint32_t start);
virtual bool exr_in_stack() const override;
virtual void update_irq_filter() override;
@@ -102,42 +102,42 @@ protected:
class h8s2321_device : public h8s2320_device {
public:
- h8s2321_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ h8s2321_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
};
class h8s2322_device : public h8s2320_device {
public:
- h8s2322_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ h8s2322_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
};
class h8s2323_device : public h8s2320_device {
public:
- h8s2323_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ h8s2323_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
};
class h8s2324_device : public h8s2320_device {
public:
- h8s2324_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ h8s2324_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
};
class h8s2326_device : public h8s2320_device {
public:
- h8s2326_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ h8s2326_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
};
class h8s2327_device : public h8s2320_device {
public:
- h8s2327_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ h8s2327_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
};
class h8s2328_device : public h8s2320_device {
public:
- h8s2328_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ h8s2328_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
};
class h8s2329_device : public h8s2320_device {
public:
- h8s2329_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ h8s2329_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
};
DECLARE_DEVICE_TYPE(H8S2320, h8s2320_device)
diff --git a/src/devices/cpu/h8/h8s2357.cpp b/src/devices/cpu/h8/h8s2357.cpp
index eda704291c5..2bef42912f6 100644
--- a/src/devices/cpu/h8/h8s2357.cpp
+++ b/src/devices/cpu/h8/h8s2357.cpp
@@ -10,7 +10,7 @@ DEFINE_DEVICE_TYPE(H8S2394, h8s2394_device, "h8s2394", "Hitachi H8S/2394")
DEFINE_DEVICE_TYPE(H8S2392, h8s2392_device, "h8s2392", "Hitachi H8S/2392")
DEFINE_DEVICE_TYPE(H8S2390, h8s2390_device, "h8s2390", "Hitachi H8S/2390")
-h8s2357_device::h8s2357_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, uint32_t start) :
+h8s2357_device::h8s2357_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, uint32_t start) :
h8s2000_device(mconfig, type, tag, owner, clock, address_map_constructor(FUNC(h8s2357_device::map), this)),
intc(*this, "intc"),
adc(*this, "adc"),
@@ -45,32 +45,32 @@ h8s2357_device::h8s2357_device(const machine_config &mconfig, device_type type,
{
}
-h8s2357_device::h8s2357_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+h8s2357_device::h8s2357_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
h8s2357_device(mconfig, H8S2357, tag, owner, clock, 0xffdc00)
{
}
-h8s2352_device::h8s2352_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+h8s2352_device::h8s2352_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
h8s2357_device(mconfig, H8S2352, tag, owner, clock, 0xffdc00)
{
}
-h8s2398_device::h8s2398_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+h8s2398_device::h8s2398_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
h8s2357_device(mconfig, H8S2398, tag, owner, clock, 0xffdc00)
{
}
-h8s2394_device::h8s2394_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+h8s2394_device::h8s2394_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
h8s2357_device(mconfig, H8S2394, tag, owner, clock, 0xff7c00)
{
}
-h8s2392_device::h8s2392_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+h8s2392_device::h8s2392_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
h8s2357_device(mconfig, H8S2392, tag, owner, clock, 0xffdc00)
{
}
-h8s2390_device::h8s2390_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+h8s2390_device::h8s2390_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
h8s2357_device(mconfig, H8S2390, tag, owner, clock, 0xffec00)
{
}
diff --git a/src/devices/cpu/h8/h8s2357.h b/src/devices/cpu/h8/h8s2357.h
index 3f20c062d01..cfd7f3bb8e7 100644
--- a/src/devices/cpu/h8/h8s2357.h
+++ b/src/devices/cpu/h8/h8s2357.h
@@ -36,7 +36,7 @@
class h8s2357_device : public h8s2000_device {
public:
- h8s2357_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ h8s2357_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
uint8_t syscr_r();
void syscr_w(uint8_t data);
@@ -74,7 +74,7 @@ protected:
uint32_t ram_start;
unsigned char syscr;
- h8s2357_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, uint32_t start);
+ h8s2357_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, uint32_t start);
virtual bool exr_in_stack() const override;
virtual void update_irq_filter() override;
@@ -93,27 +93,27 @@ protected:
class h8s2352_device : public h8s2357_device {
public:
- h8s2352_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ h8s2352_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
};
class h8s2398_device : public h8s2357_device {
public:
- h8s2398_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ h8s2398_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
};
class h8s2394_device : public h8s2357_device {
public:
- h8s2394_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ h8s2394_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
};
class h8s2392_device : public h8s2357_device {
public:
- h8s2392_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ h8s2392_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
};
class h8s2390_device : public h8s2357_device {
public:
- h8s2390_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ h8s2390_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
};
DECLARE_DEVICE_TYPE(H8S2357, h8s2357_device)
diff --git a/src/devices/cpu/h8/h8s2600.cpp b/src/devices/cpu/h8/h8s2600.cpp
index be04b3382df..1cc751757dd 100644
--- a/src/devices/cpu/h8/h8s2600.cpp
+++ b/src/devices/cpu/h8/h8s2600.cpp
@@ -4,7 +4,7 @@
#include "h8s2600.h"
#include "h8s2600d.h"
-h8s2600_device::h8s2600_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, address_map_constructor map_delegate) :
+h8s2600_device::h8s2600_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, address_map_constructor map_delegate) :
h8s2000_device(mconfig, type, tag, owner, clock, map_delegate)
{
has_mac = true;
diff --git a/src/devices/cpu/h8/h8s2600.h b/src/devices/cpu/h8/h8s2600.h
index 84c611dd8f7..dd323c3f85f 100644
--- a/src/devices/cpu/h8/h8s2600.h
+++ b/src/devices/cpu/h8/h8s2600.h
@@ -20,7 +20,7 @@
class h8s2600_device : public h8s2000_device {
protected:
- h8s2600_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, address_map_constructor map_delegate);
+ h8s2600_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, address_map_constructor map_delegate);
virtual std::unique_ptr<util::disasm_interface> create_disassembler() override;
diff --git a/src/devices/cpu/h8/h8s2655.cpp b/src/devices/cpu/h8/h8s2655.cpp
index eb29b29bdc3..c6dab386354 100644
--- a/src/devices/cpu/h8/h8s2655.cpp
+++ b/src/devices/cpu/h8/h8s2655.cpp
@@ -6,7 +6,7 @@
DEFINE_DEVICE_TYPE(H8S2655, h8s2655_device, "h8s2655", "Hitachi H8S/2655")
DEFINE_DEVICE_TYPE(H8S2653, h8s2653_device, "h8s2653", "Hitachi H8S/2653")
-h8s2655_device::h8s2655_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+h8s2655_device::h8s2655_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) :
h8s2600_device(mconfig, type, tag, owner, clock, address_map_constructor(FUNC(h8s2655_device::map), this)),
intc(*this, "intc"),
adc(*this, "adc"),
@@ -41,13 +41,13 @@ h8s2655_device::h8s2655_device(const machine_config &mconfig, device_type type,
has_trace = true;
}
-h8s2655_device::h8s2655_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+h8s2655_device::h8s2655_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
h8s2655_device(mconfig, H8S2655, tag, owner, clock)
{
}
-h8s2653_device::h8s2653_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+h8s2653_device::h8s2653_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
h8s2655_device(mconfig, H8S2653, tag, owner, clock)
{
}
diff --git a/src/devices/cpu/h8/h8s2655.h b/src/devices/cpu/h8/h8s2655.h
index aa8384bce73..b8854f9d397 100644
--- a/src/devices/cpu/h8/h8s2655.h
+++ b/src/devices/cpu/h8/h8s2655.h
@@ -28,7 +28,7 @@
class h8s2655_device : public h8s2600_device {
public:
- h8s2655_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ h8s2655_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
uint8_t syscr_r();
void syscr_w(uint8_t data);
@@ -65,7 +65,7 @@ protected:
uint8_t syscr;
- h8s2655_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ h8s2655_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
virtual bool exr_in_stack() const override;
virtual void update_irq_filter() override;
@@ -84,7 +84,7 @@ protected:
class h8s2653_device : public h8s2655_device {
public:
- h8s2653_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ h8s2653_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
};
DECLARE_DEVICE_TYPE(H8S2655, h8s2655_device)