diff options
author | 2022-06-16 12:47:52 +0200 | |
---|---|---|
committer | 2025-04-29 23:06:41 +0200 | |
commit | 45d4cd52a8194f2ef9e0383cfb2e2a35634af6ff (patch) | |
tree | 4e8d8fcb7382a5e9e0bce5ec59939bcfbe67155a /src/devices/cpu/z180 | |
parent | 5c14bcdfcb4aefb71b5b62387c4ad05dbeb3814e (diff) |
full xtal conversionxtal
Diffstat (limited to 'src/devices/cpu/z180')
-rw-r--r-- | src/devices/cpu/z180/hd647180x.cpp | 2 | ||||
-rw-r--r-- | src/devices/cpu/z180/hd647180x.h | 2 | ||||
-rw-r--r-- | src/devices/cpu/z180/z180.cpp | 12 | ||||
-rw-r--r-- | src/devices/cpu/z180/z180.h | 12 | ||||
-rw-r--r-- | src/devices/cpu/z180/z180asci.cpp | 14 | ||||
-rw-r--r-- | src/devices/cpu/z180/z180asci.h | 14 |
6 files changed, 28 insertions, 28 deletions
diff --git a/src/devices/cpu/z180/hd647180x.cpp b/src/devices/cpu/z180/hd647180x.cpp index cc70b0781a8..e568245f637 100644 --- a/src/devices/cpu/z180/hd647180x.cpp +++ b/src/devices/cpu/z180/hd647180x.cpp @@ -31,7 +31,7 @@ // device type definition DEFINE_DEVICE_TYPE(HD647180X, hd647180x_device, "hd647180x", "Hitachi HD647180X MCU") -hd647180x_device::hd647180x_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +hd647180x_device::hd647180x_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : z180_device(mconfig, HD647180X, tag, owner, clock, true, address_map_constructor(FUNC(hd647180x_device::internal_map), this)) , m_port_input_cb(*this) , m_port_output_cb(*this) diff --git a/src/devices/cpu/z180/hd647180x.h b/src/devices/cpu/z180/hd647180x.h index 22d4212b4af..e5d816b2b1e 100644 --- a/src/devices/cpu/z180/hd647180x.h +++ b/src/devices/cpu/z180/hd647180x.h @@ -25,7 +25,7 @@ public: }; // construction/destruction - hd647180x_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + hd647180x_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); auto in_pa_callback() { return m_port_input_cb[0].bind(); } auto in_pb_callback() { return m_port_input_cb[1].bind(); } diff --git a/src/devices/cpu/z180/z180.cpp b/src/devices/cpu/z180/z180.cpp index db7b4a3026b..c70c23c3ce6 100644 --- a/src/devices/cpu/z180/z180.cpp +++ b/src/devices/cpu/z180/z180.cpp @@ -87,7 +87,7 @@ DEFINE_DEVICE_TYPE(Z8S180, z8s180_device, "z8s180", "Zilog Z8S180") // enhanced DEFINE_DEVICE_TYPE(Z80182, z80182_device, "z80182", "Zilog Z80182") // further enhanced Z8S180 -z180_device::z180_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, bool extended_io, address_map_constructor internal_map) +z180_device::z180_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, bool extended_io, address_map_constructor internal_map) : cpu_device(mconfig, type, tag, owner, clock) , z80_daisy_chain_interface(mconfig, *this) , m_program_config("program", ENDIANNESS_LITTLE, 8, 20, 0, 16, 12, internal_map) @@ -114,29 +114,29 @@ std::unique_ptr<util::disasm_interface> z180_device::create_disassembler() return std::make_unique<z180_disassembler>(); } -z80180_device::z80180_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +z80180_device::z80180_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : z180_device(mconfig, Z80180, tag, owner, clock, false, address_map_constructor()) { } -hd64180rp_device::hd64180rp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +hd64180rp_device::hd64180rp_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : z180_device(mconfig, HD64180RP, tag, owner, clock, false, address_map_constructor()) { // 64-pin DIP versions omit A19 set_address_width(19); } -z8s180_device::z8s180_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +z8s180_device::z8s180_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : z180_device(mconfig, type, tag, owner, clock, false, address_map_constructor()) { } -z8s180_device::z8s180_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +z8s180_device::z8s180_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : z8s180_device(mconfig, Z8S180, tag, owner, clock) { } -z80182_device::z80182_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +z80182_device::z80182_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : z8s180_device(mconfig, Z80182, tag, owner, clock) { } diff --git a/src/devices/cpu/z180/z180.h b/src/devices/cpu/z180/z180.h index 62213845b05..8ec6d2af297 100644 --- a/src/devices/cpu/z180/z180.h +++ b/src/devices/cpu/z180/z180.h @@ -126,7 +126,7 @@ public: protected: // construction/destruction - z180_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, bool extended_io, address_map_constructor internal_map); + z180_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, bool extended_io, address_map_constructor internal_map); // device-level overrides virtual void device_start() override; @@ -1810,24 +1810,24 @@ class z80180_device : public z180_device { public: // construction/destruction - z80180_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + z80180_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); }; class hd64180rp_device : public z180_device { public: // construction/destruction - hd64180rp_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + hd64180rp_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); }; class z8s180_device : public z180_device { public: // construction/destruction - z8s180_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + z8s180_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: - z8s180_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + z8s180_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); // device-level overrides virtual void device_start() override; @@ -1851,7 +1851,7 @@ class z80182_device : public z8s180_device { public: // construction/destruction - z80182_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + z80182_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); }; DECLARE_DEVICE_TYPE(Z80180, z80180_device) diff --git a/src/devices/cpu/z180/z180asci.cpp b/src/devices/cpu/z180/z180asci.cpp index 3abf9683bc8..e4f919f01c5 100644 --- a/src/devices/cpu/z180/z180asci.cpp +++ b/src/devices/cpu/z180/z180asci.cpp @@ -65,7 +65,7 @@ static constexpr u8 Z180_ASEXT1_MASK = 0x1f; // z180asci_channel_base //************************************************************************** -z180asci_channel_base::z180asci_channel_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, const int id, const bool ext) +z180asci_channel_base::z180asci_channel_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, const int id, const bool ext) : device_t(mconfig, type, tag, owner, clock) , m_rcv_clock(nullptr) , m_tra_clock(nullptr) @@ -580,12 +580,12 @@ void z180asci_channel_base::output_rts(int rts) // z180asci_channel_0 //************************************************************************** -z180asci_channel_0::z180asci_channel_0(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, const bool ext) +z180asci_channel_0::z180asci_channel_0(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, const bool ext) : z180asci_channel_base(mconfig, type, tag, owner, clock, 0, ext) { } -z180asci_channel_0::z180asci_channel_0(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +z180asci_channel_0::z180asci_channel_0(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : z180asci_channel_0(mconfig, Z180ASCI_CHANNEL_0, tag, owner, clock, false) { } @@ -629,12 +629,12 @@ void z180asci_channel_0::asext_w(uint8_t data) // z180asci_channel_1 //************************************************************************** -z180asci_channel_1::z180asci_channel_1(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, const bool ext) +z180asci_channel_1::z180asci_channel_1(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, const bool ext) : z180asci_channel_base(mconfig, type, tag, owner, clock, 1, ext) { } -z180asci_channel_1::z180asci_channel_1(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +z180asci_channel_1::z180asci_channel_1(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : z180asci_channel_1(mconfig, Z180ASCI_CHANNEL_1, tag, owner, clock, false) { } @@ -677,7 +677,7 @@ void z180asci_channel_1::asext_w(uint8_t data) // z180asci_ext_channel_0 //************************************************************************** -z180asci_ext_channel_0::z180asci_ext_channel_0(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +z180asci_ext_channel_0::z180asci_ext_channel_0(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : z180asci_channel_0(mconfig, Z180ASCI_EXT_CHANNEL_0, tag, owner, clock, true) { } @@ -686,7 +686,7 @@ z180asci_ext_channel_0::z180asci_ext_channel_0(const machine_config &mconfig, co // z180asci_channel_1 //************************************************************************** -z180asci_ext_channel_1::z180asci_ext_channel_1(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +z180asci_ext_channel_1::z180asci_ext_channel_1(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : z180asci_channel_1(mconfig, Z180ASCI_EXT_CHANNEL_1, tag, owner, clock, true) { } diff --git a/src/devices/cpu/z180/z180asci.h b/src/devices/cpu/z180/z180asci.h index 3794fe635a8..975297cce8f 100644 --- a/src/devices/cpu/z180/z180asci.h +++ b/src/devices/cpu/z180/z180asci.h @@ -50,7 +50,7 @@ public: int check_interrupt() { return m_irq; } void clear_interrupt() { m_irq = 0; } protected: - z180asci_channel_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, const int id, const bool ext); + z180asci_channel_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, const int id, const bool ext); // device-level overrides virtual void device_start() override; @@ -136,13 +136,13 @@ class z180asci_channel_0 : public z180asci_channel_base { public: // construction/destruction - z180asci_channel_0(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + z180asci_channel_0(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); void stat_w(uint8_t data) override; void asext_w(uint8_t data) override; void state_add(device_state_interface &parent) override; protected: - z180asci_channel_0(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, const bool ext); + z180asci_channel_0(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, const bool ext); // device-level overrides virtual void device_reset() override; }; @@ -155,13 +155,13 @@ class z180asci_channel_1 : public z180asci_channel_base { public: // construction/destruction - z180asci_channel_1(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + z180asci_channel_1(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); void stat_w(uint8_t data) override; void asext_w(uint8_t data) override; void state_add(device_state_interface &parent) override; protected: - z180asci_channel_1(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, const bool ext); + z180asci_channel_1(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock, const bool ext); // device-level overrides virtual void device_reset() override; }; @@ -174,7 +174,7 @@ class z180asci_ext_channel_0 : public z180asci_channel_0 { public: // construction/destruction - z180asci_ext_channel_0(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + z180asci_ext_channel_0(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); }; //************************************************************************** @@ -185,7 +185,7 @@ class z180asci_ext_channel_1 : public z180asci_channel_1 { public: // construction/destruction - z180asci_ext_channel_1(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + z180asci_ext_channel_1(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); }; //************************************************************************** |