summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/rc2014
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/rc2014')
-rw-r--r--src/devices/bus/rc2014/cf.cpp4
-rw-r--r--src/devices/bus/rc2014/clock.cpp20
-rw-r--r--src/devices/bus/rc2014/edge.cpp24
-rw-r--r--src/devices/bus/rc2014/fdc.cpp8
-rw-r--r--src/devices/bus/rc2014/ide.cpp14
-rw-r--r--src/devices/bus/rc2014/micro.cpp10
-rw-r--r--src/devices/bus/rc2014/ram.cpp16
-rw-r--r--src/devices/bus/rc2014/rc2014.cpp22
-rw-r--r--src/devices/bus/rc2014/rc2014.h22
-rw-r--r--src/devices/bus/rc2014/rom.cpp8
-rw-r--r--src/devices/bus/rc2014/romram.cpp8
-rw-r--r--src/devices/bus/rc2014/rtc.cpp4
-rw-r--r--src/devices/bus/rc2014/serial.cpp20
-rw-r--r--src/devices/bus/rc2014/sound.cpp16
-rw-r--r--src/devices/bus/rc2014/z180cpu.cpp8
-rw-r--r--src/devices/bus/rc2014/z80cpu.cpp12
16 files changed, 108 insertions, 108 deletions
diff --git a/src/devices/bus/rc2014/cf.cpp b/src/devices/bus/rc2014/cf.cpp
index 9640853da86..a40380f45f0 100644
--- a/src/devices/bus/rc2014/cf.cpp
+++ b/src/devices/bus/rc2014/cf.cpp
@@ -21,7 +21,7 @@ class compact_flash_device : public device_t, public device_rc2014_card_interfac
{
public:
// construction/destruction
- compact_flash_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ compact_flash_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
@@ -37,7 +37,7 @@ private:
required_device<ata_interface_device> m_ata;
};
-compact_flash_device::compact_flash_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+compact_flash_device::compact_flash_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, RC2014_COMPACT_FLASH, tag, owner, clock)
, device_rc2014_card_interface(mconfig, *this)
, m_ata(*this, "ata")
diff --git a/src/devices/bus/rc2014/clock.cpp b/src/devices/bus/rc2014/clock.cpp
index bb73143edc2..dbbb097d7c6 100644
--- a/src/devices/bus/rc2014/clock.cpp
+++ b/src/devices/bus/rc2014/clock.cpp
@@ -21,7 +21,7 @@ class single_clock_device : public device_t, public device_rc2014_card_interface
{
public:
// construction/destruction
- single_clock_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ single_clock_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
@@ -31,7 +31,7 @@ protected:
DECLARE_WRITE_LINE_MEMBER( clk_w ) { m_bus->clk_w(state); }
};
-single_clock_device::single_clock_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+single_clock_device::single_clock_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, RC2014_SINGLE_CLOCK, tag, owner, clock)
, device_rc2014_card_interface(mconfig, *this)
{
@@ -61,7 +61,7 @@ class dual_clock_base : public device_t
{
protected:
// construction/destruction
- dual_clock_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock);
+ dual_clock_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
// device-level overrides
virtual void device_start() override;
@@ -79,7 +79,7 @@ protected:
required_ioport m_clk_sel_2;
};
-dual_clock_base::dual_clock_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock)
+dual_clock_base::dual_clock_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, type, tag, owner, clock)
, m_clock_1(*this, "clock1")
, m_clock_2(*this, "clock2")
@@ -151,10 +151,10 @@ ioport_constructor dual_clock_base::device_input_ports() const
void dual_clock_base::device_add_mconfig(machine_config &config)
{
- CLOCK(config, m_clock_1, 0);
+ CLOCK(config, m_clock_1);
m_clock_1->signal_handler().set(FUNC(dual_clock_base::clk_w));
- CLOCK(config, m_clock_2, 0);
+ CLOCK(config, m_clock_2);
m_clock_2->signal_handler().set(FUNC(dual_clock_base::clk2_w));
}
@@ -166,7 +166,7 @@ class dual_clock_device : public dual_clock_base, public device_rc2014_ext_card_
{
public:
// construction/destruction
- dual_clock_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ dual_clock_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
@@ -177,7 +177,7 @@ protected:
DECLARE_WRITE_LINE_MEMBER( clk2_w ) override { m_bus->clk2_w(state); }
};
-dual_clock_device::dual_clock_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+dual_clock_device::dual_clock_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: dual_clock_base(mconfig, RC2014_DUAL_CLOCK, tag, owner, clock)
, device_rc2014_ext_card_interface(mconfig, *this)
{
@@ -197,7 +197,7 @@ class dual_clock_device_40pin : public dual_clock_base, public device_rc2014_car
{
public:
// construction/destruction
- dual_clock_device_40pin(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ dual_clock_device_40pin(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
@@ -208,7 +208,7 @@ protected:
DECLARE_WRITE_LINE_MEMBER( clk2_w ) override { }
};
-dual_clock_device_40pin::dual_clock_device_40pin(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+dual_clock_device_40pin::dual_clock_device_40pin(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: dual_clock_base(mconfig, RC2014_DUAL_CLOCK_40P, tag, owner, clock)
, device_rc2014_card_interface(mconfig, *this)
{
diff --git a/src/devices/bus/rc2014/edge.cpp b/src/devices/bus/rc2014/edge.cpp
index 5585c790d17..94a5bbc7802 100644
--- a/src/devices/bus/rc2014/edge.cpp
+++ b/src/devices/bus/rc2014/edge.cpp
@@ -21,10 +21,10 @@ class sc106_device : public device_t, public device_rc2014_rc80_card_interface
{
public:
// construction/destruction
- sc106_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ sc106_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- sc106_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock);
+ sc106_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;
@@ -34,14 +34,14 @@ private:
required_device<rc2014_rc80_bus_device> m_rc80_bus;
};
-sc106_device::sc106_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock)
+sc106_device::sc106_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, type, tag, owner, clock)
, device_rc2014_rc80_card_interface(mconfig, *this)
, m_rc80_bus(*this, ":bus")
{
}
-sc106_device::sc106_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+sc106_device::sc106_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: sc106_device(mconfig, RC2014_SC106, tag, owner, clock)
{
}
@@ -73,10 +73,10 @@ class sc107_device : public sc106_device
{
public:
// construction/destruction
- sc107_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ sc107_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
};
-sc107_device::sc107_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+sc107_device::sc107_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: sc106_device(mconfig, RC2014_SC107, tag, owner, clock)
{
}
@@ -92,10 +92,10 @@ class sc113_device : public sc106_device
{
public:
// construction/destruction
- sc113_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ sc113_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
};
-sc113_device::sc113_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+sc113_device::sc113_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: sc106_device(mconfig, RC2014_SC113, tag, owner, clock)
{
}
@@ -109,7 +109,7 @@ class sc141_device : public device_t, public device_rc2014_card_interface
{
public:
// construction/destruction
- sc141_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ sc141_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
@@ -120,7 +120,7 @@ private:
required_device<rc2014_bus_device> m_rc40_bus;
};
-sc141_device::sc141_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+sc141_device::sc141_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, RC2014_SC141, tag, owner, clock)
, device_rc2014_card_interface(mconfig, *this)
, m_rc40_bus(*this, ":bus")
@@ -157,7 +157,7 @@ class sc147_device : public device_t, public device_rc2014_card_interface
{
public:
// construction/destruction
- sc147_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ sc147_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
@@ -168,7 +168,7 @@ private:
required_device<rc2014_bus_device> m_rc40_bus;
};
-sc147_device::sc147_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+sc147_device::sc147_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, RC2014_SC147, tag, owner, clock)
, device_rc2014_card_interface(mconfig, *this)
, m_rc40_bus(*this, ":bus")
diff --git a/src/devices/bus/rc2014/fdc.cpp b/src/devices/bus/rc2014/fdc.cpp
index ba8ce96d7ab..41cd7846744 100644
--- a/src/devices/bus/rc2014/fdc.cpp
+++ b/src/devices/bus/rc2014/fdc.cpp
@@ -25,7 +25,7 @@ class rc2014_fdc9266_device : public device_t, public device_rc2014_card_interfa
{
public:
// construction/destruction
- rc2014_fdc9266_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ rc2014_fdc9266_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
@@ -42,7 +42,7 @@ private:
required_device_array<floppy_connector, 2> m_floppy;
};
-rc2014_fdc9266_device::rc2014_fdc9266_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+rc2014_fdc9266_device::rc2014_fdc9266_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, RC2014_FDC9266, tag, owner, clock)
, device_rc2014_card_interface(mconfig, *this)
, m_addr(*this, "SV1")
@@ -151,7 +151,7 @@ class rc2014_wd37c65_device : public device_t, public device_rc2014_card_interfa
{
public:
// construction/destruction
- rc2014_wd37c65_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ rc2014_wd37c65_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
@@ -169,7 +169,7 @@ private:
required_device_array<floppy_connector, 2> m_floppy;
};
-rc2014_wd37c65_device::rc2014_wd37c65_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+rc2014_wd37c65_device::rc2014_wd37c65_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, RC2014_WD37C65, tag, owner, clock)
, device_rc2014_card_interface(mconfig, *this)
, m_addr(*this, "SV1")
diff --git a/src/devices/bus/rc2014/ide.cpp b/src/devices/bus/rc2014/ide.cpp
index e81a168cba6..9a4b580af5b 100644
--- a/src/devices/bus/rc2014/ide.cpp
+++ b/src/devices/bus/rc2014/ide.cpp
@@ -21,7 +21,7 @@ class rc2014_ide_base : public device_t, public device_rc2014_card_interface
{
protected:
// construction/destruction
- rc2014_ide_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock);
+ rc2014_ide_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
// device-level overrides
virtual void device_start() override;
@@ -41,7 +41,7 @@ protected:
uint8_t m_prev;
};
-rc2014_ide_base::rc2014_ide_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock)
+rc2014_ide_base::rc2014_ide_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, type, tag, owner, clock)
, device_rc2014_card_interface(mconfig, *this)
, m_ata(*this, "ata")
@@ -56,7 +56,7 @@ void rc2014_ide_base::device_start()
void rc2014_ide_base::device_add_mconfig(machine_config &config)
{
- I8255(config, m_ppi, 0);
+ I8255(config, m_ppi);
m_ppi->in_pa_callback().set(FUNC(rc2014_ide_base::ppi_pa_r));
m_ppi->in_pb_callback().set(FUNC(rc2014_ide_base::ppi_pb_r));
m_ppi->out_pa_callback().set(FUNC(rc2014_ide_base::ppi_pa_w));
@@ -75,7 +75,7 @@ class rc2014_82c55_ide_device : public rc2014_ide_base
{
public:
// construction/destruction
- rc2014_82c55_ide_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ rc2014_82c55_ide_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
@@ -93,7 +93,7 @@ private:
uint8_t m_dior;
};
-rc2014_82c55_ide_device::rc2014_82c55_ide_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+rc2014_82c55_ide_device::rc2014_82c55_ide_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: rc2014_ide_base(mconfig, RC2014_82C55_IDE, tag, owner, clock)
, m_sw(*this, "SW1")
, m_jp(*this, "JP%u", 1U)
@@ -206,7 +206,7 @@ class rc2014_ide_hdd_device : public rc2014_ide_base
{
public:
// construction/destruction
- rc2014_ide_hdd_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ rc2014_ide_hdd_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
@@ -218,7 +218,7 @@ private:
required_ioport m_jp;
};
-rc2014_ide_hdd_device::rc2014_ide_hdd_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+rc2014_ide_hdd_device::rc2014_ide_hdd_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: rc2014_ide_base(mconfig, RC2014_IDE_HDD, tag, owner, clock)
, m_jp(*this, "J1")
{
diff --git a/src/devices/bus/rc2014/micro.cpp b/src/devices/bus/rc2014/micro.cpp
index f818dcd8c7f..be085f2dbe1 100644
--- a/src/devices/bus/rc2014/micro.cpp
+++ b/src/devices/bus/rc2014/micro.cpp
@@ -27,7 +27,7 @@ class rc2014_micro : public device_t, public device_rc2014_card_interface
{
public:
// construction/destruction
- rc2014_micro(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ rc2014_micro(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
private:
// device-level overrides
@@ -55,7 +55,7 @@ private:
static constexpr XTAL MAIN_CLOCK = XTAL(7'372'800);
};
-rc2014_micro::rc2014_micro(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+rc2014_micro::rc2014_micro(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, RC2014_MICRO, tag, owner, clock)
, device_rc2014_card_interface(mconfig, *this)
, m_maincpu(*this, "maincpu")
@@ -121,7 +121,7 @@ void rc2014_micro::device_add_mconfig(machine_config &config)
clock.signal_handler().append(m_acia, FUNC(acia6850_device::write_txc));
clock.signal_handler().append(m_acia, FUNC(acia6850_device::write_rxc));
- ACIA6850(config, m_acia, 0);
+ ACIA6850(config, m_acia);
m_acia->txd_handler().set("rs232", FUNC(rs232_port_device::write_txd));
m_acia->txd_handler().append(FUNC(rc2014_micro::tx_w));
m_acia->rts_handler().set("rs232", FUNC(rs232_port_device::write_rts));
@@ -175,7 +175,7 @@ class rc2014_mini_cpm : public device_t, public device_rc2014_card_interface
{
public:
// construction/destruction
- rc2014_mini_cpm(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ rc2014_mini_cpm(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
@@ -209,7 +209,7 @@ private:
memory_bank_creator m_rambank;
};
-rc2014_mini_cpm::rc2014_mini_cpm(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+rc2014_mini_cpm::rc2014_mini_cpm(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, RC2014_MINI_CPM, tag, owner, clock)
, device_rc2014_card_interface(mconfig, *this)
, m_ata(*this, "ata")
diff --git a/src/devices/bus/rc2014/ram.cpp b/src/devices/bus/rc2014/ram.cpp
index dc7c89ae170..46ea505b9bb 100644
--- a/src/devices/bus/rc2014/ram.cpp
+++ b/src/devices/bus/rc2014/ram.cpp
@@ -20,7 +20,7 @@ class ram_32k_device : public device_t, public device_rc2014_card_interface
{
public:
// construction/destruction
- ram_32k_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ ram_32k_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
@@ -30,7 +30,7 @@ private:
std::unique_ptr<u8[]> m_ram;
};
-ram_32k_device::ram_32k_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+ram_32k_device::ram_32k_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, RC2014_RAM_32K, tag, owner, clock)
, device_rc2014_card_interface(mconfig, *this)
, m_ram(nullptr)
@@ -59,7 +59,7 @@ class ram_64k_base : public device_t
{
protected:
// construction/destruction
- ram_64k_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock);
+ ram_64k_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
// device-level overrides
virtual void device_start() override;
@@ -79,7 +79,7 @@ protected:
required_ioport m_paged;
};
-ram_64k_base::ram_64k_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock)
+ram_64k_base::ram_64k_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, type, tag, owner, clock)
, m_bank(0)
, m_ram(nullptr)
@@ -128,7 +128,7 @@ class ram_64k_device : public ram_64k_base, public device_rc2014_ext_card_interf
{
public:
// construction/destruction
- ram_64k_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ ram_64k_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
@@ -139,7 +139,7 @@ protected:
void update_banks() override;
};
-ram_64k_device::ram_64k_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+ram_64k_device::ram_64k_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: ram_64k_base(mconfig, RC2014_RAM_64K, tag, owner, clock)
, device_rc2014_ext_card_interface(mconfig, *this)
{
@@ -177,7 +177,7 @@ class ram_64k_device_40pin : public ram_64k_base, public device_rc2014_card_inte
{
public:
// construction/destruction
- ram_64k_device_40pin(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ ram_64k_device_40pin(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
@@ -187,7 +187,7 @@ protected:
void update_banks() override {};
};
-ram_64k_device_40pin::ram_64k_device_40pin(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+ram_64k_device_40pin::ram_64k_device_40pin(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: ram_64k_base(mconfig, RC2014_RAM_64K_40P, tag, owner, clock)
, device_rc2014_card_interface(mconfig, *this)
{
diff --git a/src/devices/bus/rc2014/rc2014.cpp b/src/devices/bus/rc2014/rc2014.cpp
index afe6ba6172a..589db6ebe63 100644
--- a/src/devices/bus/rc2014/rc2014.cpp
+++ b/src/devices/bus/rc2014/rc2014.cpp
@@ -17,7 +17,7 @@
// rc2014_bus_device
//-------------------------------------------------
-rc2014_bus_device::rc2014_bus_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+rc2014_bus_device::rc2014_bus_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, type, tag, owner, clock)
, m_installer{}
, m_clk(*this)
@@ -32,7 +32,7 @@ rc2014_bus_device::rc2014_bus_device(const machine_config &mconfig, device_type
{
}
-rc2014_bus_device::rc2014_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+rc2014_bus_device::rc2014_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: rc2014_bus_device(mconfig, RC2014_BUS, tag, owner, clock)
{
}
@@ -115,14 +115,14 @@ void device_rc2014_card_interface::set_bus_device(rc2014_bus_device *bus_device)
// rc2014_slot_device
//-------------------------------------------------
-rc2014_slot_device::rc2014_slot_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+rc2014_slot_device::rc2014_slot_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, type, tag, owner, clock)
, device_slot_interface(mconfig, *this)
, m_bus(*this, finder_base::DUMMY_TAG)
{
}
-rc2014_slot_device::rc2014_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+rc2014_slot_device::rc2014_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: rc2014_slot_device(mconfig, RC2014_SLOT, tag, owner, clock)
{
}
@@ -147,12 +147,12 @@ void rc2014_slot_device::device_resolve_objects()
// rc2014_ext_bus_device
//-------------------------------------------------
-rc2014_ext_bus_device::rc2014_ext_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+rc2014_ext_bus_device::rc2014_ext_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: rc2014_ext_bus_device(mconfig, RC2014_EXT_BUS, tag, owner, clock)
{
}
-rc2014_ext_bus_device::rc2014_ext_bus_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+rc2014_ext_bus_device::rc2014_ext_bus_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock)
: rc2014_bus_device(mconfig, type, tag, owner, clock)
, m_clk2(*this)
, m_page(*this)
@@ -199,12 +199,12 @@ void device_rc2014_ext_card_interface::set_bus_device(rc2014_ext_bus_device *bus
// rc2014_ext_slot_device
//-------------------------------------------------
-rc2014_ext_slot_device::rc2014_ext_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+rc2014_ext_slot_device::rc2014_ext_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: rc2014_ext_slot_device(mconfig, RC2014_EXT_SLOT, tag, owner, clock)
{
}
-rc2014_ext_slot_device::rc2014_ext_slot_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+rc2014_ext_slot_device::rc2014_ext_slot_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock)
: rc2014_slot_device(mconfig, type, tag, owner, clock)
{
}
@@ -230,12 +230,12 @@ void rc2014_ext_slot_device::device_resolve_objects()
// rc2014_rc80_bus_device
//-------------------------------------------------
-rc2014_rc80_bus_device::rc2014_rc80_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+rc2014_rc80_bus_device::rc2014_rc80_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: rc2014_rc80_bus_device(mconfig, RC2014_RC80_BUS, tag, owner, clock)
{
}
-rc2014_rc80_bus_device::rc2014_rc80_bus_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock)
+rc2014_rc80_bus_device::rc2014_rc80_bus_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock)
: rc2014_ext_bus_device(mconfig, type, tag, owner, clock)
{
@@ -265,7 +265,7 @@ void device_rc2014_rc80_card_interface::set_bus_device(rc2014_rc80_bus_device *b
// rc2014_rc80_slot_device
//-------------------------------------------------
-rc2014_rc80_slot_device::rc2014_rc80_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+rc2014_rc80_slot_device::rc2014_rc80_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: rc2014_ext_slot_device(mconfig, RC2014_RC80_SLOT, tag, owner, clock)
{
}
diff --git a/src/devices/bus/rc2014/rc2014.h b/src/devices/bus/rc2014/rc2014.h
index a40355af389..5dc190b805a 100644
--- a/src/devices/bus/rc2014/rc2014.h
+++ b/src/devices/bus/rc2014/rc2014.h
@@ -74,7 +74,7 @@ class rc2014_bus_device : public device_t
{
public:
// construction/destruction
- rc2014_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ rc2014_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
virtual ~rc2014_bus_device();
auto clk_callback() { return m_clk.bind(); }
@@ -103,7 +103,7 @@ public:
const z80_daisy_config* get_daisy_chain();
protected:
- rc2014_bus_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ rc2014_bus_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;
virtual void device_reset() override;
@@ -144,7 +144,7 @@ protected:
class rc2014_slot_device : public device_t, public device_slot_interface
{
public:
- rc2014_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock);
+ rc2014_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock);
template <typename T, typename U>
rc2014_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, T &&bus_tag, U &&slot_options, char const *default_option, bool fixed = false)
@@ -158,7 +158,7 @@ public:
}
protected:
- rc2014_slot_device(machine_config const &mconfig, device_type type, char const *tag, device_t *owner, u32 clock);
+ rc2014_slot_device(machine_config const &mconfig, device_type type, char const *tag, device_t *owner, const XTAL &clock);
// device-level overrides
virtual void device_start() override;
virtual void device_resolve_objects() override;
@@ -176,7 +176,7 @@ class rc2014_ext_bus_device : public rc2014_bus_device
{
public:
// construction/destruction
- rc2014_ext_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ rc2014_ext_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
auto clk2_callback() { return m_clk2.bind(); }
auto page_callback() { return m_page.bind(); }
@@ -199,7 +199,7 @@ public:
DECLARE_WRITE_LINE_MEMBER( user8_w ) { m_user8(state); }
protected:
- rc2014_ext_bus_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ rc2014_ext_bus_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;
@@ -237,7 +237,7 @@ protected:
class rc2014_ext_slot_device : public rc2014_slot_device
{
public:
- rc2014_ext_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock);
+ rc2014_ext_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock);
template <typename T, typename U>
rc2014_ext_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, T &&bus_tag, U &&slot_options, char const *default_option, bool fixed = false)
@@ -251,7 +251,7 @@ public:
}
protected:
- rc2014_ext_slot_device(machine_config const &mconfig, device_type type, char const *tag, device_t *owner, u32 clock);
+ rc2014_ext_slot_device(machine_config const &mconfig, device_type type, char const *tag, device_t *owner, const XTAL &clock);
// device-level overrides
virtual void device_start() override;
virtual void device_resolve_objects() override;
@@ -267,10 +267,10 @@ class rc2014_rc80_bus_device : public rc2014_ext_bus_device
{
public:
// construction/destruction
- rc2014_rc80_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ rc2014_rc80_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- rc2014_rc80_bus_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ rc2014_rc80_bus_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;
};
@@ -297,7 +297,7 @@ protected:
class rc2014_rc80_slot_device : public rc2014_ext_slot_device
{
public:
- rc2014_rc80_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock);
+ rc2014_rc80_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock);
template <typename T, typename U>
rc2014_rc80_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, T &&bus_tag, U &&slot_options, char const *default_option, bool fixed = false)
diff --git a/src/devices/bus/rc2014/rom.cpp b/src/devices/bus/rc2014/rom.cpp
index 61d0d8bb191..48a15c2b6e4 100644
--- a/src/devices/bus/rc2014/rom.cpp
+++ b/src/devices/bus/rc2014/rom.cpp
@@ -20,7 +20,7 @@ class switchable_rom_device : public device_t, public device_rc2014_card_interfa
{
public:
// construction/destruction
- switchable_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ switchable_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
@@ -33,7 +33,7 @@ private:
required_ioport m_rom_selector;
};
-switchable_rom_device::switchable_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+switchable_rom_device::switchable_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, RC2014_SWITCHABLE_ROM, tag, owner, clock)
, device_rc2014_card_interface(mconfig, *this)
, m_rom(*this, "rom")
@@ -112,7 +112,7 @@ class pagable_rom_device : public device_t, public device_rc2014_ext_card_interf
{
public:
// construction/destruction
- pagable_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ pagable_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
@@ -135,7 +135,7 @@ private:
required_ioport_array<6> m_page_addr_conf;
};
-pagable_rom_device::pagable_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+pagable_rom_device::pagable_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, RC2014_PAGABLE_ROM, tag, owner, clock)
, device_rc2014_ext_card_interface(mconfig, *this)
, m_bank(0)
diff --git a/src/devices/bus/rc2014/romram.cpp b/src/devices/bus/rc2014/romram.cpp
index e0fcc03fa39..5840bc950eb 100644
--- a/src/devices/bus/rc2014/romram.cpp
+++ b/src/devices/bus/rc2014/romram.cpp
@@ -21,7 +21,7 @@ class rom_ram_512k_device : public device_t, public device_rc2014_card_interface
{
public:
// construction/destruction
- rom_ram_512k_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ rom_ram_512k_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
@@ -43,7 +43,7 @@ private:
required_device<sst_39sf040_device> m_flash;
};
-rom_ram_512k_device::rom_ram_512k_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+rom_ram_512k_device::rom_ram_512k_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, RC2014_ROM_RAM_512, tag, owner, clock)
, device_rc2014_card_interface(mconfig, *this)
, m_page_reg{0,0,0,0}
@@ -163,7 +163,7 @@ class sc119_device : public device_t, public device_rc2014_rc80_card_interface
{
public:
// construction/destruction
- sc119_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ sc119_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
@@ -176,7 +176,7 @@ private:
required_device<sst_39sf040_device> m_flash;
};
-sc119_device::sc119_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+sc119_device::sc119_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, RC2014_SC119, tag, owner, clock)
, device_rc2014_rc80_card_interface(mconfig, *this)
, m_ram(nullptr)
diff --git a/src/devices/bus/rc2014/rtc.cpp b/src/devices/bus/rc2014/rtc.cpp
index 4e8659c2771..20dfc29f271 100644
--- a/src/devices/bus/rc2014/rtc.cpp
+++ b/src/devices/bus/rc2014/rtc.cpp
@@ -21,7 +21,7 @@ class rc2014_ds1302_device : public device_t, public device_rc2014_card_interfac
{
public:
// construction/destruction
- rc2014_ds1302_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ rc2014_ds1302_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
@@ -37,7 +37,7 @@ private:
required_ioport m_addr;
};
-rc2014_ds1302_device::rc2014_ds1302_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+rc2014_ds1302_device::rc2014_ds1302_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, RC2014_DS1302_RTC, tag, owner, clock)
, device_rc2014_card_interface(mconfig, *this)
, m_rtc(*this, "rtc")
diff --git a/src/devices/bus/rc2014/serial.cpp b/src/devices/bus/rc2014/serial.cpp
index 9453055f2ce..5cea66b6ee6 100644
--- a/src/devices/bus/rc2014/serial.cpp
+++ b/src/devices/bus/rc2014/serial.cpp
@@ -23,7 +23,7 @@ class serial_io_device : public device_t, public device_rc2014_card_interface
{
public:
// construction/destruction
- serial_io_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ serial_io_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
@@ -38,7 +38,7 @@ private:
required_device<acia6850_device> m_acia;
};
-serial_io_device::serial_io_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+serial_io_device::serial_io_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, RC2014_SERIAL_IO, tag, owner, clock)
, device_rc2014_card_interface(mconfig, *this)
, m_acia(*this, "acia")
@@ -75,7 +75,7 @@ DEVICE_INPUT_DEFAULTS_END
void serial_io_device::device_add_mconfig(machine_config &config)
{
- ACIA6850(config, m_acia, 0);
+ ACIA6850(config, m_acia);
m_acia->txd_handler().set("rs232", FUNC(rs232_port_device::write_txd));
m_acia->txd_handler().append(FUNC(serial_io_device::tx_w));
m_acia->rts_handler().set("rs232", FUNC(rs232_port_device::write_rts));
@@ -100,7 +100,7 @@ class dual_serial_base : public device_t
{
protected:
// construction/destruction
- dual_serial_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock);
+ dual_serial_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
// device-level overrides
virtual void device_start() override;
@@ -120,7 +120,7 @@ protected:
required_device<z80sio_device> m_sio;
};
-dual_serial_base::dual_serial_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock)
+dual_serial_base::dual_serial_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, type, tag, owner, clock)
, m_clk_portb(0)
, m_portb(*this, "JP1")
@@ -139,7 +139,7 @@ void dual_serial_base::device_reset()
void dual_serial_base::device_add_mconfig(machine_config &config)
{
- Z80SIO(config, m_sio, 0);
+ Z80SIO(config, m_sio);
m_sio->out_txda_callback().set("rs232a", FUNC(rs232_port_device::write_txd));
m_sio->out_txda_callback().append(FUNC(dual_serial_base::tx_w));
m_sio->out_rtsa_callback().set("rs232a", FUNC(rs232_port_device::write_rts));
@@ -180,7 +180,7 @@ class dual_serial_device : public dual_serial_base, public device_rc2014_ext_car
{
public:
// construction/destruction
- dual_serial_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ dual_serial_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
@@ -193,7 +193,7 @@ protected:
DECLARE_WRITE_LINE_MEMBER( tx2_w ) override { m_bus->tx2_w(state); }
};
-dual_serial_device::dual_serial_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+dual_serial_device::dual_serial_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: dual_serial_base(mconfig, RC2014_DUAL_SERIAL, tag, owner, clock)
, device_rc2014_ext_card_interface(mconfig, *this)
{
@@ -230,7 +230,7 @@ class dual_serial_device_40pin : public dual_serial_base, public device_rc2014_c
{
public:
// construction/destruction
- dual_serial_device_40pin(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ dual_serial_device_40pin(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
@@ -243,7 +243,7 @@ protected:
DECLARE_WRITE_LINE_MEMBER( tx2_w ) override { }
};
-dual_serial_device_40pin::dual_serial_device_40pin(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+dual_serial_device_40pin::dual_serial_device_40pin(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: dual_serial_base(mconfig, RC2014_DUAL_SERIAL_40P, tag, owner, clock)
, device_rc2014_card_interface(mconfig, *this)
{
diff --git a/src/devices/bus/rc2014/sound.cpp b/src/devices/bus/rc2014/sound.cpp
index 204d52f9f6c..d0d27df54bf 100644
--- a/src/devices/bus/rc2014/sound.cpp
+++ b/src/devices/bus/rc2014/sound.cpp
@@ -22,7 +22,7 @@ class rc2014_ym_ay_device : public device_t, public device_rc2014_card_interface
{
protected:
// construction/destruction
- rc2014_ym_ay_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock);
+ rc2014_ym_ay_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;
@@ -34,7 +34,7 @@ protected:
required_ioport_array<6> m_jp;
};
-rc2014_ym_ay_device::rc2014_ym_ay_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock)
+rc2014_ym_ay_device::rc2014_ym_ay_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, type, tag, owner, clock)
, device_rc2014_card_interface(mconfig, *this)
, m_psg(*this, "psg")
@@ -133,7 +133,7 @@ class rc2014_ym2149_device : public rc2014_ym_ay_device
{
public:
// construction/destruction
- rc2014_ym2149_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ rc2014_ym2149_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
@@ -141,7 +141,7 @@ protected:
virtual void device_add_mconfig(machine_config &config) override;
};
-rc2014_ym2149_device::rc2014_ym2149_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+rc2014_ym2149_device::rc2014_ym2149_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: rc2014_ym_ay_device(mconfig, RC2014_YM2149_SOUND, tag, owner, clock)
{
}
@@ -161,7 +161,7 @@ void rc2014_ym2149_device::device_add_mconfig(machine_config &config)
SPEAKER(config, "lspeaker").front_left();
SPEAKER(config, "rspeaker").front_right();
- YM2149(config, m_psg, 0);
+ YM2149(config, m_psg);
m_psg->add_route(0, "rspeaker", 0.25);
m_psg->add_route(2, "rspeaker", 0.25);
m_psg->add_route(1, "lspeaker", 0.25);
@@ -176,14 +176,14 @@ class rc2014_ay8190_device : public rc2014_ym_ay_device
{
public:
// construction/destruction
- rc2014_ay8190_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ rc2014_ay8190_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
virtual void device_add_mconfig(machine_config &config) override;
};
-rc2014_ay8190_device::rc2014_ay8190_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+rc2014_ay8190_device::rc2014_ay8190_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: rc2014_ym_ay_device(mconfig, RC2014_AY8190_SOUND, tag, owner, clock)
{
}
@@ -193,7 +193,7 @@ void rc2014_ay8190_device::device_add_mconfig(machine_config &config)
SPEAKER(config, "lspeaker").front_left();
SPEAKER(config, "rspeaker").front_right();
- AY8910(config, m_psg, 0);
+ AY8910(config, m_psg);
m_psg->add_route(0, "rspeaker", 0.25);
m_psg->add_route(2, "rspeaker", 0.25);
m_psg->add_route(1, "lspeaker", 0.25);
diff --git a/src/devices/bus/rc2014/z180cpu.cpp b/src/devices/bus/rc2014/z180cpu.cpp
index c715970b299..0d7dd2f5a32 100644
--- a/src/devices/bus/rc2014/z180cpu.cpp
+++ b/src/devices/bus/rc2014/z180cpu.cpp
@@ -23,7 +23,7 @@ class z180cpu_base : public device_t, public device_rc2014_rc80_card_interface
{
protected:
// construction/destruction
- z180cpu_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock);
+ z180cpu_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
// device-level overrides
virtual void device_start() override;
@@ -43,7 +43,7 @@ protected:
static constexpr XTAL MAIN_CLOCK = XTAL(18'432'000);
};
-z180cpu_base::z180cpu_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock)
+z180cpu_base::z180cpu_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, type, tag, owner, clock)
, device_rc2014_rc80_card_interface(mconfig, *this)
, m_maincpu(*this, "maincpu")
@@ -109,14 +109,14 @@ class sc111_device : public z180cpu_base
{
public:
// construction/destruction
- sc111_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ sc111_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
virtual void device_start() override;
};
-sc111_device::sc111_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+sc111_device::sc111_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: z180cpu_base(mconfig, RC2014_SC111, tag, owner, clock)
{
}
diff --git a/src/devices/bus/rc2014/z80cpu.cpp b/src/devices/bus/rc2014/z80cpu.cpp
index 9723c947e2e..d7cd0d200af 100644
--- a/src/devices/bus/rc2014/z80cpu.cpp
+++ b/src/devices/bus/rc2014/z80cpu.cpp
@@ -21,7 +21,7 @@ class z80cpu_base : public device_t
{
protected:
// construction/destruction
- z80cpu_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock);
+ z80cpu_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
// device-level overrides
virtual void device_start() override;
@@ -34,7 +34,7 @@ protected:
required_device<z80_device> m_maincpu;
};
-z80cpu_base::z80cpu_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock)
+z80cpu_base::z80cpu_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, type, tag, owner, clock)
, m_maincpu(*this, "maincpu")
{
@@ -60,7 +60,7 @@ class z80cpu_device : public z80cpu_base, public device_rc2014_card_interface
{
public:
// construction/destruction
- z80cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ z80cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
@@ -68,7 +68,7 @@ protected:
virtual void device_resolve_objects() override;
};
-z80cpu_device::z80cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+z80cpu_device::z80cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: z80cpu_base(mconfig, RC2014_Z80CPU, tag, owner, clock)
, device_rc2014_card_interface(mconfig, *this)
{
@@ -96,14 +96,14 @@ class z80cpu21_device : public z80cpu_base, public device_rc2014_ext_card_interf
{
public:
// construction/destruction
- z80cpu21_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
+ z80cpu21_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
virtual void device_start() override;
virtual void device_resolve_objects() override;
};
-z80cpu21_device::z80cpu21_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+z80cpu21_device::z80cpu21_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: z80cpu_base(mconfig, RC2014_Z80CPU_21, tag, owner, clock)
, device_rc2014_ext_card_interface(mconfig, *this)
{