summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/cpu/upd78k
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/upd78k
parent5c14bcdfcb4aefb71b5b62387c4ad05dbeb3814e (diff)
full xtal conversionxtal
Diffstat (limited to 'src/devices/cpu/upd78k')
-rw-r--r--src/devices/cpu/upd78k/upd78k0.cpp4
-rw-r--r--src/devices/cpu/upd78k/upd78k0.h8
-rw-r--r--src/devices/cpu/upd78k/upd78k2.cpp6
-rw-r--r--src/devices/cpu/upd78k/upd78k2.h6
-rw-r--r--src/devices/cpu/upd78k/upd78k3.cpp8
-rw-r--r--src/devices/cpu/upd78k/upd78k3.h8
-rw-r--r--src/devices/cpu/upd78k/upd78k4.cpp4
-rw-r--r--src/devices/cpu/upd78k/upd78k4.h4
8 files changed, 24 insertions, 24 deletions
diff --git a/src/devices/cpu/upd78k/upd78k0.cpp b/src/devices/cpu/upd78k/upd78k0.cpp
index f1f48402226..b909b681a35 100644
--- a/src/devices/cpu/upd78k/upd78k0.cpp
+++ b/src/devices/cpu/upd78k/upd78k0.cpp
@@ -23,7 +23,7 @@ DEFINE_DEVICE_TYPE(UPD78053, upd78053_device, "upd78053", "NEC uPD78053")
// upd78k0_device - constructor
//-------------------------------------------------
-upd78k0_device::upd78k0_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, u16 iram_size, address_map_constructor mem_map, address_map_constructor sfr_map)
+upd78k0_device::upd78k0_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, u16 iram_size, address_map_constructor mem_map, address_map_constructor sfr_map)
: cpu_device(mconfig, type, tag, owner, clock)
, m_program_config("program", ENDIANNESS_LITTLE, 8, 16, 0, mem_map)
, m_iram_config("iram", ENDIANNESS_LITTLE, 16, iram_size > 0x200 ? 10 : iram_size > 0x100 ? 9 : 8, 0,
@@ -192,7 +192,7 @@ void upd78k0_device::state_string_export(const device_state_entry &entry, std::s
// upd78053_device - constructor
//-------------------------------------------------
-upd78053_device::upd78053_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+upd78053_device::upd78053_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: upd78k0_device(mconfig, UPD78053, tag, owner, clock, 0x400,
address_map_constructor(FUNC(upd78053_device::mem_map), this),
address_map_constructor(FUNC(upd78053_device::sfr_map), this))
diff --git a/src/devices/cpu/upd78k/upd78k0.h b/src/devices/cpu/upd78k/upd78k0.h
index 566dfab340f..7fb6feb8597 100644
--- a/src/devices/cpu/upd78k/upd78k0.h
+++ b/src/devices/cpu/upd78k/upd78k0.h
@@ -29,11 +29,11 @@ public:
};
// configuration (TODO: callbacks)
- void set_subclock(u32 clock) { m_subclock = clock; }
+ void set_subclock(const XTAL &clock) { m_subclock = clock; }
void set_subclock(const XTAL &xtal) { m_subclock = xtal.value(); }
protected:
- upd78k0_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, u16 iram_size, address_map_constructor mem_map, address_map_constructor sfr_map);
+ upd78k0_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, u16 iram_size, address_map_constructor mem_map, address_map_constructor sfr_map);
// device-level overrides
virtual void device_start() override;
@@ -83,9 +83,9 @@ class upd78053_device : public upd78k0_device
{
public:
// device type constructors
- upd78053_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ upd78053_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
template <typename X>
- upd78053_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock, X &&subclock)
+ upd78053_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock, X &&subclock)
: upd78053_device(mconfig, tag, owner, clock)
{
set_subclock(std::forward<X>(subclock));
diff --git a/src/devices/cpu/upd78k/upd78k2.cpp b/src/devices/cpu/upd78k/upd78k2.cpp
index b8c784e20e8..5915b057698 100644
--- a/src/devices/cpu/upd78k/upd78k2.cpp
+++ b/src/devices/cpu/upd78k/upd78k2.cpp
@@ -24,7 +24,7 @@ DEFINE_DEVICE_TYPE(UPD78213, upd78213_device, "upd78213", "NEC uPD78213")
// upd78k2_device - constructor
//-------------------------------------------------
-upd78k2_device::upd78k2_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, int iram_bits, address_map_constructor mem_map, address_map_constructor sfr_map)
+upd78k2_device::upd78k2_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, int iram_bits, address_map_constructor mem_map, address_map_constructor sfr_map)
: cpu_device(mconfig, type, tag, owner, clock)
, m_program_config("program", ENDIANNESS_LITTLE, 8, 20, 0, mem_map)
, m_iram_config("iram", ENDIANNESS_LITTLE, 16, iram_bits, 0, address_map_constructor(FUNC(upd78k2_device::iram_map), this))
@@ -175,7 +175,7 @@ void upd78k2_device::state_string_export(const device_state_entry &entry, std::s
// upd78210_device - constructor
//-------------------------------------------------
-upd78210_device::upd78210_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+upd78210_device::upd78210_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: upd78k2_device(mconfig, UPD78210, tag, owner, clock, 7,
address_map_constructor(),
address_map_constructor(FUNC(upd78210_device::sfr_map), this))
@@ -207,7 +207,7 @@ void upd78210_device::sfr_map(address_map &map)
// upd78213_device - constructor
//-------------------------------------------------
-upd78213_device::upd78213_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+upd78213_device::upd78213_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: upd78k2_device(mconfig, UPD78213, tag, owner, clock, 8,
address_map_constructor(FUNC(upd78213_device::mem_map), this),
address_map_constructor(FUNC(upd78213_device::sfr_map), this))
diff --git a/src/devices/cpu/upd78k/upd78k2.h b/src/devices/cpu/upd78k/upd78k2.h
index c0a8e07b825..f2391873410 100644
--- a/src/devices/cpu/upd78k/upd78k2.h
+++ b/src/devices/cpu/upd78k/upd78k2.h
@@ -32,7 +32,7 @@ public:
// TODO: callbacks and configuration thereof
protected:
- upd78k2_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, int iram_bits, address_map_constructor mem_map, address_map_constructor sfr_map);
+ upd78k2_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, int iram_bits, address_map_constructor mem_map, address_map_constructor sfr_map);
// device-level overrides
virtual void device_start() override;
@@ -80,7 +80,7 @@ class upd78210_device : public upd78k2_device
{
public:
// device type constructor
- upd78210_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ upd78210_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device_disasm_interface overrides
@@ -97,7 +97,7 @@ class upd78213_device : public upd78k2_device
{
public:
// device type constructor
- upd78213_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ upd78213_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device_disasm_interface overrides
diff --git a/src/devices/cpu/upd78k/upd78k3.cpp b/src/devices/cpu/upd78k/upd78k3.cpp
index e4a4a6daae5..e548bbbc010 100644
--- a/src/devices/cpu/upd78k/upd78k3.cpp
+++ b/src/devices/cpu/upd78k/upd78k3.cpp
@@ -24,7 +24,7 @@ DEFINE_DEVICE_TYPE(UPD78312, upd78312_device, "upd78312", "NEC uPD78312")
// upd78k3_device - constructor
//-------------------------------------------------
-upd78k3_device::upd78k3_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, address_map_constructor mem_map, address_map_constructor sfr_map)
+upd78k3_device::upd78k3_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 sfr_map)
: cpu_device(mconfig, type, tag, owner, clock)
, m_program_config("program", ENDIANNESS_LITTLE, 8, 16, 0, mem_map)
, m_iram_config("iram", ENDIANNESS_LITTLE, 16, 8, 0, address_map_constructor(FUNC(upd78k3_device::iram_map), this))
@@ -264,12 +264,12 @@ void upd78k3_device::state_string_export(const device_state_entry &entry, std::s
// upd78312_device - constructor
//-------------------------------------------------
-upd78312_device::upd78312_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+upd78312_device::upd78312_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: upd78312_device(mconfig, UPD78312, tag, owner, clock, address_map_constructor(FUNC(upd78312_device::mem_map), this))
{
}
-upd78312_device::upd78312_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, address_map_constructor map)
+upd78312_device::upd78312_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, address_map_constructor map)
: upd78k3_device(mconfig, type, tag, owner, clock, map,
address_map_constructor(FUNC(upd78312_device::sfr_map), this))
{
@@ -280,7 +280,7 @@ upd78312_device::upd78312_device(const machine_config &mconfig, device_type type
// upd78310_device - constructor
//-------------------------------------------------
-upd78310_device::upd78310_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+upd78310_device::upd78310_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: upd78312_device(mconfig, UPD78310, tag, owner, clock, address_map_constructor())
{
}
diff --git a/src/devices/cpu/upd78k/upd78k3.h b/src/devices/cpu/upd78k/upd78k3.h
index 22867376847..e8c2f8002fb 100644
--- a/src/devices/cpu/upd78k/upd78k3.h
+++ b/src/devices/cpu/upd78k/upd78k3.h
@@ -39,7 +39,7 @@ public:
// TODO: callbacks and configuration thereof
protected:
- upd78k3_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, address_map_constructor mem_map, address_map_constructor sfr_map);
+ upd78k3_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 sfr_map);
// device-level overrides
virtual void device_start() override;
@@ -96,10 +96,10 @@ class upd78312_device : public upd78k3_device
{
public:
// device type constructor
- upd78312_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ upd78312_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- upd78312_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, address_map_constructor map);
+ upd78312_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, address_map_constructor map);
// device_disasm_interface overrides
virtual std::unique_ptr<util::disasm_interface> create_disassembler() override;
@@ -122,7 +122,7 @@ class upd78310_device : public upd78312_device
{
public:
// device type constructor
- upd78310_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ upd78310_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
};
// device type declarations
diff --git a/src/devices/cpu/upd78k/upd78k4.cpp b/src/devices/cpu/upd78k/upd78k4.cpp
index 0aad7b0660a..1ef4438a76d 100644
--- a/src/devices/cpu/upd78k/upd78k4.cpp
+++ b/src/devices/cpu/upd78k/upd78k4.cpp
@@ -23,7 +23,7 @@ DEFINE_DEVICE_TYPE(UPD784031, upd784031_device, "upd784031", "NEC uPD784031")
// upd78k4_device - constructor
//-------------------------------------------------
-upd78k4_device::upd78k4_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, address_map_constructor mem_map, address_map_constructor sfr_map)
+upd78k4_device::upd78k4_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 sfr_map)
: cpu_device(mconfig, type, tag, owner, clock)
, m_program_config("program", ENDIANNESS_LITTLE, 8, 20, 0, mem_map)
, m_iram_config("iram", ENDIANNESS_LITTLE, 16, 9, 0, address_map_constructor(FUNC(upd78k4_device::iram_map), this))
@@ -234,7 +234,7 @@ void upd78k4_device::state_string_export(const device_state_entry &entry, std::s
// upd784031_device - constructor
//-------------------------------------------------
-upd784031_device::upd784031_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+upd784031_device::upd784031_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: upd78k4_device(mconfig, UPD784031, tag, owner, clock,
address_map_constructor(FUNC(upd784031_device::sfr_map), this),
address_map_constructor(FUNC(upd784031_device::sfr_map), this))
diff --git a/src/devices/cpu/upd78k/upd78k4.h b/src/devices/cpu/upd78k/upd78k4.h
index 435600b563c..1c2e12830f8 100644
--- a/src/devices/cpu/upd78k/upd78k4.h
+++ b/src/devices/cpu/upd78k/upd78k4.h
@@ -41,7 +41,7 @@ public:
// TODO: callbacks and configuration thereof
protected:
- upd78k4_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock, address_map_constructor mem_map, address_map_constructor sfr_map);
+ upd78k4_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 sfr_map);
// device-level overrides
virtual void device_start() override;
@@ -92,7 +92,7 @@ class upd784031_device : public upd78k4_device
{
public:
// device type constructor
- upd784031_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ upd784031_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device_disasm_interface overrides