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/bus/isa | |
parent | 5c14bcdfcb4aefb71b5b62387c4ad05dbeb3814e (diff) |
full xtal conversionxtal
Diffstat (limited to 'src/devices/bus/isa')
158 files changed, 423 insertions, 423 deletions
diff --git a/src/devices/bus/isa/3c503.cpp b/src/devices/bus/isa/3c503.cpp index 0bf96c34f53..eeba392b7aa 100644 --- a/src/devices/bus/isa/3c503.cpp +++ b/src/devices/bus/isa/3c503.cpp @@ -7,7 +7,7 @@ void el2_3c503_device::device_add_mconfig(machine_config &config) { - DP8390D(config, m_dp8390, 0); + DP8390D(config, m_dp8390); m_dp8390->irq_callback().set(FUNC(el2_3c503_device::el2_3c503_irq_w)); m_dp8390->mem_read_callback().set(FUNC(el2_3c503_device::el2_3c503_mem_read)); m_dp8390->mem_write_callback().set(FUNC(el2_3c503_device::el2_3c503_mem_write)); @@ -15,7 +15,7 @@ void el2_3c503_device::device_add_mconfig(machine_config &config) DEFINE_DEVICE_TYPE(EL2_3C503, el2_3c503_device, "el2_3c503", "3C503 Network Adapter") -el2_3c503_device::el2_3c503_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock) +el2_3c503_device::el2_3c503_device(const machine_config& mconfig, const char* tag, device_t* owner, const XTAL &clock) : device_t(mconfig, EL2_3C503, tag, owner, clock) , device_isa8_card_interface(mconfig, *this) , m_dp8390(*this, "dp8390d") diff --git a/src/devices/bus/isa/3c503.h b/src/devices/bus/isa/3c503.h index f9597f00137..a4b8685203b 100644 --- a/src/devices/bus/isa/3c503.h +++ b/src/devices/bus/isa/3c503.h @@ -13,7 +13,7 @@ class el2_3c503_device : public device_t, public device_isa8_card_interface { public: - el2_3c503_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + el2_3c503_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); uint8_t el2_3c503_loport_r(offs_t offset); void el2_3c503_loport_w(offs_t offset, uint8_t data); diff --git a/src/devices/bus/isa/3c505.cpp b/src/devices/bus/isa/3c505.cpp index a50c28b2c1b..6ed4325b597 100644 --- a/src/devices/bus/isa/3c505.cpp +++ b/src/devices/bus/isa/3c505.cpp @@ -193,7 +193,7 @@ static INPUT_PORTS_START(3c505) PORT_DIPSETTING( 0x01, DEF_STR(On)) INPUT_PORTS_END -isa16_3c505_device::isa16_3c505_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +isa16_3c505_device::isa16_3c505_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ISA16_3C505, tag, owner, clock) , device_isa16_card_interface(mconfig, *this) , m_cpu(*this, "cpu") diff --git a/src/devices/bus/isa/3c505.h b/src/devices/bus/isa/3c505.h index 4c1c22383a2..f4f9acc6462 100644 --- a/src/devices/bus/isa/3c505.h +++ b/src/devices/bus/isa/3c505.h @@ -17,7 +17,7 @@ class isa16_3c505_device , public device_isa16_card_interface { public: - isa16_3c505_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + isa16_3c505_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device_t overrides diff --git a/src/devices/bus/isa/3xtwin.cpp b/src/devices/bus/isa/3xtwin.cpp index b30c83ab1ce..12310ead4a9 100644 --- a/src/devices/bus/isa/3xtwin.cpp +++ b/src/devices/bus/isa/3xtwin.cpp @@ -25,7 +25,7 @@ // device type definition DEFINE_DEVICE_TYPE(ISA8_3XTWIN, isa8_3xtwin_device, "3xtwin", "Emerald Technology 3XTwin Twinax Emulation Card") -isa8_3xtwin_device::isa8_3xtwin_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +isa8_3xtwin_device::isa8_3xtwin_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ISA8_3XTWIN, tag, owner, clock) , device_isa8_card_interface(mconfig, *this) { diff --git a/src/devices/bus/isa/3xtwin.h b/src/devices/bus/isa/3xtwin.h index cb9aeb286eb..62f86f2934d 100644 --- a/src/devices/bus/isa/3xtwin.h +++ b/src/devices/bus/isa/3xtwin.h @@ -20,7 +20,7 @@ class isa8_3xtwin_device : public device_t, public device_isa8_card_interface { public: // device type constructor - isa8_3xtwin_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + isa8_3xtwin_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/isa/acb2072.cpp b/src/devices/bus/isa/acb2072.cpp index c9d7917a114..a8022006f75 100644 --- a/src/devices/bus/isa/acb2072.cpp +++ b/src/devices/bus/isa/acb2072.cpp @@ -28,7 +28,7 @@ DEFINE_DEVICE_TYPE(ACB2072, acb2072_device, "acb2072", "ACB-2072 RLL Drive Controller") -acb2072_device::acb2072_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +acb2072_device::acb2072_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ACB2072, tag, owner, clock) , device_isa8_card_interface(mconfig, *this) , m_mcu(*this, "mcu") diff --git a/src/devices/bus/isa/acb2072.h b/src/devices/bus/isa/acb2072.h index be4185400b9..26af89897d9 100644 --- a/src/devices/bus/isa/acb2072.h +++ b/src/devices/bus/isa/acb2072.h @@ -16,7 +16,7 @@ class acb2072_device : public device_t, public device_isa8_card_interface { public: - acb2072_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + acb2072_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); static constexpr feature_type unemulated_features() { return feature::DISK; } diff --git a/src/devices/bus/isa/adlib.cpp b/src/devices/bus/isa/adlib.cpp index 0f859a0ebbd..9f72e98f75b 100644 --- a/src/devices/bus/isa/adlib.cpp +++ b/src/devices/bus/isa/adlib.cpp @@ -58,7 +58,7 @@ void isa8_adlib_device::device_add_mconfig(machine_config &config) // isa8_adlib_device - constructor //------------------------------------------------- -isa8_adlib_device::isa8_adlib_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +isa8_adlib_device::isa8_adlib_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ISA8_ADLIB, tag, owner, clock) , device_isa8_card_interface(mconfig, *this) , m_ym3812(*this, "ym3812") diff --git a/src/devices/bus/isa/adlib.h b/src/devices/bus/isa/adlib.h index 511d0b4663c..6ab31e7c216 100644 --- a/src/devices/bus/isa/adlib.h +++ b/src/devices/bus/isa/adlib.h @@ -20,7 +20,7 @@ class isa8_adlib_device : { public: // construction/destruction - isa8_adlib_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa8_adlib_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); uint8_t ym3812_16_r(offs_t offset); void ym3812_16_w(offs_t offset, uint8_t data); diff --git a/src/devices/bus/isa/aga.cpp b/src/devices/bus/isa/aga.cpp index 81e6ba053fe..0658b428900 100644 --- a/src/devices/bus/isa/aga.cpp +++ b/src/devices/bus/isa/aga.cpp @@ -62,12 +62,12 @@ DEFINE_DEVICE_TYPE(ISA8_AGA_PC200, isa8_aga_pc200_device, "isa_aga_pc200", "AGA // isa8_aga_device - constructor //------------------------------------------------- -isa8_aga_device::isa8_aga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +isa8_aga_device::isa8_aga_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : isa8_aga_device(mconfig, ISA8_AGA, tag, owner, clock) { } -isa8_aga_device::isa8_aga_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) : +isa8_aga_device::isa8_aga_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_isa8_card_interface(mconfig, *this), m_palette(*this, "palette"), @@ -148,7 +148,7 @@ ioport_constructor isa8_aga_device::device_input_ports() const // isa8_aga_pc200_device - constructor //------------------------------------------------- -isa8_aga_pc200_device::isa8_aga_pc200_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +isa8_aga_pc200_device::isa8_aga_pc200_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : isa8_aga_device(mconfig, ISA8_AGA_PC200, tag, owner, clock), m_port8(0), m_portd(0), diff --git a/src/devices/bus/isa/aga.h b/src/devices/bus/isa/aga.h index b5f986e9a34..180dbf42195 100644 --- a/src/devices/bus/isa/aga.h +++ b/src/devices/bus/isa/aga.h @@ -36,10 +36,10 @@ public: enum mode_t { AGA_OFF, AGA_COLOR, AGA_MONO }; // construction/destruction - isa8_aga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa8_aga_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: - isa8_aga_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + isa8_aga_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); uint8_t pc_aga_mda_r(offs_t offset); void pc_aga_mda_w(offs_t offset, uint8_t data); @@ -105,7 +105,7 @@ class isa8_aga_pc200_device : { public: // construction/destruction - isa8_aga_pc200_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa8_aga_pc200_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: uint8_t pc200_videoram_r(offs_t offset); diff --git a/src/devices/bus/isa/aha1542b.cpp b/src/devices/bus/isa/aha1542b.cpp index bba0bb76d41..15a21fd38d0 100644 --- a/src/devices/bus/isa/aha1542b.cpp +++ b/src/devices/bus/isa/aha1542b.cpp @@ -23,7 +23,7 @@ DEFINE_DEVICE_TYPE(AHA1542A, aha1542a_device, "aha1542a", "AHA-1542A SCSI Contro DEFINE_DEVICE_TYPE(AHA1542B, aha1542b_device, "aha1542b", "AHA-1542B SCSI Controller") -aha154x_device::aha154x_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) +aha154x_device::aha154x_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_isa16_card_interface(mconfig, *this) , m_localcpu(*this, "localcpu") @@ -33,12 +33,12 @@ aha154x_device::aha154x_device(const machine_config &mconfig, device_type type, { } -aha1542a_device::aha1542a_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +aha1542a_device::aha1542a_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : aha154x_device(mconfig, AHA1542A, tag, owner, clock) { } -aha1542b_device::aha1542b_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +aha1542b_device::aha1542b_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : aha154x_device(mconfig, AHA1542B, tag, owner, clock) , m_busaic(*this, "busaic") { diff --git a/src/devices/bus/isa/aha1542b.h b/src/devices/bus/isa/aha1542b.h index c46f456bfe9..1673fb03ef7 100644 --- a/src/devices/bus/isa/aha1542b.h +++ b/src/devices/bus/isa/aha1542b.h @@ -19,7 +19,7 @@ class aha154x_device : public device_t, public device_isa16_card_interface { protected: - aha154x_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); + aha154x_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; @@ -37,7 +37,7 @@ protected: class aha1542a_device : public aha154x_device { public: - aha1542a_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + aha1542a_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); static constexpr feature_type unemulated_features() { return feature::DISK; } @@ -61,7 +61,7 @@ private: class aha1542b_device : public aha154x_device { public: - aha1542b_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + aha1542b_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); static constexpr feature_type unemulated_features() { return feature::DISK; } diff --git a/src/devices/bus/isa/aha1542c.cpp b/src/devices/bus/isa/aha1542c.cpp index 34e716647ac..9fb169d4b57 100644 --- a/src/devices/bus/isa/aha1542c.cpp +++ b/src/devices/bus/isa/aha1542c.cpp @@ -344,7 +344,7 @@ const tiny_rom_entry *aha1542cp_device::device_rom_region() const void aha1542c_device::device_add_mconfig(machine_config &config) { - z80_device &cpu(Z80(config, Z84C0010_TAG, 10'000'000)); + z80_device &cpu(Z80(config, Z84C0010_TAG, XTAL::u(10'000'000))); cpu.set_addrmap(AS_PROGRAM, &aha1542c_device::z84c0010_mem); EEPROM_93C46_16BIT(config, m_eeprom); @@ -352,30 +352,30 @@ void aha1542c_device::device_add_mconfig(machine_config &config) void aha1542cp_device::device_add_mconfig(machine_config &config) { - z80_device &cpu(Z80(config, Z84C0010_TAG, 10'000'000)); + z80_device &cpu(Z80(config, Z84C0010_TAG, XTAL::u(10'000'000))); cpu.set_addrmap(AS_PROGRAM, &aha1542cp_device::local_mem); EEPROM_93C46_16BIT(config, m_eeprom); } -aha1542c_device::aha1542c_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) +aha1542c_device::aha1542c_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_isa16_card_interface(mconfig, *this) , m_eeprom(*this, "eeprom") { } -aha1542c_device::aha1542c_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +aha1542c_device::aha1542c_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : aha1542c_device(mconfig, AHA1542C, tag, owner, clock) { } -aha1542cf_device::aha1542cf_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +aha1542cf_device::aha1542cf_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : aha1542c_device(mconfig, AHA1542CF, tag, owner, clock) { } -aha1542cp_device::aha1542cp_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +aha1542cp_device::aha1542cp_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : aha1542c_device(mconfig, AHA1542CP, tag, owner, clock) { } diff --git a/src/devices/bus/isa/aha1542c.h b/src/devices/bus/isa/aha1542c.h index 3a79fb3125f..9f3a618da47 100644 --- a/src/devices/bus/isa/aha1542c.h +++ b/src/devices/bus/isa/aha1542c.h @@ -31,13 +31,13 @@ class aha1542c_device : public device_t, public: static constexpr feature_type unemulated_features() { return feature::DISK; } // construction/destruction - aha1542c_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + aha1542c_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); u8 aha1542_r(offs_t offset); void aha1542_w(offs_t offset, u8 data); protected: - aha1542c_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + aha1542c_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); void local_latch_w(u8 data); @@ -62,7 +62,7 @@ class aha1542cf_device : public aha1542c_device { public: // construction/destruction - aha1542cf_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + aha1542cf_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual const tiny_rom_entry *device_rom_region() const override; @@ -74,7 +74,7 @@ class aha1542cp_device : public aha1542c_device { public: // construction/destruction - aha1542cp_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + aha1542cp_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual ioport_constructor device_input_ports() const override; diff --git a/src/devices/bus/isa/aha174x.cpp b/src/devices/bus/isa/aha174x.cpp index 1b212fe6ae2..945566c5d1d 100644 --- a/src/devices/bus/isa/aha174x.cpp +++ b/src/devices/bus/isa/aha174x.cpp @@ -42,7 +42,7 @@ DEFINE_DEVICE_TYPE(AHA1740, aha1740_device, "aha1740", "AHA-1740 Fast SCSI Host DEFINE_DEVICE_TYPE(AHA1742A, aha1742a_device, "aha1742a", "AHA-1742A Fast SCSI Host Adapter") -aha174x_device::aha174x_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) +aha174x_device::aha174x_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_isa16_card_interface(mconfig, *this) , m_hpc(*this, "hpc") @@ -52,12 +52,12 @@ aha174x_device::aha174x_device(const machine_config &mconfig, device_type type, { } -aha1740_device::aha1740_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +aha1740_device::aha1740_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : aha174x_device(mconfig, AHA1740, tag, owner, clock) { } -aha1742a_device::aha1742a_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +aha1742a_device::aha1742a_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : aha174x_device(mconfig, AHA1742A, tag, owner, clock) , m_fdc(*this, "fdc") { @@ -94,7 +94,7 @@ void aha1740_device::device_add_mconfig(machine_config &config) m_busaic->hrst_callback().set_inputline(m_hpc, INPUT_LINE_RESET); //m_busaic->srst_callback().set_inputline(m_hpc, hpc_device::EI_LINE); - I82355(config, "bmic", 0); + I82355(config, "bmic"); //bmic.lint_callback().set_inputline(m_hpc, hpc_device::I2_LINE); IDT7201(config, m_fifo[0]); @@ -121,7 +121,7 @@ void aha1742a_device::device_add_mconfig(machine_config &config) m_busaic->hrst_callback().set_inputline(m_hpc, INPUT_LINE_RESET); //m_busaic->srst_callback().set_inputline(m_hpc, hpc_device::EI_LINE); - I82355(config, "bmic", 0); + I82355(config, "bmic"); //bmic.lint_callback().set_inputline(m_hpc, hpc_device::I2_LINE); IDT7201(config, m_fifo[0]); diff --git a/src/devices/bus/isa/aha174x.h b/src/devices/bus/isa/aha174x.h index 1b96d78a690..f6da5d51c42 100644 --- a/src/devices/bus/isa/aha174x.h +++ b/src/devices/bus/isa/aha174x.h @@ -20,7 +20,7 @@ class aha174x_device : public device_t, public device_isa16_card_interface { protected: - aha174x_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); + aha174x_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); virtual void device_start() override; @@ -36,7 +36,7 @@ protected: class aha1740_device : public aha174x_device { public: - aha1740_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + aha1740_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); static constexpr feature_type unemulated_features() { return feature::DISK; } @@ -48,7 +48,7 @@ protected: class aha1742a_device : public aha174x_device { public: - aha1742a_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + aha1742a_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); static constexpr feature_type unemulated_features() { return feature::DISK; } diff --git a/src/devices/bus/isa/asc88.cpp b/src/devices/bus/isa/asc88.cpp index 7bdb707f6a6..0eefbf7296f 100644 --- a/src/devices/bus/isa/asc88.cpp +++ b/src/devices/bus/isa/asc88.cpp @@ -23,7 +23,7 @@ DEFINE_DEVICE_TYPE(ASC88, asc88_device, "asc88", "ASC-88 SCSI Adapter") -asc88_device::asc88_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +asc88_device::asc88_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ASC88, tag, owner, clock) , device_isa8_card_interface(mconfig, *this) , m_scsic(*this, "scsi:7:scsic") diff --git a/src/devices/bus/isa/asc88.h b/src/devices/bus/isa/asc88.h index 8cfdd784b98..4bfc3a50b22 100644 --- a/src/devices/bus/isa/asc88.h +++ b/src/devices/bus/isa/asc88.h @@ -19,7 +19,7 @@ class asc88_device : public device_t, public device_isa8_card_interface { public: - asc88_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + asc88_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual void device_start() override; diff --git a/src/devices/bus/isa/bblue2.cpp b/src/devices/bus/isa/bblue2.cpp index ad997664cc2..f9dc8c1d772 100644 --- a/src/devices/bus/isa/bblue2.cpp +++ b/src/devices/bus/isa/bblue2.cpp @@ -163,7 +163,7 @@ INPUT_PORTS_END // isa8_adlib_device - constructor //------------------------------------------------- -isa8_babyblue2_device::isa8_babyblue2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +isa8_babyblue2_device::isa8_babyblue2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ISA8_BABYBLUE2, tag, owner, clock) , device_isa8_card_interface(mconfig, *this) , m_z80(*this, "z80cpu") diff --git a/src/devices/bus/isa/bblue2.h b/src/devices/bus/isa/bblue2.h index cdce099d883..de1a22645a6 100644 --- a/src/devices/bus/isa/bblue2.h +++ b/src/devices/bus/isa/bblue2.h @@ -23,7 +23,7 @@ class isa8_babyblue2_device : { public: // construction/destruction - isa8_babyblue2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa8_babyblue2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); uint8_t z80_control_r(offs_t offset); void z80_control_w(offs_t offset, uint8_t data); diff --git a/src/devices/bus/isa/bt54x.cpp b/src/devices/bus/isa/bt54x.cpp index 1c3c4bdf3f1..d9682fc45e3 100644 --- a/src/devices/bus/isa/bt54x.cpp +++ b/src/devices/bus/isa/bt54x.cpp @@ -25,7 +25,7 @@ DEFINE_DEVICE_TYPE(BT542B, bt542b_device, "bt542b", "BusTek BT-542B SCSI Host Ad DEFINE_DEVICE_TYPE(BT542BH, bt542bh_device, "bt542bh", "BusLogic BT-542B SCSI Host Adapter (Rev. H)") DEFINE_DEVICE_TYPE(BT545S, bt545s_device, "bt545s", "BusLogic BT-545S Fast SCSI Host Adapter") -bt54x_device::bt54x_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) +bt54x_device::bt54x_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_isa16_card_interface(mconfig, *this) , m_mpu(*this, "mpu") @@ -34,17 +34,17 @@ bt54x_device::bt54x_device(const machine_config &mconfig, device_type type, cons { } -bt542b_device::bt542b_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +bt542b_device::bt542b_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : bt54x_device(mconfig, BT542B, tag, owner, clock) { } -bt542bh_device::bt542bh_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +bt542bh_device::bt542bh_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : bt54x_device(mconfig, BT542BH, tag, owner, clock) { } -bt545s_device::bt545s_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +bt545s_device::bt545s_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : bt54x_device(mconfig, BT545S, tag, owner, clock) { } @@ -89,7 +89,7 @@ void bt54x_device::fsc_config(device_t *device) void bt54x_device::fsc_base(machine_config &config) { - //ncr86c05_device &busintf(NCR86C05(config, "busintf", 0)); + //ncr86c05_device &busintf(NCR86C05(config, "busintf")); //busintf.mint_callback().set(m_mpu, FUNC(i80188_cpu_device::int1_w)); //busintf.dma_ack_callback().set("scsi:7:scsic", FUNC(ncr53cf94_device::dma_w)); @@ -111,7 +111,7 @@ void bt542b_device::device_add_mconfig(machine_config &config) I80188(config, m_mpu, 16_MHz_XTAL); m_mpu->set_addrmap(AS_PROGRAM, &bt542b_device::local_map); - //ncr86c05_device &busintf(NCR86C05(config, "busintf", 0)); + //ncr86c05_device &busintf(NCR86C05(config, "busintf")); //busintf.mint_callback().set(m_mpu, FUNC(i80188_cpu_device::int1_w)); //busintf.dma_ack_callback().set("scsi:7:scsic", FUNC(ncr53c94_device::dma_w)); diff --git a/src/devices/bus/isa/bt54x.h b/src/devices/bus/isa/bt54x.h index dfdd0009416..a5266794360 100644 --- a/src/devices/bus/isa/bt54x.h +++ b/src/devices/bus/isa/bt54x.h @@ -21,7 +21,7 @@ public: static constexpr feature_type unemulated_features() { return feature::DISK; } protected: - bt54x_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); + bt54x_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); virtual void device_start() override; @@ -40,7 +40,7 @@ protected: class bt542b_device : public bt54x_device { public: - bt542b_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + bt542b_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual void device_add_mconfig(machine_config &config) override; @@ -50,7 +50,7 @@ protected: class bt542bh_device : public bt54x_device { public: - bt542bh_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + bt542bh_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual void device_add_mconfig(machine_config &config) override; @@ -60,7 +60,7 @@ protected: class bt545s_device : public bt54x_device { public: - bt545s_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + bt545s_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual void device_add_mconfig(machine_config &config) override; diff --git a/src/devices/bus/isa/cga.cpp b/src/devices/bus/isa/cga.cpp index 77595bbbfb0..28c3628694f 100644 --- a/src/devices/bus/isa/cga.cpp +++ b/src/devices/bus/isa/cga.cpp @@ -298,12 +298,12 @@ const tiny_rom_entry *isa8_cga_device::device_rom_region() const // isa8_cga_device - constructor //------------------------------------------------- -isa8_cga_device::isa8_cga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +isa8_cga_device::isa8_cga_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : isa8_cga_device(mconfig, ISA8_CGA, tag, owner, clock) { } -isa8_cga_device::isa8_cga_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) : +isa8_cga_device::isa8_cga_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_isa8_card_interface(mconfig, *this), m_crtc(*this, CGA_MC6845_NAME), m_cga_config(*this, "cga_config"), m_framecnt(0), m_mode_control(0), m_color_select(0), @@ -426,7 +426,7 @@ DEFINE_DEVICE_TYPE(ISA8_CGA_POISK2, isa8_cga_poisk2_device, "cga_poisk2", "ISA8_ // isa8_cga_poisk2_device - constructor //------------------------------------------------- -isa8_cga_poisk2_device::isa8_cga_poisk2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +isa8_cga_poisk2_device::isa8_cga_poisk2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : isa8_cga_device(mconfig, ISA8_CGA_POISK2, tag, owner, clock) { m_chr_gen_offset[0] = 0x0000; @@ -455,12 +455,12 @@ DEFINE_DEVICE_TYPE(ISA8_CGA_SUPERIMPOSE, isa8_cga_superimpose_device, "cga_super // isa8_cga_superimpose_device - constructor //------------------------------------------------- -isa8_cga_superimpose_device::isa8_cga_superimpose_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +isa8_cga_superimpose_device::isa8_cga_superimpose_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : isa8_cga_superimpose_device(mconfig, ISA8_CGA_SUPERIMPOSE, tag, owner, clock) { } -isa8_cga_superimpose_device::isa8_cga_superimpose_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) : +isa8_cga_superimpose_device::isa8_cga_superimpose_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : isa8_cga_device(mconfig, type, tag, owner, clock) { m_superimpose = true; @@ -1310,7 +1310,7 @@ const uint8_t isa8_cga_pc1512_device::mc6845_writeonce_register[31] = // isa8_cga_pc1512_device - constructor //------------------------------------------------- -isa8_cga_pc1512_device::isa8_cga_pc1512_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +isa8_cga_pc1512_device::isa8_cga_pc1512_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : isa8_cga_device(mconfig, ISA8_CGA_PC1512, tag, owner, clock), m_write(0), m_read(0), m_mc6845_address(0) { m_vram_size = 0x10000; @@ -1436,7 +1436,7 @@ DEFINE_DEVICE_TYPE(ISA8_WYSE700, isa8_wyse700_device, "wyse700", "Wyse 700") // isa8_wyse700_device - constructor //------------------------------------------------- -isa8_wyse700_device::isa8_wyse700_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +isa8_wyse700_device::isa8_wyse700_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : isa8_cga_device(mconfig, ISA8_WYSE700, tag, owner, clock), m_vrambank(*this, "wy1"), m_bank_offset(0), m_bank_base(0), m_control(0) { m_vram_size = 0x20000; @@ -1535,7 +1535,7 @@ DEFINE_DEVICE_TYPE(ISA8_EC1841_0002, isa8_ec1841_0002_device, "ec1841_0002", "EC // isa8_ec1841_0002_device - constructor //------------------------------------------------- -isa8_ec1841_0002_device::isa8_ec1841_0002_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +isa8_ec1841_0002_device::isa8_ec1841_0002_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : isa8_cga_device(mconfig, ISA8_EC1841_0002, tag, owner, clock), m_p3df(0) { } @@ -1645,7 +1645,7 @@ MC6845_RECONFIGURE( isa8_cga_mc1502_device::reconfigure ) // isa8_cga_mc1502_device - constructor //------------------------------------------------- -isa8_cga_mc1502_device::isa8_cga_mc1502_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +isa8_cga_mc1502_device::isa8_cga_mc1502_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : isa8_cga_device(mconfig, ISA8_CGA_MC1502, tag, owner, clock) { m_vram_size = 0x8000; @@ -1674,7 +1674,7 @@ DEFINE_DEVICE_TYPE(ISA8_CGA_ISKR1031, isa8_cga_iskr1031_device, "cga_iskr1031", // isa8_cga_iskr1031_device - constructor //------------------------------------------------- -isa8_cga_iskr1031_device::isa8_cga_iskr1031_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +isa8_cga_iskr1031_device::isa8_cga_iskr1031_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : isa8_cga_device(mconfig, ISA8_CGA_ISKR1031, tag, owner, clock) { } @@ -1699,7 +1699,7 @@ DEFINE_DEVICE_TYPE(ISA8_CGA_ISKR1030M, isa8_cga_iskr1030m_device, "cga_iskr1030m // isa8_cga_iskr1030m_device - constructor //------------------------------------------------- -isa8_cga_iskr1030m_device::isa8_cga_iskr1030m_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +isa8_cga_iskr1030m_device::isa8_cga_iskr1030m_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : isa8_cga_device(mconfig, ISA8_CGA_ISKR1030M, tag, owner, clock) { } @@ -1737,12 +1737,12 @@ void isa8_cga_m24_device::device_add_mconfig(machine_config &config) m_crtc->set_reconfigure_callback(FUNC(isa8_cga_m24_device::reconfigure)); } -isa8_cga_m24_device::isa8_cga_m24_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +isa8_cga_m24_device::isa8_cga_m24_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : isa8_cga_m24_device(mconfig, ISA8_CGA_M24, tag, owner, clock) { } -isa8_cga_m24_device::isa8_cga_m24_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) : +isa8_cga_m24_device::isa8_cga_m24_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : isa8_cga_device(mconfig, type, tag, owner, clock), m_mode2(0), m_index(0) { m_vram_size = 0x8000; @@ -1930,7 +1930,7 @@ void isa8_cga_cportiii_device::device_add_mconfig(machine_config &config) subdevice<screen_device>(CGA_SCREEN_NAME)->set_color(rgb_t(255, 125, 0)); } -isa8_cga_cportiii_device::isa8_cga_cportiii_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +isa8_cga_cportiii_device::isa8_cga_cportiii_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : isa8_cga_m24_device(mconfig, ISA8_CGA_CPORTIII, tag, owner, clock) { } diff --git a/src/devices/bus/isa/cga.h b/src/devices/bus/isa/cga.h index 029dc35095f..a9978e1e338 100644 --- a/src/devices/bus/isa/cga.h +++ b/src/devices/bus/isa/cga.h @@ -29,7 +29,7 @@ class isa8_cga_device : public: static constexpr feature_type imperfect_features() { return feature::GRAPHICS; } // construction/destruction - isa8_cga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa8_cga_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual MC6845_UPDATE_ROW( crtc_update_row ); template<bool blink, bool si, bool comp, bool alt, int width> MC6845_UPDATE_ROW( cga_text ); @@ -39,7 +39,7 @@ public: MC6845_UPDATE_ROW( cga_gfx_1bpp_update_row ); protected: - isa8_cga_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + isa8_cga_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); required_device<mc6845_device> m_crtc; required_ioport m_cga_config; @@ -103,9 +103,9 @@ class isa8_cga_superimpose_device : { public: // construction/destruction - isa8_cga_superimpose_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa8_cga_superimpose_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: - isa8_cga_superimpose_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + isa8_cga_superimpose_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); }; // device type definition @@ -119,7 +119,7 @@ class isa8_cga_poisk2_device : { public: // construction/destruction - isa8_cga_poisk2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa8_cga_poisk2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); // optional information overrides virtual const tiny_rom_entry *device_rom_region() const override; }; @@ -135,7 +135,7 @@ class isa8_cga_pc1512_device : { public: // construction/destruction - isa8_cga_pc1512_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa8_cga_pc1512_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); // optional information overrides virtual ioport_constructor device_input_ports() const override; virtual const tiny_rom_entry *device_rom_region() const override; @@ -177,7 +177,7 @@ class isa8_wyse700_device : { public: // construction/destruction - isa8_wyse700_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa8_wyse700_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); // optional information overrides virtual const tiny_rom_entry *device_rom_region() const override; @@ -208,7 +208,7 @@ class isa8_ec1841_0002_device : { public: // construction/destruction - isa8_ec1841_0002_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa8_ec1841_0002_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides @@ -234,7 +234,7 @@ class isa8_cga_iskr1030m_device : { public: // construction/destruction - isa8_cga_iskr1030m_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa8_cga_iskr1030m_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual const tiny_rom_entry *device_rom_region() const override; }; @@ -248,7 +248,7 @@ class isa8_cga_iskr1031_device : { public: // construction/destruction - isa8_cga_iskr1031_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa8_cga_iskr1031_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual const tiny_rom_entry *device_rom_region() const override; }; @@ -262,7 +262,7 @@ class isa8_cga_mc1502_device : { public: // construction/destruction - isa8_cga_mc1502_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa8_cga_mc1502_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); // optional information overrides virtual void device_add_mconfig(machine_config &config) override; virtual const tiny_rom_entry *device_rom_region() const override; @@ -279,7 +279,7 @@ class isa8_cga_m24_device : { public: // construction/destruction - isa8_cga_m24_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa8_cga_m24_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual uint8_t io_read(offs_t offset) override; virtual void io_write(offs_t offset, uint8_t data) override; virtual MC6845_UPDATE_ROW( crtc_update_row ) override; @@ -287,7 +287,7 @@ public: MC6845_RECONFIGURE(reconfigure); protected: - isa8_cga_m24_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + isa8_cga_m24_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); virtual void device_reset() override; // optional information overrides virtual void device_add_mconfig(machine_config &config) override; @@ -302,7 +302,7 @@ class isa8_cga_cportiii_device : public isa8_cga_m24_device { public: - isa8_cga_cportiii_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa8_cga_cportiii_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); uint8_t port_13c6_r(); void port_13c6_w(uint8_t data); uint8_t port_23c6_r(); diff --git a/src/devices/bus/isa/chessmdr.cpp b/src/devices/bus/isa/chessmdr.cpp index b1035945761..326f90c361c 100644 --- a/src/devices/bus/isa/chessmdr.cpp +++ b/src/devices/bus/isa/chessmdr.cpp @@ -19,7 +19,7 @@ DEFINE_DEVICE_TYPE(ISA8_CHESSMDR, isa8_chessmdr_device, "isa_chessmdr", "The Che // constructor //------------------------------------------------- -isa8_chessmdr_device::isa8_chessmdr_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +isa8_chessmdr_device::isa8_chessmdr_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ISA8_CHESSMDR, tag, owner, clock), device_isa8_card_interface(mconfig, *this), m_chessm(*this, "chessm") @@ -97,7 +97,7 @@ ioport_constructor isa8_chessmdr_device::device_input_ports() const void isa8_chessmdr_device::device_add_mconfig(machine_config &config) { - CHESSMACHINE(config, m_chessm, 15'000'000); + CHESSMACHINE(config, m_chessm, XTAL::u(15'000'000)); } diff --git a/src/devices/bus/isa/chessmdr.h b/src/devices/bus/isa/chessmdr.h index 9f5d1bf270f..1efde0ede38 100644 --- a/src/devices/bus/isa/chessmdr.h +++ b/src/devices/bus/isa/chessmdr.h @@ -21,7 +21,7 @@ class isa8_chessmdr_device : { public: // construction/destruction - isa8_chessmdr_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa8_chessmdr_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/isa/chessmsr.cpp b/src/devices/bus/isa/chessmsr.cpp index f466f392227..1a7681d64cc 100644 --- a/src/devices/bus/isa/chessmsr.cpp +++ b/src/devices/bus/isa/chessmsr.cpp @@ -27,7 +27,7 @@ DEFINE_DEVICE_TYPE(ISA8_CHESSMSR, isa8_chessmsr_device, "isa_chessmsr", "The Che // constructor //------------------------------------------------- -isa8_chessmsr_device::isa8_chessmsr_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +isa8_chessmsr_device::isa8_chessmsr_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ISA8_CHESSMSR, tag, owner, clock), device_isa8_card_interface(mconfig, *this), m_maincpu(*this, "maincpu"), diff --git a/src/devices/bus/isa/chessmsr.h b/src/devices/bus/isa/chessmsr.h index 6d4becc4b64..b8f86cc3bfe 100644 --- a/src/devices/bus/isa/chessmsr.h +++ b/src/devices/bus/isa/chessmsr.h @@ -22,7 +22,7 @@ class isa8_chessmsr_device : { public: // construction/destruction - isa8_chessmsr_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa8_chessmsr_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/isa/cl_sh260.cpp b/src/devices/bus/isa/cl_sh260.cpp index a06b7b625a6..f33971fbac1 100644 --- a/src/devices/bus/isa/cl_sh260.cpp +++ b/src/devices/bus/isa/cl_sh260.cpp @@ -16,19 +16,19 @@ DEFINE_DEVICE_TYPE(EV346, isa16_ev346_device, "ev346", "Everex EV-346 disk controller") DEFINE_DEVICE_TYPE(JC1310, isa16_jc1310_device, "jc1310", "Joincom JC-1310 disk controller") -isa16_cl_sh260_device::isa16_cl_sh260_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) +isa16_cl_sh260_device::isa16_cl_sh260_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_isa16_card_interface(mconfig, *this) , m_fdc(*this, "fdc") { } -isa16_ev346_device::isa16_ev346_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +isa16_ev346_device::isa16_ev346_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : isa16_cl_sh260_device(mconfig, EV346, tag, owner, clock) { } -isa16_jc1310_device::isa16_jc1310_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +isa16_jc1310_device::isa16_jc1310_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : isa16_cl_sh260_device(mconfig, JC1310, tag, owner, clock) { } diff --git a/src/devices/bus/isa/cl_sh260.h b/src/devices/bus/isa/cl_sh260.h index 18612ab6456..cbe94a6c0a4 100644 --- a/src/devices/bus/isa/cl_sh260.h +++ b/src/devices/bus/isa/cl_sh260.h @@ -19,7 +19,7 @@ class isa16_cl_sh260_device : public device_t, public device_isa16_card_interface { protected: - isa16_cl_sh260_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); + isa16_cl_sh260_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); virtual void device_start() override; @@ -31,7 +31,7 @@ protected: class isa16_ev346_device : public isa16_cl_sh260_device { public: - isa16_ev346_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + isa16_ev346_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); static constexpr feature_type unemulated_features() { return feature::DISK; } @@ -46,7 +46,7 @@ private: class isa16_jc1310_device : public isa16_cl_sh260_device { public: - isa16_jc1310_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + isa16_jc1310_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); static constexpr feature_type unemulated_features() { return feature::DISK; } diff --git a/src/devices/bus/isa/com.cpp b/src/devices/bus/isa/com.cpp index 4a1cc1ebd00..2af209675a2 100644 --- a/src/devices/bus/isa/com.cpp +++ b/src/devices/bus/isa/com.cpp @@ -99,12 +99,12 @@ void isa8_com_device::device_add_mconfig(machine_config &config) // isa8_com_device - constructor //------------------------------------------------- -isa8_com_device::isa8_com_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +isa8_com_device::isa8_com_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : isa8_com_device(mconfig, ISA8_COM, tag, owner, clock) { } -isa8_com_device::isa8_com_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) : +isa8_com_device::isa8_com_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_isa8_card_interface(mconfig, *this) { @@ -187,7 +187,7 @@ void isa8_com_at_device::device_add_mconfig(machine_config &config) // isa8_com_device - constructor //------------------------------------------------- -isa8_com_at_device::isa8_com_at_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +isa8_com_at_device::isa8_com_at_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : isa8_com_device(mconfig, ISA8_COM_AT, tag, owner, clock) { } diff --git a/src/devices/bus/isa/com.h b/src/devices/bus/isa/com.h index ff7b5e4eef8..433d38cf583 100644 --- a/src/devices/bus/isa/com.h +++ b/src/devices/bus/isa/com.h @@ -20,13 +20,13 @@ class isa8_com_device : { public: // construction/destruction - isa8_com_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa8_com_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); DECLARE_WRITE_LINE_MEMBER(pc_com_interrupt_1) { m_isa->irq4_w(state); } DECLARE_WRITE_LINE_MEMBER(pc_com_interrupt_2) { m_isa->irq3_w(state); } protected: - isa8_com_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + isa8_com_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; @@ -47,7 +47,7 @@ class isa8_com_at_device : { public: // construction/destruction - isa8_com_at_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa8_com_at_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // optional information overrides diff --git a/src/devices/bus/isa/dcb.cpp b/src/devices/bus/isa/dcb.cpp index db5768d6758..902b219cd7b 100644 --- a/src/devices/bus/isa/dcb.cpp +++ b/src/devices/bus/isa/dcb.cpp @@ -14,7 +14,7 @@ DEFINE_DEVICE_TYPE(NOVELL_DCB, novell_dcb_device, "novell_dcb", "Novell Disk Coprocessor Board (#738-133-001)") -novell_dcb_device::novell_dcb_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +novell_dcb_device::novell_dcb_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, NOVELL_DCB, tag, owner, clock) , device_isa16_card_interface(mconfig, *this) , m_localcpu(*this, "localcpu") diff --git a/src/devices/bus/isa/dcb.h b/src/devices/bus/isa/dcb.h index fbca0303978..4fdf8809bf5 100644 --- a/src/devices/bus/isa/dcb.h +++ b/src/devices/bus/isa/dcb.h @@ -18,7 +18,7 @@ class novell_dcb_device : public device_t, public device_isa16_card_interface { public: - novell_dcb_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + novell_dcb_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); static constexpr feature_type unemulated_features() { return feature::DISK; } diff --git a/src/devices/bus/isa/dectalk.cpp b/src/devices/bus/isa/dectalk.cpp index 9312d063158..82bb547a9cd 100644 --- a/src/devices/bus/isa/dectalk.cpp +++ b/src/devices/bus/isa/dectalk.cpp @@ -8,7 +8,7 @@ DEFINE_DEVICE_TYPE(ISA8_DECTALK, dectalk_isa_device, "dectalk_isa", "DECTalk-PC") -dectalk_isa_device::dectalk_isa_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock) : +dectalk_isa_device::dectalk_isa_device(const machine_config& mconfig, const char* tag, device_t* owner, const XTAL &clock) : device_t(mconfig, ISA8_DECTALK, tag, owner, clock), device_isa8_card_interface(mconfig, *this), m_cmd(0), @@ -170,7 +170,7 @@ void dectalk_isa_device::device_add_mconfig(machine_config &config) m_dsp->bio().set(FUNC(dectalk_isa_device::bio_line_r)); SPEAKER(config, "speaker").front_center(); - DAC_12BIT_R2R(config, m_dac, 0).add_route(0, "speaker", 1.0); // unknown DAC + DAC_12BIT_R2R(config, m_dac).add_route(0, "speaker", 1.0); // unknown DAC } void dectalk_isa_device::write(offs_t offset, uint8_t data) diff --git a/src/devices/bus/isa/dectalk.h b/src/devices/bus/isa/dectalk.h index 674efa91d5d..6665df8cf4d 100644 --- a/src/devices/bus/isa/dectalk.h +++ b/src/devices/bus/isa/dectalk.h @@ -14,7 +14,7 @@ class dectalk_isa_device : public device_t, public device_isa8_card_interface { public: - dectalk_isa_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + dectalk_isa_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/isa/ega.cpp b/src/devices/bus/isa/ega.cpp index 1aca9ba7cb2..adc9ec21ae4 100644 --- a/src/devices/bus/isa/ega.cpp +++ b/src/devices/bus/isa/ega.cpp @@ -579,12 +579,12 @@ ioport_constructor isa8_ega_device::device_input_ports() const // isa8_ega_device - constructor //------------------------------------------------- -isa8_ega_device::isa8_ega_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +isa8_ega_device::isa8_ega_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : isa8_ega_device(mconfig, ISA8_EGA, tag, owner, clock) { } -isa8_ega_device::isa8_ega_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) : +isa8_ega_device::isa8_ega_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_isa8_card_interface(mconfig, *this), m_crtc_ega(*this, EGA_CRTC_NAME), m_videoram(nullptr), m_charA(nullptr), m_charB(nullptr), diff --git a/src/devices/bus/isa/ega.h b/src/devices/bus/isa/ega.h index cea8667ba8e..32661a2f29d 100644 --- a/src/devices/bus/isa/ega.h +++ b/src/devices/bus/isa/ega.h @@ -21,7 +21,7 @@ class isa8_ega_device : { public: // construction/destruction - isa8_ega_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa8_ega_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); uint8_t read(offs_t offset); void write(offs_t offset, uint8_t data); @@ -36,7 +36,7 @@ public: CRTC_EGA_PIXEL_UPDATE(pc_ega_text); protected: - isa8_ega_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + isa8_ega_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; diff --git a/src/devices/bus/isa/eis_hgb107x.cpp b/src/devices/bus/isa/eis_hgb107x.cpp index ed3100c3e97..8adc0365c84 100644 --- a/src/devices/bus/isa/eis_hgb107x.cpp +++ b/src/devices/bus/isa/eis_hgb107x.cpp @@ -174,12 +174,12 @@ const tiny_rom_entry *isa8_epc_mda_device::device_rom_region() const //------------------------------------------------- // isa8_epc_mda_device - constructor //------------------------------------------------- -isa8_epc_mda_device::isa8_epc_mda_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +isa8_epc_mda_device::isa8_epc_mda_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : isa8_epc_mda_device(mconfig, ISA8_EPC_MDA, tag, owner, clock) { } -isa8_epc_mda_device::isa8_epc_mda_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) : +isa8_epc_mda_device::isa8_epc_mda_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_isa8_card_interface(mconfig, *this), m_crtc(*this, MC6845_NAME), diff --git a/src/devices/bus/isa/eis_hgb107x.h b/src/devices/bus/isa/eis_hgb107x.h index 6689e7db0a8..d131af39d9e 100644 --- a/src/devices/bus/isa/eis_hgb107x.h +++ b/src/devices/bus/isa/eis_hgb107x.h @@ -18,7 +18,7 @@ class isa8_epc_mda_device : public device_t, public device_isa8_card_interface { public: // construction/destruction - isa8_epc_mda_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa8_epc_mda_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); uint8_t io_read(offs_t offset); void io_write(offs_t offset, uint8_t data); @@ -31,7 +31,7 @@ public: DECLARE_INPUT_CHANGED_MEMBER(monitor_changed); protected: - isa8_epc_mda_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + isa8_epc_mda_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; diff --git a/src/devices/bus/isa/eis_sad8852.cpp b/src/devices/bus/isa/eis_sad8852.cpp index d8b1fec4d87..53c171d87f5 100644 --- a/src/devices/bus/isa/eis_sad8852.cpp +++ b/src/devices/bus/isa/eis_sad8852.cpp @@ -208,7 +208,7 @@ void isa16_sad8852_device::device_add_mconfig(machine_config &config) I8274(config, "terminal", XTAL(12'000'000) / 3); // Needs verification } -isa16_sad8852_device::isa16_sad8852_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +isa16_sad8852_device::isa16_sad8852_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ISA16_SAD8852, tag, owner, clock) , device_isa16_card_interface(mconfig, *this) , m_sw1(*this, "SW1") diff --git a/src/devices/bus/isa/eis_sad8852.h b/src/devices/bus/isa/eis_sad8852.h index 224680c83e7..11237dcb368 100644 --- a/src/devices/bus/isa/eis_sad8852.h +++ b/src/devices/bus/isa/eis_sad8852.h @@ -13,7 +13,7 @@ class isa16_sad8852_device : { public: // construction/destruction - isa16_sad8852_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa16_sad8852_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); uint8_t sad8852_r(offs_t offset); void sad8852_w(offs_t offset, uint8_t data); diff --git a/src/devices/bus/isa/eis_twib.cpp b/src/devices/bus/isa/eis_twib.cpp index 4ca179e5055..3292a5a0bc4 100644 --- a/src/devices/bus/isa/eis_twib.cpp +++ b/src/devices/bus/isa/eis_twib.cpp @@ -199,7 +199,7 @@ ioport_constructor isa8_eistwib_device::device_input_ports() const //------------------------------------------------- void isa8_eistwib_device::device_add_mconfig(machine_config &config) { - SDLC_LOGGER(config, m_sdlclogger, 0); // To decode the frames + SDLC_LOGGER(config, m_sdlclogger); // To decode the frames I8274(config, m_uart8274, (XTAL(14'318'181)/ 3) / 2); // Half the 4,77 MHz ISA bus CLK signal //m_uart8274->out_rtsa_callback().set([this] (int state) { m_rts = state; }); m_uart8274->out_txda_callback().set([this] (int state) { m_txd = state; m_sdlclogger->data_w(state); }); @@ -215,7 +215,7 @@ void isa8_eistwib_device::device_add_mconfig(machine_config &config) TIMER(config, "bitclock").configure_periodic(FUNC(isa8_eistwib_device::tick_bitclock), attotime::from_hz(300000)); } -isa8_eistwib_device::isa8_eistwib_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +isa8_eistwib_device::isa8_eistwib_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ISA8_EIS_TWIB, tag, owner, clock) , device_isa8_card_interface(mconfig, *this) , m_uart8274(*this, "terminal") diff --git a/src/devices/bus/isa/eis_twib.h b/src/devices/bus/isa/eis_twib.h index 03aa10b5544..9b66c89439b 100644 --- a/src/devices/bus/isa/eis_twib.h +++ b/src/devices/bus/isa/eis_twib.h @@ -16,7 +16,7 @@ class isa8_eistwib_device : { public: // construction/destruction - isa8_eistwib_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa8_eistwib_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); uint8_t twib_r(offs_t offset); void twib_w(offs_t offset, uint8_t data); diff --git a/src/devices/bus/isa/ex1280.cpp b/src/devices/bus/isa/ex1280.cpp index 2d9153616e9..fa15be8434a 100644 --- a/src/devices/bus/isa/ex1280.cpp +++ b/src/devices/bus/isa/ex1280.cpp @@ -11,7 +11,7 @@ DEFINE_DEVICE_TYPE(ISA16_EX1280, isa16_ex1280_device, "ex1280", "Vectrix EX1280" // isa16_ex1280_device - constructor //------------------------------------------------- -isa16_ex1280_device::isa16_ex1280_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +isa16_ex1280_device::isa16_ex1280_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ISA16_EX1280, tag, owner, clock) , device_isa16_card_interface(mconfig, *this) , m_cpu(*this, "maincpu") @@ -64,7 +64,7 @@ void isa16_ex1280_device::main_map(address_map &map) void isa16_ex1280_device::device_add_mconfig(machine_config &config) { - TMS34010(config, m_cpu, 64000000); + TMS34010(config, m_cpu, XTAL::u(64000000)); m_cpu->set_addrmap(AS_PROGRAM, &isa16_ex1280_device::main_map); m_cpu->set_halt_on_reset(false); m_cpu->set_pixel_clock(64000000); @@ -82,7 +82,7 @@ void isa16_ex1280_device::device_add_mconfig(machine_config &config) m_screen->set_screen_update(m_cpu, FUNC(tms34010_device::tms340x0_rgb32)); m_screen->screen_vblank().set(FUNC(isa16_ex1280_device::vblank_w)); - BT451(config, m_ramdac, 0); + BT451(config, m_ramdac); } diff --git a/src/devices/bus/isa/ex1280.h b/src/devices/bus/isa/ex1280.h index a9637a1b1f6..dfc2004b0ed 100644 --- a/src/devices/bus/isa/ex1280.h +++ b/src/devices/bus/isa/ex1280.h @@ -21,7 +21,7 @@ class isa16_ex1280_device : public device_t, { public: // construction/destruction - isa16_ex1280_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa16_ex1280_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); // Flag non working features static constexpr feature_type unemulated_features() { return feature::GRAPHICS | feature::PALETTE; } diff --git a/src/devices/bus/isa/fdc.cpp b/src/devices/bus/isa/fdc.cpp index a08ec8b899a..3969ac95427 100644 --- a/src/devices/bus/isa/fdc.cpp +++ b/src/devices/bus/isa/fdc.cpp @@ -39,7 +39,7 @@ static void pc_hd_floppies(device_slot_interface &device) } -isa8_fdc_device::isa8_fdc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) : +isa8_fdc_device::isa8_fdc_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_isa8_card_interface(mconfig, *this), m_fdc(*this, "fdc") @@ -77,7 +77,7 @@ void isa8_fdc_device::eop_w(int state) } -isa8_upd765_fdc_device::isa8_upd765_fdc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +isa8_upd765_fdc_device::isa8_upd765_fdc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : isa8_fdc_device(mconfig, type, tag, owner, clock) , dor(0x00) { @@ -179,17 +179,17 @@ void isa8_upd765_fdc_device::check_drq() } -isa8_fdc_xt_device::isa8_fdc_xt_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : isa8_fdc_xt_device(mconfig, ISA8_FDC_XT, tag, owner, clock) +isa8_fdc_xt_device::isa8_fdc_xt_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : isa8_fdc_xt_device(mconfig, ISA8_FDC_XT, tag, owner, clock) { } -isa8_fdc_xt_device::isa8_fdc_xt_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) : isa8_upd765_fdc_device(mconfig, type, tag, owner, clock) +isa8_fdc_xt_device::isa8_fdc_xt_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : isa8_upd765_fdc_device(mconfig, type, tag, owner, clock) { } void isa8_fdc_xt_device::device_add_mconfig(machine_config &config) { - upd765a_device &upd765a(UPD765A(config, m_fdc, 8'000'000, false, false)); + upd765a_device &upd765a(UPD765A(config, m_fdc, XTAL::u(8'000'000), false, false)); upd765a.intrq_wr_callback().set(FUNC(isa8_fdc_xt_device::fdc_irq_w)); upd765a.drq_wr_callback().set(FUNC(isa8_fdc_xt_device::fdc_drq_w)); FLOPPY_CONNECTOR(config, "fdc:0", pc_dd_floppies, "525dd", isa8_fdc_device::floppy_formats).enable_sound(true); @@ -222,13 +222,13 @@ void isa8_fdc_xt_device::dor_fifo_w(uint8_t data) } -isa8_fdc_at_device::isa8_fdc_at_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : isa8_upd765_fdc_device(mconfig, ISA8_FDC_AT, tag, owner, clock) +isa8_fdc_at_device::isa8_fdc_at_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : isa8_upd765_fdc_device(mconfig, ISA8_FDC_AT, tag, owner, clock) { } void isa8_fdc_at_device::device_add_mconfig(machine_config &config) { - upd765a_device &upd765a(UPD765A(config, m_fdc, 8'000'000, false, false)); + upd765a_device &upd765a(UPD765A(config, m_fdc, XTAL::u(8'000'000), false, false)); upd765a.intrq_wr_callback().set(FUNC(isa8_fdc_at_device::fdc_irq_w)); upd765a.drq_wr_callback().set(FUNC(isa8_fdc_at_device::fdc_drq_w)); FLOPPY_CONNECTOR(config, "fdc:0", pc_hd_floppies, "35hd", isa8_fdc_device::floppy_formats).enable_sound(true); @@ -252,13 +252,13 @@ void isa8_fdc_at_device::device_start() isa8_upd765_fdc_device::device_start(); } -isa8_fdc_smc_device::isa8_fdc_smc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : isa8_fdc_device(mconfig, ISA8_FDC_SMC, tag, owner, clock) +isa8_fdc_smc_device::isa8_fdc_smc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : isa8_fdc_device(mconfig, ISA8_FDC_SMC, tag, owner, clock) { } void isa8_fdc_smc_device::device_add_mconfig(machine_config &config) { - smc37c78_device &smc(SMC37C78(config, m_fdc, 24'000'000)); + smc37c78_device &smc(SMC37C78(config, m_fdc, XTAL::u(24'000'000))); smc.intrq_wr_callback().set(FUNC(isa8_fdc_device::irq_w)); smc.drq_wr_callback().set(FUNC(isa8_fdc_device::drq_w)); FLOPPY_CONNECTOR(config, "fdc:0", pc_hd_floppies, "35hd", isa8_fdc_device::floppy_formats).enable_sound(true); @@ -272,13 +272,13 @@ void isa8_fdc_smc_device::device_start() m_isa->set_dma_channel(2, this, true); } -isa8_fdc_ps2_device::isa8_fdc_ps2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : isa8_fdc_device(mconfig, ISA8_FDC_PS2, tag, owner, clock) +isa8_fdc_ps2_device::isa8_fdc_ps2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : isa8_fdc_device(mconfig, ISA8_FDC_PS2, tag, owner, clock) { } void isa8_fdc_ps2_device::device_add_mconfig(machine_config &config) { - n82077aa_device &n82077aa(N82077AA(config, m_fdc, 24'000'000)); + n82077aa_device &n82077aa(N82077AA(config, m_fdc, XTAL::u(24'000'000))); n82077aa.set_mode(n82077aa_device::mode_t::PS2); n82077aa.intrq_wr_callback().set(FUNC(isa8_fdc_device::irq_w)); n82077aa.drq_wr_callback().set(FUNC(isa8_fdc_device::drq_w)); @@ -293,13 +293,13 @@ void isa8_fdc_ps2_device::device_start() m_isa->set_dma_channel(2, this, true); } -isa8_fdc_superio_device::isa8_fdc_superio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : isa8_fdc_device(mconfig, ISA8_FDC_SUPERIO, tag, owner, clock) +isa8_fdc_superio_device::isa8_fdc_superio_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : isa8_fdc_device(mconfig, ISA8_FDC_SUPERIO, tag, owner, clock) { } void isa8_fdc_superio_device::device_add_mconfig(machine_config &config) { - pc_fdc_superio_device &superio(PC_FDC_SUPERIO(config, m_fdc, 24'000'000)); + pc_fdc_superio_device &superio(PC_FDC_SUPERIO(config, m_fdc, XTAL::u(24'000'000))); superio.intrq_wr_callback().set(FUNC(isa8_fdc_device::irq_w)); superio.drq_wr_callback().set(FUNC(isa8_fdc_device::drq_w)); FLOPPY_CONNECTOR(config, "fdc:0", pc_hd_floppies, "35hd", isa8_fdc_device::floppy_formats).enable_sound(true); @@ -313,7 +313,7 @@ void isa8_fdc_superio_device::device_start() m_isa->set_dma_channel(2, this, true); } -isa8_ec1841_0003_device::isa8_ec1841_0003_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +isa8_ec1841_0003_device::isa8_ec1841_0003_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : isa8_fdc_xt_device(mconfig, ISA8_EC1841_0003, tag, owner, clock) , m_bus_mouse(*this, "bus_mouse") { @@ -334,7 +334,7 @@ void isa8_ec1841_0003_device::device_add_mconfig(machine_config &config) { isa8_fdc_xt_device::device_add_mconfig(config); - BUS_MOUSE(config, "bus_mouse", 0).extint_callback().set(FUNC(isa8_ec1841_0003_device::aux_irq_w)); + BUS_MOUSE(config, "bus_mouse").extint_callback().set(FUNC(isa8_ec1841_0003_device::aux_irq_w)); } diff --git a/src/devices/bus/isa/fdc.h b/src/devices/bus/isa/fdc.h index 00431ef3e5c..e287b808191 100644 --- a/src/devices/bus/isa/fdc.h +++ b/src/devices/bus/isa/fdc.h @@ -32,7 +32,7 @@ public: protected: // construction/destruction - isa8_fdc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + isa8_fdc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); virtual uint8_t dack_r(int line) override; virtual void dack_w(int line, uint8_t data) override; @@ -46,7 +46,7 @@ class isa8_upd765_fdc_device : public isa8_fdc_device { protected: // construction/destruction - isa8_upd765_fdc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + isa8_upd765_fdc_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; @@ -72,10 +72,10 @@ private: class isa8_fdc_xt_device : public isa8_upd765_fdc_device { public: - isa8_fdc_xt_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa8_fdc_xt_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: - isa8_fdc_xt_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + isa8_fdc_xt_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); // device-level overrides virtual void device_add_mconfig(machine_config &config) override; @@ -87,7 +87,7 @@ protected: class isa8_fdc_at_device : public isa8_upd765_fdc_device { public: - isa8_fdc_at_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa8_fdc_at_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides @@ -99,7 +99,7 @@ protected: class isa8_fdc_smc_device : public isa8_fdc_device { public: - isa8_fdc_smc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa8_fdc_smc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides @@ -109,7 +109,7 @@ protected: class isa8_fdc_ps2_device : public isa8_fdc_device { public: - isa8_fdc_ps2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa8_fdc_ps2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides @@ -119,7 +119,7 @@ protected: class isa8_fdc_superio_device : public isa8_fdc_device { public: - isa8_fdc_superio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa8_fdc_superio_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides @@ -129,7 +129,7 @@ protected: class isa8_ec1841_0003_device : public isa8_fdc_xt_device { public: - isa8_ec1841_0003_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa8_ec1841_0003_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual void device_start() override; diff --git a/src/devices/bus/isa/finalchs.cpp b/src/devices/bus/isa/finalchs.cpp index 2ee3b169371..e643cdcc36b 100644 --- a/src/devices/bus/isa/finalchs.cpp +++ b/src/devices/bus/isa/finalchs.cpp @@ -26,7 +26,7 @@ DEFINE_DEVICE_TYPE(ISA8_FINALCHS, isa8_finalchs_device, "isa_finalchs", "The Fin // constructor //------------------------------------------------- -isa8_finalchs_device::isa8_finalchs_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +isa8_finalchs_device::isa8_finalchs_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ISA8_FINALCHS, tag, owner, clock), device_isa8_card_interface(mconfig, *this), m_maincpu(*this, "maincpu"), diff --git a/src/devices/bus/isa/finalchs.h b/src/devices/bus/isa/finalchs.h index 2b04f69ec6b..24a869c48c8 100644 --- a/src/devices/bus/isa/finalchs.h +++ b/src/devices/bus/isa/finalchs.h @@ -22,7 +22,7 @@ class isa8_finalchs_device : { public: // construction/destruction - isa8_finalchs_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa8_finalchs_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/isa/gblaster.cpp b/src/devices/bus/isa/gblaster.cpp index 1cbd9458c04..3baa98d5518 100644 --- a/src/devices/bus/isa/gblaster.cpp +++ b/src/devices/bus/isa/gblaster.cpp @@ -88,7 +88,7 @@ void isa8_gblaster_device::device_add_mconfig(machine_config &config) // isa8_gblaster_device - constructor //------------------------------------------------- -isa8_gblaster_device::isa8_gblaster_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +isa8_gblaster_device::isa8_gblaster_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ISA8_GAME_BLASTER, tag, owner, clock), device_isa8_card_interface(mconfig, *this), m_saa1099_1(*this, "saa1099.1"), diff --git a/src/devices/bus/isa/gblaster.h b/src/devices/bus/isa/gblaster.h index 77cec10eded..2743e66732a 100644 --- a/src/devices/bus/isa/gblaster.h +++ b/src/devices/bus/isa/gblaster.h @@ -20,7 +20,7 @@ class isa8_gblaster_device : { public: // construction/destruction - isa8_gblaster_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa8_gblaster_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); uint8_t saa1099_16_r(offs_t offset); void saa1099_1_16_w(offs_t offset, uint8_t data); diff --git a/src/devices/bus/isa/gus.cpp b/src/devices/bus/isa/gus.cpp index 7884ac37c8d..9ce6ab154cf 100644 --- a/src/devices/bus/isa/gus.cpp +++ b/src/devices/bus/isa/gus.cpp @@ -351,7 +351,7 @@ void gf1_device::sound_stream_update(sound_stream &stream, std::vector<read_stre // gf1_device - constructor //------------------------------------------------- -gf1_device::gf1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +gf1_device::gf1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : acia6850_device(mconfig, GGF1, tag, owner, clock), device_sound_interface(mconfig, *this), m_dma_dram_ctrl(0), m_dma_start_addr(0), m_dram_addr(0), m_timer_ctrl(0), m_timer1_count(0), m_timer2_count(0), m_timer1_value(0), m_timer2_value(0), m_sampling_freq(0), m_sampling_ctrl(0), m_joy_trim_dac(0), m_reset(0), m_active_voices(14), m_irq_source(0), @@ -1275,7 +1275,7 @@ void isa16_gus_device::device_add_mconfig(machine_config &config) MIDI_PORT(config, "mdout", midiout_slot, "midiout"); - clock_device &acia_clock(CLOCK(config, "acia_clock", 31250*16)); + clock_device &acia_clock(CLOCK(config, "acia_clock", XTAL::u(31250*16))); acia_clock.signal_handler().set(FUNC(isa16_gus_device::write_acia_clock)); } @@ -1285,7 +1285,7 @@ ioport_constructor isa16_gus_device::device_input_ports() const } -isa16_gus_device::isa16_gus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +isa16_gus_device::isa16_gus_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ISA16_GUS, tag, owner, clock), device_isa16_card_interface(mconfig, *this), m_gf1(*this, "gf1"), diff --git a/src/devices/bus/isa/gus.h b/src/devices/bus/isa/gus.h index c39695997da..0d280e755f0 100644 --- a/src/devices/bus/isa/gus.h +++ b/src/devices/bus/isa/gus.h @@ -78,7 +78,7 @@ public: }; // construction/destruction - gf1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + gf1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); auto txirq_handler() { return m_txirq_handler.bind(); } auto rxirq_handler() { return m_rxirq_handler.bind(); } @@ -222,7 +222,7 @@ class isa16_gus_device : public device_isa16_card_interface { public: - isa16_gus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa16_gus_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); void set_irq(uint8_t source); void reset_irq(uint8_t source); void set_midi_irq(uint8_t source); diff --git a/src/devices/bus/isa/hdc.cpp b/src/devices/bus/isa/hdc.cpp index 74d2a23d11b..e4167d07d2a 100644 --- a/src/devices/bus/isa/hdc.cpp +++ b/src/devices/bus/isa/hdc.cpp @@ -148,13 +148,13 @@ DEFINE_DEVICE_TYPE(XT_HDC, xt_hdc_device, "xt_hdc", "Generic PC-XT Fixed Dis DEFINE_DEVICE_TYPE(EC1841_HDC, ec1841_device, "ec1481", "EX1841 Fixed Disk Controller") DEFINE_DEVICE_TYPE(ST11M_HDC, st11m_device, "st11m", "Seagate ST11M Fixed Disk Controller") -xt_hdc_device::xt_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +xt_hdc_device::xt_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : xt_hdc_device(mconfig, XT_HDC, tag, owner, clock) { m_type = STANDARD; } -xt_hdc_device::xt_hdc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) : +xt_hdc_device::xt_hdc_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_buffer_ptr(nullptr), m_csb(0), @@ -176,7 +176,7 @@ xt_hdc_device::xt_hdc_device(const machine_config &mconfig, device_type type, co { } -ec1841_device::ec1841_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +ec1841_device::ec1841_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : xt_hdc_device(mconfig, EC1841_HDC, tag, owner, clock), m_irq_handler(*this), m_drq_handler(*this) @@ -184,7 +184,7 @@ ec1841_device::ec1841_device(const machine_config &mconfig, const char *tag, dev m_type = EC1841; } -st11m_device::st11m_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +st11m_device::st11m_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : xt_hdc_device(mconfig, ST11M_HDC, tag, owner, clock), m_irq_handler(*this), m_drq_handler(*this) @@ -958,12 +958,12 @@ ioport_constructor isa8_hdc_device::device_input_ports() const // isa8_hdc_device - constructor //------------------------------------------------- -isa8_hdc_device::isa8_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +isa8_hdc_device::isa8_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : isa8_hdc_device(mconfig, ISA8_HDC, tag, owner, clock) { } -isa8_hdc_device::isa8_hdc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) : +isa8_hdc_device::isa8_hdc_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_isa8_card_interface(mconfig, *this), m_hdc(*this,"hdc"), @@ -971,7 +971,7 @@ isa8_hdc_device::isa8_hdc_device(const machine_config &mconfig, device_type type { } -isa8_hdc_ec1841_device::isa8_hdc_ec1841_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +isa8_hdc_ec1841_device::isa8_hdc_ec1841_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : isa8_hdc_device( mconfig, ISA8_HDC_EC1841, tag, owner, clock), m_hdc(*this,"hdc") { diff --git a/src/devices/bus/isa/hdc.h b/src/devices/bus/isa/hdc.h index 0f49d2118f9..98fa199b4ab 100644 --- a/src/devices/bus/isa/hdc.h +++ b/src/devices/bus/isa/hdc.h @@ -25,7 +25,7 @@ class xt_hdc_device : { public: // construction/destruction - xt_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + xt_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); auto irq_handler() { return m_irq_handler.bind(); } auto drq_handler() { return m_drq_handler.bind(); } @@ -46,7 +46,7 @@ public: bool install_rom() { return (m_type != EC1841); } protected: - xt_hdc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + xt_hdc_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; @@ -113,7 +113,7 @@ private: class ec1841_device : public xt_hdc_device { public: - ec1841_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + ec1841_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: devcb_write_line m_irq_handler; devcb_write_line m_drq_handler; @@ -122,7 +122,7 @@ protected: class st11m_device : public xt_hdc_device { public: - st11m_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + st11m_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: devcb_write_line m_irq_handler; @@ -141,14 +141,14 @@ class isa8_hdc_device : { public: // construction/destruction - isa8_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa8_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); uint8_t pc_hdc_r(offs_t offset); void pc_hdc_w(offs_t offset, uint8_t data); required_device<xt_hdc_device> m_hdc; protected: - isa8_hdc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + isa8_hdc_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; @@ -174,7 +174,7 @@ public: class isa8_hdc_ec1841_device : public isa8_hdc_device { public: - isa8_hdc_ec1841_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa8_hdc_ec1841_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // optional information overrides diff --git a/src/devices/bus/isa/ibm_mfc.cpp b/src/devices/bus/isa/ibm_mfc.cpp index a6dbfc81efa..40b5b2b9546 100644 --- a/src/devices/bus/isa/ibm_mfc.cpp +++ b/src/devices/bus/isa/ibm_mfc.cpp @@ -390,7 +390,7 @@ void isa8_ibm_mfc_device::device_add_mconfig(machine_config &config) m_d71055c_1->in_pb_callback().set(FUNC(isa8_ibm_mfc_device::ppi1_i_b)); m_d71055c_1->out_pc_callback().set(FUNC(isa8_ibm_mfc_device::ppi1_o_c)); - I8251(config, m_d71051, 0); + I8251(config, m_d71051); clock_device &usart_clock(CLOCK(config, "usart_clock", XTAL(4'000'000) / 8)); // 500KHz usart_clock.signal_handler().set(FUNC(isa8_ibm_mfc_device::write_usart_clock)); @@ -441,7 +441,7 @@ const tiny_rom_entry *isa8_ibm_mfc_device::device_rom_region() const // isa8_ibm_mfc_device - constructor //------------------------------------------------- -isa8_ibm_mfc_device::isa8_ibm_mfc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +isa8_ibm_mfc_device::isa8_ibm_mfc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ISA8_IBM_MFC, tag, owner, clock), device_isa8_card_interface(mconfig, *this), m_tcr(0), m_pc_ppi_c(0), m_z80_ppi_c(0), m_pc_irq_state(0), m_z80_irq_state(0), diff --git a/src/devices/bus/isa/ibm_mfc.h b/src/devices/bus/isa/ibm_mfc.h index c6efe79d0da..8cc10f9231c 100644 --- a/src/devices/bus/isa/ibm_mfc.h +++ b/src/devices/bus/isa/ibm_mfc.h @@ -29,7 +29,7 @@ class isa8_ibm_mfc_device : public device_t, { public: // Construction/destruction - isa8_ibm_mfc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa8_ibm_mfc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // Device-level overrides diff --git a/src/devices/bus/isa/ide.cpp b/src/devices/bus/isa/ide.cpp index 656995add4e..16c7e2a114f 100644 --- a/src/devices/bus/isa/ide.cpp +++ b/src/devices/bus/isa/ide.cpp @@ -100,7 +100,7 @@ ioport_constructor isa16_ide_device::device_input_ports() const // isa16_ide_device - constructor //------------------------------------------------- -isa16_ide_device::isa16_ide_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +isa16_ide_device::isa16_ide_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ISA16_IDE, tag, owner, clock) , device_isa16_card_interface(mconfig, *this) , m_is_primary(true) diff --git a/src/devices/bus/isa/ide.h b/src/devices/bus/isa/ide.h index 5cdccca6d90..f19afad7c96 100644 --- a/src/devices/bus/isa/ide.h +++ b/src/devices/bus/isa/ide.h @@ -19,7 +19,7 @@ class isa16_ide_device : public device_t, { public: // construction/destruction - isa16_ide_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa16_ide_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); static void cdrom_headphones(device_t *device); diff --git a/src/devices/bus/isa/isa.cpp b/src/devices/bus/isa/isa.cpp index 11aca68d0e7..3746ddb1349 100644 --- a/src/devices/bus/isa/isa.cpp +++ b/src/devices/bus/isa/isa.cpp @@ -23,12 +23,12 @@ DEFINE_DEVICE_TYPE(ISA8_SLOT, isa8_slot_device, "isa8_slot", "8-bit ISA slot") //------------------------------------------------- // isa8_slot_device - constructor //------------------------------------------------- -isa8_slot_device::isa8_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +isa8_slot_device::isa8_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : isa8_slot_device(mconfig, ISA8_SLOT, tag, owner, clock) { } -isa8_slot_device::isa8_slot_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) : +isa8_slot_device::isa8_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_isa_bus(*this, finder_base::DUMMY_TAG) @@ -67,7 +67,7 @@ DEFINE_DEVICE_TYPE(ISA16_SLOT, isa16_slot_device, "isa16_slot", "16-bit ISA slot //------------------------------------------------- // isa16_slot_device - constructor //------------------------------------------------- -isa16_slot_device::isa16_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +isa16_slot_device::isa16_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : isa8_slot_device(mconfig, ISA16_SLOT, tag, owner, clock) { } @@ -99,12 +99,12 @@ DEFINE_DEVICE_TYPE(ISA8, isa8_device, "isa8", "8-bit ISA bus") // isa8_device - constructor //------------------------------------------------- -isa8_device::isa8_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +isa8_device::isa8_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : isa8_device(mconfig, ISA8, tag, owner, clock) { } -isa8_device::isa8_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) : +isa8_device::isa8_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_memory_interface(mconfig, *this), m_mem_config("mem8", ENDIANNESS_LITTLE, 8, 24, 0, address_map_constructor()), @@ -507,7 +507,7 @@ DEFINE_DEVICE_TYPE(ISA16, isa16_device, "isa16", "16-bit ISA bus") // isa16_device - constructor //------------------------------------------------- -isa16_device::isa16_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +isa16_device::isa16_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : isa8_device(mconfig, ISA16, tag, owner, clock), m_out_irq10_cb(*this), m_out_irq11_cb(*this), diff --git a/src/devices/bus/isa/isa.h b/src/devices/bus/isa/isa.h index 939f8d88a26..83276cf075a 100644 --- a/src/devices/bus/isa/isa.h +++ b/src/devices/bus/isa/isa.h @@ -81,8 +81,8 @@ class isa8_slot_device : public device_t, public device_slot_interface public: // construction/destruction template <typename T, typename U> - isa8_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, T &&isa_tag, U &&opts, const char *dflt, bool fixed) - : isa8_slot_device(mconfig, tag, owner, clock) + isa8_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, T &&isa_tag, U &&opts, const char *dflt, bool fixed) + : isa8_slot_device(mconfig, tag, owner) { option_reset(); opts(*this); @@ -90,10 +90,10 @@ public: set_fixed(fixed); m_isa_bus.set_tag(std::forward<T>(isa_tag)); } - isa8_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa8_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL()); protected: - isa8_slot_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + isa8_slot_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; @@ -120,7 +120,7 @@ public: }; // construction/destruction - isa8_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa8_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); // inline configuration template <typename T> void set_memspace(T &&tag, int spacenum) { m_memspace.set_tag(std::forward<T>(tag), spacenum); } @@ -206,7 +206,7 @@ public: const address_space_config m_mem_config, m_io_config, m_mem16_config, m_io16_config; protected: - isa8_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + isa8_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); template<typename R, typename W> void install_space(int spacenum, offs_t start, offs_t end, R rhandler, W whandler); @@ -286,8 +286,8 @@ class isa16_slot_device : public isa8_slot_device public: // construction/destruction template <typename T, typename U> - isa16_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, T &&isa_tag, U &&opts, const char *dflt, bool fixed) - : isa16_slot_device(mconfig, tag, owner, clock) + isa16_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, T &&isa_tag, U &&opts, const char *dflt, bool fixed) + : isa16_slot_device(mconfig, tag, owner) { option_reset(); opts(*this); @@ -295,7 +295,7 @@ public: set_fixed(fixed); m_isa_bus.set_tag(std::forward<T>(isa_tag)); } - isa16_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa16_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL()); protected: // device-level overrides @@ -311,7 +311,7 @@ class isa16_device : public isa8_device { public: // construction/destruction - isa16_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa16_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); auto irq10_callback() { return m_out_irq10_cb.bind(); } auto irq11_callback() { return m_out_irq11_cb.bind(); } diff --git a/src/devices/bus/isa/lbaenhancer.cpp b/src/devices/bus/isa/lbaenhancer.cpp index 242f1f47afe..b4b02884bde 100644 --- a/src/devices/bus/isa/lbaenhancer.cpp +++ b/src/devices/bus/isa/lbaenhancer.cpp @@ -86,7 +86,7 @@ const tiny_rom_entry *lba_enhancer_device::device_rom_region() const //------------------------------------------------- void lba_enhancer_device::device_add_mconfig(machine_config &config) { -// lba_enhancer(config, "lba_enhancer", 0); +// lba_enhancer(config, "lba_enhancer"); } @@ -143,7 +143,7 @@ void lba_enhancer_device::device_reset() // lba_enhancer_device - constructor //------------------------------------------------- -lba_enhancer_device::lba_enhancer_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +lba_enhancer_device::lba_enhancer_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ISA8_LBA_ENHANCER, tag, owner, clock) , device_isa8_card_interface(mconfig, *this) { diff --git a/src/devices/bus/isa/lbaenhancer.h b/src/devices/bus/isa/lbaenhancer.h index 71e36c02665..88ab460febe 100644 --- a/src/devices/bus/isa/lbaenhancer.h +++ b/src/devices/bus/isa/lbaenhancer.h @@ -22,7 +22,7 @@ class lba_enhancer_device : public device_t, { public: // construction/destruction - lba_enhancer_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + lba_enhancer_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/isa/lpt.cpp b/src/devices/bus/isa/lpt.cpp index 268ff2c9caf..e7749180acb 100644 --- a/src/devices/bus/isa/lpt.cpp +++ b/src/devices/bus/isa/lpt.cpp @@ -12,7 +12,7 @@ DEFINE_DEVICE_TYPE(ISA8_LPT, isa8_lpt_device, "isa_lpt", "Printer Adapter") -isa8_lpt_device::isa8_lpt_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +isa8_lpt_device::isa8_lpt_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ISA8_LPT, tag, owner, clock), device_isa8_card_interface(mconfig, *this), m_is_primary(false) diff --git a/src/devices/bus/isa/lpt.h b/src/devices/bus/isa/lpt.h index 1aa2731bfaf..022360650e1 100644 --- a/src/devices/bus/isa/lpt.h +++ b/src/devices/bus/isa/lpt.h @@ -25,7 +25,7 @@ class isa8_lpt_device : public device_t, { public: // construction/destruction - isa8_lpt_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa8_lpt_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); bool is_primary() { return m_is_primary; } diff --git a/src/devices/bus/isa/lrk330.cpp b/src/devices/bus/isa/lrk330.cpp index 18cd1bfe29e..d1dd97e6011 100644 --- a/src/devices/bus/isa/lrk330.cpp +++ b/src/devices/bus/isa/lrk330.cpp @@ -34,7 +34,7 @@ DEFINE_DEVICE_TYPE(LRK331, lrk331_device, "lrk331", "Lark Associates LRK-331 ESDI Controller") -lrk331_device::lrk331_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +lrk331_device::lrk331_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, LRK331, tag, owner, clock) , device_isa16_card_interface(mconfig, *this) , m_mcu(*this, "mcu") diff --git a/src/devices/bus/isa/lrk330.h b/src/devices/bus/isa/lrk330.h index b75a50fa7a3..ca2db1dfd59 100644 --- a/src/devices/bus/isa/lrk330.h +++ b/src/devices/bus/isa/lrk330.h @@ -12,7 +12,7 @@ class lrk331_device : public device_t, public device_isa16_card_interface { public: - lrk331_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + lrk331_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); static constexpr feature_type unemulated_features() { return feature::DISK; } diff --git a/src/devices/bus/isa/mach32.cpp b/src/devices/bus/isa/mach32.cpp index 064947d5c7c..daa549754a7 100644 --- a/src/devices/bus/isa/mach32.cpp +++ b/src/devices/bus/isa/mach32.cpp @@ -25,31 +25,31 @@ DEFINE_DEVICE_TYPE(ATIMACH64_8514A, mach64_8514a_device, "mach64_8514a", "ATi ma */ // 8514/A device -mach32_8514a_device::mach32_8514a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +mach32_8514a_device::mach32_8514a_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : mach32_8514a_device(mconfig, ATIMACH32_8514A, tag, owner, clock) { } -mach32_8514a_device::mach32_8514a_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +mach32_8514a_device::mach32_8514a_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : mach8_device(mconfig, type, tag, owner, clock), m_chip_ID(0), m_membounds(0) { } // SVGA device -mach32_device::mach32_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +mach32_device::mach32_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : mach32_device(mconfig, ATIMACH32, tag, owner, clock) { } -mach32_device::mach32_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +mach32_device::mach32_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : ati_vga_device(mconfig, type, tag, owner, clock), m_8514a(*this,"8514a") { } void mach32_device::device_add_mconfig(machine_config &config) { - ATIMACH32_8514A(config, "8514a", 0).set_vga(DEVICE_SELF); + ATIMACH32_8514A(config, "8514a").set_vga(DEVICE_SELF); EEPROM_93C56_16BIT(config, "ati_eeprom"); } @@ -304,31 +304,31 @@ void mach32_device::mach32_cursor_offset_w(offs_t offset, uint16_t data, uint16_ */ // 8514/A device -mach64_8514a_device::mach64_8514a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +mach64_8514a_device::mach64_8514a_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : mach64_8514a_device(mconfig, ATIMACH64_8514A, tag, owner, clock) { } -mach64_8514a_device::mach64_8514a_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +mach64_8514a_device::mach64_8514a_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : mach32_8514a_device(mconfig, type, tag, owner, clock) { } // SVGA device -mach64_device::mach64_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +mach64_device::mach64_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : mach64_device(mconfig, ATIMACH64, tag, owner, clock) { } -mach64_device::mach64_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +mach64_device::mach64_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : mach32_device(mconfig, type, tag, owner, clock), m_8514a(*this, "8514a") { } void mach64_device::device_add_mconfig(machine_config &config) { - ATIMACH64_8514A(config, "8514a", 0).set_vga(DEVICE_SELF); + ATIMACH64_8514A(config, "8514a").set_vga(DEVICE_SELF); EEPROM_93C56_16BIT(config, "ati_eeprom"); } diff --git a/src/devices/bus/isa/mach32.h b/src/devices/bus/isa/mach32.h index 38b4f673530..70a705e8db5 100644 --- a/src/devices/bus/isa/mach32.h +++ b/src/devices/bus/isa/mach32.h @@ -21,7 +21,7 @@ class mach32_8514a_device : public mach8_device { public: // construction/destruction - mach32_8514a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + mach32_8514a_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); uint16_t mach32_chipid_r() { return m_chip_ID; } uint16_t mach32_mem_boundary_r() { return m_membounds; } @@ -35,7 +35,7 @@ public: bool has_display_mode_changed() { if(display_mode_change) { display_mode_change = false; return true; } else return false; } protected: - mach32_8514a_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + mach32_8514a_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; @@ -51,7 +51,7 @@ class mach32_device : public ati_vga_device { public: // construction/destruction - mach32_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + mach32_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual uint32_t screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect) override; required_device<mach32_8514a_device> m_8514a; // provides accelerated 2D drawing, derived from the Mach8 device @@ -160,7 +160,7 @@ public: void mach32_cursor_offset_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); protected: - mach32_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + mach32_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; @@ -194,10 +194,10 @@ class mach64_8514a_device : public mach32_8514a_device { public: // construction/destruction - mach64_8514a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + mach64_8514a_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: - mach64_8514a_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + mach64_8514a_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; @@ -208,13 +208,13 @@ class mach64_device : public mach32_device { public: // construction/destruction - mach64_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + mach64_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); void mach64_config1_w(uint16_t data) { } // why does the mach64 BIOS write to these, they are read only on the mach32 and earlier void mach64_config2_w(uint16_t data) { } protected: - mach64_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + mach64_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; diff --git a/src/devices/bus/isa/mc1502_fdc.cpp b/src/devices/bus/isa/mc1502_fdc.cpp index ad1c1bd8b8c..217feee9317 100644 --- a/src/devices/bus/isa/mc1502_fdc.cpp +++ b/src/devices/bus/isa/mc1502_fdc.cpp @@ -190,7 +190,7 @@ void mc1502_fdc_device::mc1502_fdc_w(offs_t offset, uint8_t data) // mc1502_fdc_device - constructor //------------------------------------------------- -mc1502_fdc_device::mc1502_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +mc1502_fdc_device::mc1502_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, MC1502_FDC, tag, owner, clock) , device_isa8_card_interface(mconfig, *this) , m_fdc(*this, "fdc") diff --git a/src/devices/bus/isa/mc1502_fdc.h b/src/devices/bus/isa/mc1502_fdc.h index 45fde02945d..d6de540df6c 100644 --- a/src/devices/bus/isa/mc1502_fdc.h +++ b/src/devices/bus/isa/mc1502_fdc.h @@ -25,7 +25,7 @@ class mc1502_fdc_device : public device_t, { public: // construction/destruction - mc1502_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + mc1502_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); template <typename T> void set_cpu(T &&tag) { m_cpu.set_tag(std::forward<T>(tag)); } diff --git a/src/devices/bus/isa/mc1502_rom.cpp b/src/devices/bus/isa/mc1502_rom.cpp index f3a78cb93a6..655c6a737d7 100644 --- a/src/devices/bus/isa/mc1502_rom.cpp +++ b/src/devices/bus/isa/mc1502_rom.cpp @@ -45,7 +45,7 @@ const tiny_rom_entry *mc1502_rom_device::device_rom_region() const // mc1502_rom_device - constructor //------------------------------------------------- -mc1502_rom_device::mc1502_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +mc1502_rom_device::mc1502_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, MC1502_ROM, tag, owner, clock) , device_isa8_card_interface(mconfig, *this) { diff --git a/src/devices/bus/isa/mc1502_rom.h b/src/devices/bus/isa/mc1502_rom.h index bbb152df72f..3a9e8957f3f 100644 --- a/src/devices/bus/isa/mc1502_rom.h +++ b/src/devices/bus/isa/mc1502_rom.h @@ -22,7 +22,7 @@ class mc1502_rom_device : public device_t, { public: // construction/destruction - mc1502_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + mc1502_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); // optional information overrides virtual const tiny_rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/isa/mcd.cpp b/src/devices/bus/isa/mcd.cpp index 9bb8b82a5da..b40d824554e 100644 --- a/src/devices/bus/isa/mcd.cpp +++ b/src/devices/bus/isa/mcd.cpp @@ -35,7 +35,7 @@ void mcd_isa_device::device_add_mconfig(machine_config &config) // mcd_isa_device - constructor //------------------------------------------------- -mcd_isa_device::mcd_isa_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +mcd_isa_device::mcd_isa_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : cdrom_image_device(mconfig, ISA16_MCD, tag, owner, clock), device_isa16_card_interface( mconfig, *this ), m_cdda(*this, "cdda") diff --git a/src/devices/bus/isa/mcd.h b/src/devices/bus/isa/mcd.h index 4c2b7a0e636..a8dfcf64dfd 100644 --- a/src/devices/bus/isa/mcd.h +++ b/src/devices/bus/isa/mcd.h @@ -20,7 +20,7 @@ class mcd_isa_device : public cdrom_image_device, { public: // construction/destruction - mcd_isa_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + mcd_isa_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual uint16_t dack16_r(int line) override; diff --git a/src/devices/bus/isa/mda.cpp b/src/devices/bus/isa/mda.cpp index e3ff8e90f99..542ded743bb 100644 --- a/src/devices/bus/isa/mda.cpp +++ b/src/devices/bus/isa/mda.cpp @@ -158,12 +158,12 @@ const tiny_rom_entry *isa8_mda_device::device_rom_region() const // isa8_mda_device - constructor //------------------------------------------------- -isa8_mda_device::isa8_mda_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +isa8_mda_device::isa8_mda_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : isa8_mda_device(mconfig, ISA8_MDA, tag, owner, clock) { } -isa8_mda_device::isa8_mda_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) : +isa8_mda_device::isa8_mda_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_isa8_card_interface(mconfig, *this), m_crtc(*this, MC6845_NAME), m_lpt(*this, "lpt"), m_framecnt(0), m_mode_control(0), m_update_row_type(-1), m_chr_gen(nullptr), m_vsync(0), m_hsync(0), m_pixel(0), @@ -584,7 +584,7 @@ const tiny_rom_entry *isa8_hercules_device::device_rom_region() const // isa8_hercules_device - constructor //------------------------------------------------- -isa8_hercules_device::isa8_hercules_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +isa8_hercules_device::isa8_hercules_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : isa8_mda_device(mconfig, ISA8_HERCULES, tag, owner, clock), m_configuration_switch(0) { } @@ -783,7 +783,7 @@ void isa8_ec1840_0002_device::device_add_mconfig(machine_config &config) // isa8_ec1840_0002_device - constructor //------------------------------------------------- -isa8_ec1840_0002_device::isa8_ec1840_0002_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +isa8_ec1840_0002_device::isa8_ec1840_0002_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : isa8_mda_device(mconfig, ISA8_EC1840_0002, tag, owner, clock), m_soft_chr_gen(nullptr) { } diff --git a/src/devices/bus/isa/mda.h b/src/devices/bus/isa/mda.h index e16c80e8ce1..4be9f20ad98 100644 --- a/src/devices/bus/isa/mda.h +++ b/src/devices/bus/isa/mda.h @@ -24,7 +24,7 @@ public: friend class isa8_hercules_device; // construction/destruction - isa8_mda_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa8_mda_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual uint8_t io_read(offs_t offset); virtual void io_write(offs_t offset, uint8_t data); @@ -37,7 +37,7 @@ public: virtual MC6845_UPDATE_ROW( crtc_update_row ); protected: - isa8_mda_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + isa8_mda_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; @@ -81,7 +81,7 @@ class isa8_hercules_device : { public: // construction/destruction - isa8_hercules_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa8_hercules_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual uint8_t io_read(offs_t offset) override; virtual void io_write(offs_t offset, uint8_t data) override; @@ -115,7 +115,7 @@ class isa8_ec1840_0002_device : { public: // construction/destruction - isa8_ec1840_0002_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa8_ec1840_0002_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/isa/mpu401.cpp b/src/devices/bus/isa/mpu401.cpp index 7f6a28b87b4..6ca06038fc1 100644 --- a/src/devices/bus/isa/mpu401.cpp +++ b/src/devices/bus/isa/mpu401.cpp @@ -62,7 +62,7 @@ void isa8_mpu401_device::device_add_mconfig(machine_config &config) // isa8_adlib_device - constructor //------------------------------------------------- -isa8_mpu401_device::isa8_mpu401_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +isa8_mpu401_device::isa8_mpu401_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ISA8_MPU401, tag, owner, clock) , device_isa8_card_interface(mconfig, *this) , m_mpu401(*this, MPU_CORE_TAG) diff --git a/src/devices/bus/isa/mpu401.h b/src/devices/bus/isa/mpu401.h index 89974be7b84..7a811fe3e6d 100644 --- a/src/devices/bus/isa/mpu401.h +++ b/src/devices/bus/isa/mpu401.h @@ -20,7 +20,7 @@ class isa8_mpu401_device : { public: // construction/destruction - isa8_mpu401_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa8_mpu401_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/isa/mufdc.cpp b/src/devices/bus/isa/mufdc.cpp index 2a078f812f9..39a29177bdd 100644 --- a/src/devices/bus/isa/mufdc.cpp +++ b/src/devices/bus/isa/mufdc.cpp @@ -128,7 +128,7 @@ const tiny_rom_entry *fdcmag_device::device_rom_region() const // mufdc_device - constructor //------------------------------------------------- -mufdc_device::mufdc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) : +mufdc_device::mufdc_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_isa8_card_interface( mconfig, *this), m_fdc(*this, "fdc"), @@ -136,12 +136,12 @@ mufdc_device::mufdc_device(const machine_config &mconfig, device_type type, cons { } -fdc344_device::fdc344_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +fdc344_device::fdc344_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : mufdc_device(mconfig, ISA8_FDC344, tag, owner, clock) { } -fdcmag_device::fdcmag_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +fdcmag_device::fdcmag_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : mufdc_device(mconfig, ISA8_FDCMAG, tag, owner, clock) { } diff --git a/src/devices/bus/isa/mufdc.h b/src/devices/bus/isa/mufdc.h index b746d135003..5c1457ff679 100644 --- a/src/devices/bus/isa/mufdc.h +++ b/src/devices/bus/isa/mufdc.h @@ -34,7 +34,7 @@ class mufdc_device : public device_t, public device_isa8_card_interface { protected: // construction/destruction - mufdc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + mufdc_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; @@ -65,7 +65,7 @@ class fdc344_device : public mufdc_device { public: // construction/destruction - fdc344_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + fdc344_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual const tiny_rom_entry *device_rom_region() const override; }; @@ -74,7 +74,7 @@ class fdcmag_device : public mufdc_device { public: // construction/destruction - fdcmag_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + fdcmag_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); virtual const tiny_rom_entry *device_rom_region() const override; }; diff --git a/src/devices/bus/isa/myb3k_com.cpp b/src/devices/bus/isa/myb3k_com.cpp index b500d95b993..b7347901357 100644 --- a/src/devices/bus/isa/myb3k_com.cpp +++ b/src/devices/bus/isa/myb3k_com.cpp @@ -49,7 +49,7 @@ void isa8_myb3k_com_device::device_add_mconfig(machine_config &config) // TODO: configure RxC and TxC from RS232 connector when these are defined is rs232.h /* Timer chip */ - pit8253_device &pit(PIT8253(config, "pit", 0)); + pit8253_device &pit(PIT8253(config, "pit")); pit.set_clk<0>(XTAL(15'974'400) / 8); /* TxC */ pit.out_handler<0>().set(FUNC(isa8_myb3k_com_device::pit_txc)); pit.set_clk<1>(XTAL(15'974'400) / 8); /* RxC */ @@ -66,12 +66,12 @@ void isa8_myb3k_com_device::device_add_mconfig(machine_config &config) //------------------------------------------------- // isa8_myb3k_com_device - constructor //------------------------------------------------- -isa8_myb3k_com_device::isa8_myb3k_com_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +isa8_myb3k_com_device::isa8_myb3k_com_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : isa8_myb3k_com_device(mconfig, ISA8_MYB3K_COM, tag, owner, clock) { } -isa8_myb3k_com_device::isa8_myb3k_com_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) : +isa8_myb3k_com_device::isa8_myb3k_com_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_isa8_card_interface(mconfig, *this) , m_iobase(*this, "DPSW1") diff --git a/src/devices/bus/isa/myb3k_com.h b/src/devices/bus/isa/myb3k_com.h index bdd591b5291..f3267f716be 100644 --- a/src/devices/bus/isa/myb3k_com.h +++ b/src/devices/bus/isa/myb3k_com.h @@ -37,7 +37,7 @@ class isa8_myb3k_com_device : { public: // construction/destruction - isa8_myb3k_com_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa8_myb3k_com_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); DECLARE_WRITE_LINE_MEMBER(pit_txc); DECLARE_WRITE_LINE_MEMBER(pit_rxc); @@ -51,7 +51,7 @@ public: uint8_t dce_status(); protected: - isa8_myb3k_com_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + isa8_myb3k_com_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; diff --git a/src/devices/bus/isa/myb3k_fdc.cpp b/src/devices/bus/isa/myb3k_fdc.cpp index 1ca69a19be5..8687464c811 100644 --- a/src/devices/bus/isa/myb3k_fdc.cpp +++ b/src/devices/bus/isa/myb3k_fdc.cpp @@ -116,7 +116,7 @@ void isa8_myb3k_fdc4712_device::device_add_mconfig(machine_config &config) //************************************************************************** // LIVE DEVICES //************************************************************************** -isa8_myb3k_fdc471x_device_base::isa8_myb3k_fdc471x_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) : +isa8_myb3k_fdc471x_device_base::isa8_myb3k_fdc471x_device_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_isa8_card_interface(mconfig, *this), m_fdc(*this, "fdc"), @@ -124,7 +124,7 @@ isa8_myb3k_fdc471x_device_base::isa8_myb3k_fdc471x_device_base(const machine_con { } -isa8_myb3k_fdc4710_device::isa8_myb3k_fdc4710_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +isa8_myb3k_fdc4710_device::isa8_myb3k_fdc4710_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : isa8_myb3k_fdc471x_device_base(mconfig, ISA8_MYB3K_FDC4710, tag, owner, clock) { has_motor_control = true; @@ -132,7 +132,7 @@ isa8_myb3k_fdc4710_device::isa8_myb3k_fdc4710_device(const machine_config &mconf dma_channel = 2; } -isa8_myb3k_fdc4711_device::isa8_myb3k_fdc4711_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +isa8_myb3k_fdc4711_device::isa8_myb3k_fdc4711_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : isa8_myb3k_fdc471x_device_base(mconfig, ISA8_MYB3K_FDC4711, tag, owner, clock) { has_motor_control = true; @@ -140,7 +140,7 @@ isa8_myb3k_fdc4711_device::isa8_myb3k_fdc4711_device(const machine_config &mconf dma_channel = 2; } -isa8_myb3k_fdc4712_device::isa8_myb3k_fdc4712_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +isa8_myb3k_fdc4712_device::isa8_myb3k_fdc4712_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : isa8_myb3k_fdc471x_device_base(mconfig, ISA8_MYB3K_FDC4712, tag, owner, clock), selected_drive(0) { diff --git a/src/devices/bus/isa/myb3k_fdc.h b/src/devices/bus/isa/myb3k_fdc.h index b2a645423d6..f1223096c38 100644 --- a/src/devices/bus/isa/myb3k_fdc.h +++ b/src/devices/bus/isa/myb3k_fdc.h @@ -20,7 +20,7 @@ class isa8_myb3k_fdc471x_device_base : public device_isa8_card_interface { protected: - isa8_myb3k_fdc471x_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + isa8_myb3k_fdc471x_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); // device-level overrides virtual void device_add_mconfig(machine_config &config) override; @@ -67,11 +67,11 @@ class isa8_myb3k_fdc4710_device : public isa8_myb3k_fdc471x_device_base { public: // construction/destruction - isa8_myb3k_fdc4710_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa8_myb3k_fdc4710_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // construction/destruction - isa8_myb3k_fdc4710_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + isa8_myb3k_fdc4710_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); // device-level overrides virtual void device_add_mconfig(machine_config &config) override; @@ -81,11 +81,11 @@ class isa8_myb3k_fdc4711_device : public isa8_myb3k_fdc471x_device_base { public: // construction/destruction - isa8_myb3k_fdc4711_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa8_myb3k_fdc4711_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // construction/destruction - isa8_myb3k_fdc4711_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + isa8_myb3k_fdc4711_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); // device-level overrides virtual void device_add_mconfig(machine_config &config) override; @@ -95,11 +95,11 @@ class isa8_myb3k_fdc4712_device : public isa8_myb3k_fdc471x_device_base { public: // construction/destruction - isa8_myb3k_fdc4712_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa8_myb3k_fdc4712_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // construction/destruction - isa8_myb3k_fdc4712_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + isa8_myb3k_fdc4712_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); // device-level overrides virtual void device_add_mconfig(machine_config &config) override; diff --git a/src/devices/bus/isa/ne1000.cpp b/src/devices/bus/isa/ne1000.cpp index d2234098c34..4f5e5a0a1b6 100644 --- a/src/devices/bus/isa/ne1000.cpp +++ b/src/devices/bus/isa/ne1000.cpp @@ -8,13 +8,13 @@ DEFINE_DEVICE_TYPE(NE1000, ne1000_device, "ne1000", "NE1000 Network Adapter") void ne1000_device::device_add_mconfig(machine_config &config) { - DP8390D(config, m_dp8390, 0); + DP8390D(config, m_dp8390); m_dp8390->irq_callback().set(FUNC(ne1000_device::ne1000_irq_w)); m_dp8390->mem_read_callback().set(FUNC(ne1000_device::ne1000_mem_read)); m_dp8390->mem_write_callback().set(FUNC(ne1000_device::ne1000_mem_write)); } -ne1000_device::ne1000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +ne1000_device::ne1000_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, NE1000, tag, owner, clock), device_isa8_card_interface(mconfig, *this), m_dp8390(*this, "dp8390d"), diff --git a/src/devices/bus/isa/ne1000.h b/src/devices/bus/isa/ne1000.h index fa6011b45e1..af1e4fbfdbd 100644 --- a/src/devices/bus/isa/ne1000.h +++ b/src/devices/bus/isa/ne1000.h @@ -14,7 +14,7 @@ class ne1000_device: public device_t, public device_isa8_card_interface { public: - ne1000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + ne1000_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); uint8_t ne1000_port_r(offs_t offset); void ne1000_port_w(offs_t offset, uint8_t data); diff --git a/src/devices/bus/isa/ne2000.cpp b/src/devices/bus/isa/ne2000.cpp index 08c73b96dac..e168dc2f9af 100644 --- a/src/devices/bus/isa/ne2000.cpp +++ b/src/devices/bus/isa/ne2000.cpp @@ -8,13 +8,13 @@ DEFINE_DEVICE_TYPE(NE2000, ne2000_device, "ne2000", "NE2000 Network Adapter") void ne2000_device::device_add_mconfig(machine_config &config) { - DP8390D(config, m_dp8390, 0); + DP8390D(config, m_dp8390); m_dp8390->irq_callback().set(FUNC(ne2000_device::ne2000_irq_w)); m_dp8390->mem_read_callback().set(FUNC(ne2000_device::ne2000_mem_read)); m_dp8390->mem_write_callback().set(FUNC(ne2000_device::ne2000_mem_write)); } -ne2000_device::ne2000_device(const machine_config& mconfig, const char* tag, device_t* owner, uint32_t clock) +ne2000_device::ne2000_device(const machine_config& mconfig, const char* tag, device_t* owner, const XTAL &clock) : device_t(mconfig, NE2000, tag, owner, clock), device_isa16_card_interface(mconfig, *this), m_dp8390(*this, "dp8390d"), diff --git a/src/devices/bus/isa/ne2000.h b/src/devices/bus/isa/ne2000.h index 328443fd9b2..e812a9881ff 100644 --- a/src/devices/bus/isa/ne2000.h +++ b/src/devices/bus/isa/ne2000.h @@ -12,7 +12,7 @@ class ne2000_device: public device_t, public device_isa16_card_interface { public: - ne2000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + ne2000_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); uint16_t ne2000_port_r(offs_t offset, uint16_t mem_mask = ~0); void ne2000_port_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0); diff --git a/src/devices/bus/isa/np600.cpp b/src/devices/bus/isa/np600.cpp index 5fca3ff1910..3b7da41dc69 100644 --- a/src/devices/bus/isa/np600.cpp +++ b/src/devices/bus/isa/np600.cpp @@ -15,7 +15,7 @@ DEFINE_DEVICE_TYPE(NP600A3, np600a3_device, "np600a3", "InterLan NP600A-3 Intelligent Protocol Processor") -np600a3_device::np600a3_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +np600a3_device::np600a3_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, NP600A3, tag, owner, clock) , device_isa16_card_interface(mconfig, *this) , m_npcpu(*this, "npcpu") diff --git a/src/devices/bus/isa/np600.h b/src/devices/bus/isa/np600.h index 51bdf8813c1..57ea34a0d31 100644 --- a/src/devices/bus/isa/np600.h +++ b/src/devices/bus/isa/np600.h @@ -17,7 +17,7 @@ class np600a3_device : public device_t, public device_isa16_card_interface { public: - np600a3_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + np600a3_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); static constexpr feature_type unemulated_features() { return feature::LAN; } diff --git a/src/devices/bus/isa/num9rev.cpp b/src/devices/bus/isa/num9rev.cpp index c7756b8294b..a9652d60e53 100644 --- a/src/devices/bus/isa/num9rev.cpp +++ b/src/devices/bus/isa/num9rev.cpp @@ -76,7 +76,7 @@ void isa8_number_9_rev_device::device_add_mconfig(machine_config &config) // isa16_vga_device - constructor //------------------------------------------------- -isa8_number_9_rev_device::isa8_number_9_rev_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +isa8_number_9_rev_device::isa8_number_9_rev_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ISA8_NUM_9_REV, tag, owner, clock), device_isa8_card_interface(mconfig, *this), m_upd7220(*this, "upd7220"), diff --git a/src/devices/bus/isa/num9rev.h b/src/devices/bus/isa/num9rev.h index 298af6d91f5..e0e12f6a1c7 100644 --- a/src/devices/bus/isa/num9rev.h +++ b/src/devices/bus/isa/num9rev.h @@ -22,7 +22,7 @@ class isa8_number_9_rev_device : { public: // construction/destruction - isa8_number_9_rev_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa8_number_9_rev_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/isa/omti8621.cpp b/src/devices/bus/isa/omti8621.cpp index 186e398c411..35a3a43c6ea 100644 --- a/src/devices/bus/isa/omti8621.cpp +++ b/src/devices/bus/isa/omti8621.cpp @@ -51,7 +51,7 @@ class omti_disk_image_device : public harddisk_image_base_device { public: // construction/destruction - omti_disk_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + omti_disk_image_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); // image-level overrides virtual bool support_command_line_image_creation() const noexcept override { return true; } @@ -239,8 +239,8 @@ INPUT_PORTS_END void omti8621_device::device_add_mconfig(machine_config &config) { - OMTI_DISK(config, OMTI_DISK0_TAG, 0); - OMTI_DISK(config, OMTI_DISK1_TAG, 0); + OMTI_DISK(config, OMTI_DISK0_TAG); + OMTI_DISK(config, OMTI_DISK1_TAG); UPD765A(config, m_fdc, 48_MHz_XTAL / 6, false, false); // clocked through FDC9239BT m_fdc->intrq_wr_callback().set(FUNC(omti8621_device::fdc_irq_w)); @@ -370,14 +370,14 @@ void omti8621_device::device_reset() DEFINE_DEVICE_TYPE(ISA16_OMTI8621, omti8621_pc_device, "omti8621isa", "OMTI 8621 ESDI/floppy controller (ISA)") -omti8621_pc_device::omti8621_pc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +omti8621_pc_device::omti8621_pc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : omti8621_device(mconfig, ISA16_OMTI8621, tag, owner, clock) { } DEFINE_DEVICE_TYPE(ISA16_OMTI8621_APOLLO, omti8621_apollo_device, "omti8621ap", "OMTI 8621 ESDI/floppy controller (Apollo)") -omti8621_apollo_device::omti8621_apollo_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +omti8621_apollo_device::omti8621_apollo_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : omti8621_device(mconfig, ISA16_OMTI8621_APOLLO, tag, owner, clock) { } @@ -1379,7 +1379,7 @@ uint8_t omti8621_device::fd_disk_chg_r() // device type definition DEFINE_DEVICE_TYPE(OMTI_DISK, omti_disk_image_device, "omti_disk_image", "OMTI 8621 ESDI disk") -omti_disk_image_device::omti_disk_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +omti_disk_image_device::omti_disk_image_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : harddisk_image_base_device(mconfig, OMTI_DISK, tag, owner, clock) , m_type(0), m_cylinders(0), m_heads(0), m_sectors(0), m_sectorbytes(0), m_sector_count(0), m_image(nullptr) { diff --git a/src/devices/bus/isa/omti8621.h b/src/devices/bus/isa/omti8621.h index 3e5cce1c59a..2d80d8fec01 100644 --- a/src/devices/bus/isa/omti8621.h +++ b/src/devices/bus/isa/omti8621.h @@ -148,7 +148,7 @@ private: class omti8621_pc_device : public omti8621_device { public: - omti8621_pc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + omti8621_pc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); }; DECLARE_DEVICE_TYPE(ISA16_OMTI8621, omti8621_pc_device) @@ -158,7 +158,7 @@ DECLARE_DEVICE_TYPE(ISA16_OMTI8621, omti8621_pc_device) class omti8621_apollo_device : public omti8621_device { public: - omti8621_apollo_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + omti8621_apollo_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); // get sector diskaddr of logical unit lun into data_buffer uint32_t get_sector(int32_t diskaddr, uint8_t *buffer, uint32_t length, uint8_t lun); diff --git a/src/devices/bus/isa/p1_fdc.cpp b/src/devices/bus/isa/p1_fdc.cpp index 390f98727b0..46fd1b1bac9 100644 --- a/src/devices/bus/isa/p1_fdc.cpp +++ b/src/devices/bus/isa/p1_fdc.cpp @@ -152,7 +152,7 @@ void p1_fdc_device::p1_fdc_w(offs_t offset, uint8_t data) // p1_fdc_device - constructor //------------------------------------------------- -p1_fdc_device::p1_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +p1_fdc_device::p1_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, P1_FDC, tag, owner, clock) , device_isa8_card_interface(mconfig, *this) , m_fdc(*this, "fdc") diff --git a/src/devices/bus/isa/p1_fdc.h b/src/devices/bus/isa/p1_fdc.h index ceeb278f5c7..7c5fbd9f831 100644 --- a/src/devices/bus/isa/p1_fdc.h +++ b/src/devices/bus/isa/p1_fdc.h @@ -25,7 +25,7 @@ class p1_fdc_device : public device_t, { public: // construction/destruction - p1_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + p1_fdc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); template <typename T> void set_cpu(T &&tag) { m_cpu.set_tag(std::forward<T>(tag)); } diff --git a/src/devices/bus/isa/p1_hdc.cpp b/src/devices/bus/isa/p1_hdc.cpp index 9ee84ece875..fe397c371f0 100644 --- a/src/devices/bus/isa/p1_hdc.cpp +++ b/src/devices/bus/isa/p1_hdc.cpp @@ -55,15 +55,15 @@ ROM_END void p1_hdc_device::device_add_mconfig(machine_config &config) { - WD2010(config, m_hdc, 5'000'000); // XXX clock? + WD2010(config, m_hdc, XTAL::u(5'000'000)); // XXX clock? m_hdc->in_drdy_callback().set_constant(1); m_hdc->in_index_callback().set_constant(1); m_hdc->in_wf_callback().set_constant(1); m_hdc->in_tk000_callback().set_constant(1); m_hdc->in_sc_callback().set_constant(1); - HARDDISK(config, "hard0", 0); - HARDDISK(config, "hard1", 0); + HARDDISK(config, "hard0"); + HARDDISK(config, "hard1"); } @@ -111,7 +111,7 @@ void p1_hdc_device::p1_HDC_w(offs_t offset, uint8_t data) // p1_hdc_device - constructor //------------------------------------------------- -p1_hdc_device::p1_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +p1_hdc_device::p1_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, P1_HDC, tag, owner, clock) , device_isa8_card_interface(mconfig, *this) , m_hdc(*this, "d17") diff --git a/src/devices/bus/isa/p1_hdc.h b/src/devices/bus/isa/p1_hdc.h index 2947dba1e84..0109dec1e89 100644 --- a/src/devices/bus/isa/p1_hdc.h +++ b/src/devices/bus/isa/p1_hdc.h @@ -25,7 +25,7 @@ class p1_hdc_device : public device_t, { public: // construction/destruction - p1_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + p1_hdc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/isa/p1_rom.cpp b/src/devices/bus/isa/p1_rom.cpp index 76013aca719..864eaec5e3e 100644 --- a/src/devices/bus/isa/p1_rom.cpp +++ b/src/devices/bus/isa/p1_rom.cpp @@ -50,7 +50,7 @@ const tiny_rom_entry *p1_rom_device::device_rom_region() const // p1_rom_device - constructor //------------------------------------------------- -p1_rom_device::p1_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +p1_rom_device::p1_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, P1_ROM, tag, owner, clock) , device_isa8_card_interface(mconfig, *this) { diff --git a/src/devices/bus/isa/p1_rom.h b/src/devices/bus/isa/p1_rom.h index d5fd89662d5..884a1681e37 100644 --- a/src/devices/bus/isa/p1_rom.h +++ b/src/devices/bus/isa/p1_rom.h @@ -22,7 +22,7 @@ class p1_rom_device : public device_t, { public: // construction/destruction - p1_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + p1_rom_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); // optional information overrides virtual const tiny_rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/isa/p1_sound.cpp b/src/devices/bus/isa/p1_sound.cpp index f2e69debf95..c81c61b15d0 100644 --- a/src/devices/bus/isa/p1_sound.cpp +++ b/src/devices/bus/isa/p1_sound.cpp @@ -27,7 +27,7 @@ DEFINE_DEVICE_TYPE(P1_SOUND, p1_sound_device, "p1_sound", "Poisk-1 sound card (B void p1_sound_device::device_add_mconfig(machine_config &config) { - I8251(config, m_midi, 0); + I8251(config, m_midi); m_midi->txd_handler().set("mdout", FUNC(midi_port_device::write_txd)); m_midi->rxrdy_handler().set(":isa", FUNC(isa8_device::irq3_w)); @@ -35,7 +35,7 @@ void p1_sound_device::device_add_mconfig(machine_config &config) MIDI_PORT(config, "mdout", midiout_slot, "midiout"); - PIT8253(config, m_d14, 0); + PIT8253(config, m_d14); m_d14->set_clk<0>(XTAL(12'500'000)/10); // sampler at 10 KHz m_d14->out_handler<0>().set(FUNC(p1_sound_device::sampler_sync)); @@ -44,7 +44,7 @@ void p1_sound_device::device_add_mconfig(machine_config &config) m_d14->set_clk<2>(XTAL(12'500'000)/10); m_d14->out_handler<2>().set(m_midi, FUNC(i8251_device::write_rxc)); - PIT8253(config, m_d16, 0); + PIT8253(config, m_d16); m_d16->set_clk<0>(XTAL(12'500'000)/10); // m_d16->out_handler<0>().set(FUNC(XXX)); m_d16->set_clk<1>(XTAL(12'500'000)/10); @@ -52,7 +52,7 @@ void p1_sound_device::device_add_mconfig(machine_config &config) m_d16->set_clk<2>(XTAL(12'500'000)/10); // m_d16->out_handler<2>().set(FUNC(XXX)); - PIT8253(config, m_d17, 0); + PIT8253(config, m_d17); m_d17->set_clk<0>(XTAL(12'500'000)/10); // m_d17->out_handler<0>().set(FUNC(XXX)); m_d17->set_clk<1>(XTAL(12'500'000)/10); @@ -62,7 +62,7 @@ void p1_sound_device::device_add_mconfig(machine_config &config) SPEAKER(config, "speaker").front_center(); FILTER_RC(config, m_filter).add_route(ALL_OUTPUTS, "speaker", 1.0); - DAC_8BIT_R2R(config, m_dac, 0).add_route(ALL_OUTPUTS, "filter", 0.5); // unknown DAC + DAC_8BIT_R2R(config, m_dac).add_route(ALL_OUTPUTS, "filter", 0.5); // unknown DAC } @@ -74,7 +74,7 @@ void p1_sound_device::device_add_mconfig(machine_config &config) // p1_sound_device - constructor //------------------------------------------------- -p1_sound_device::p1_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +p1_sound_device::p1_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, P1_SOUND, tag, owner, clock) , device_isa8_card_interface(mconfig, *this) , m_dac(*this, "dac") diff --git a/src/devices/bus/isa/p1_sound.h b/src/devices/bus/isa/p1_sound.h index 3b7f1c40af9..e85c524ff1c 100644 --- a/src/devices/bus/isa/p1_sound.h +++ b/src/devices/bus/isa/p1_sound.h @@ -28,7 +28,7 @@ class p1_sound_device : public device_t, { public: // construction/destruction - p1_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + p1_sound_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); uint8_t d14_r(offs_t offset); uint8_t d16_r(offs_t offset); diff --git a/src/devices/bus/isa/pc1640_iga.cpp b/src/devices/bus/isa/pc1640_iga.cpp index 96ae2da109b..6fd14d76f10 100644 --- a/src/devices/bus/isa/pc1640_iga.cpp +++ b/src/devices/bus/isa/pc1640_iga.cpp @@ -66,7 +66,7 @@ const tiny_rom_entry *isa8_pc1640_iga_device::device_rom_region() const // isa8_pc1640_iga_device - constructor //------------------------------------------------- -isa8_pc1640_iga_device::isa8_pc1640_iga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +isa8_pc1640_iga_device::isa8_pc1640_iga_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : isa8_ega_device(mconfig, ISA8_PC1640_IGA, tag, owner, clock) { } diff --git a/src/devices/bus/isa/pc1640_iga.h b/src/devices/bus/isa/pc1640_iga.h index 0cee53d6329..d52d8dfaabd 100644 --- a/src/devices/bus/isa/pc1640_iga.h +++ b/src/devices/bus/isa/pc1640_iga.h @@ -26,7 +26,7 @@ class isa8_pc1640_iga_device : public isa8_ega_device { public: // construction/destruction - isa8_pc1640_iga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa8_pc1640_iga_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); // optional information overrides virtual const tiny_rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/isa/pcmidi.cpp b/src/devices/bus/isa/pcmidi.cpp index 45cc41ff4f4..283b23963d6 100644 --- a/src/devices/bus/isa/pcmidi.cpp +++ b/src/devices/bus/isa/pcmidi.cpp @@ -65,7 +65,7 @@ DEFINE_DEVICE_TYPE(ISA8_PCMIDI, isa8_pcmidi_device, "isa_pcmidi", "Music Quest P // isa8_pcmidi_device - constructor //------------------------------------------------- -isa8_pcmidi_device::isa8_pcmidi_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +isa8_pcmidi_device::isa8_pcmidi_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ISA8_PCMIDI, tag, owner, clock) , device_isa8_card_interface(mconfig, *this) , m_mpu(*this, "mpu") diff --git a/src/devices/bus/isa/pcmidi.h b/src/devices/bus/isa/pcmidi.h index 90bca2b5752..649e9664f16 100644 --- a/src/devices/bus/isa/pcmidi.h +++ b/src/devices/bus/isa/pcmidi.h @@ -14,7 +14,7 @@ class isa8_pcmidi_device : public device_t, public device_isa8_card_interface { public: - isa8_pcmidi_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + isa8_pcmidi_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual void device_start() override; diff --git a/src/devices/bus/isa/pds.cpp b/src/devices/bus/isa/pds.cpp index 255d0f7dbe0..4dc2c8d387f 100644 --- a/src/devices/bus/isa/pds.cpp +++ b/src/devices/bus/isa/pds.cpp @@ -21,7 +21,7 @@ DEFINE_DEVICE_TYPE(ISA8_PDS, isa8_pds_device, "isa_pds", "Programmers Development System (host)") -isa8_pds_device::isa8_pds_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +isa8_pds_device::isa8_pds_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ISA8_PDS, tag, owner, clock) , device_isa8_card_interface(mconfig, *this) , m_ppi(*this,"pds_ppi") diff --git a/src/devices/bus/isa/pds.h b/src/devices/bus/isa/pds.h index 3188fdac0ad..92bb842562a 100644 --- a/src/devices/bus/isa/pds.h +++ b/src/devices/bus/isa/pds.h @@ -17,7 +17,7 @@ class isa8_pds_device : public device_isa8_card_interface { public: - isa8_pds_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa8_pds_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); uint8_t ppi_r(offs_t offset); void ppi_w(offs_t offset, uint8_t data); diff --git a/src/devices/bus/isa/pgc.cpp b/src/devices/bus/isa/pgc.cpp index b8329e0ee53..962e3b99da2 100644 --- a/src/devices/bus/isa/pgc.cpp +++ b/src/devices/bus/isa/pgc.cpp @@ -197,12 +197,12 @@ ioport_constructor isa8_pgc_device::device_input_ports() const // isa8_pgc_device - constructor //------------------------------------------------- -isa8_pgc_device::isa8_pgc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +isa8_pgc_device::isa8_pgc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : isa8_pgc_device(mconfig, ISA8_PGC, tag, owner, clock) { } -isa8_pgc_device::isa8_pgc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) : +isa8_pgc_device::isa8_pgc_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_isa8_card_interface(mconfig, *this), m_cpu(*this, "maincpu"), diff --git a/src/devices/bus/isa/pgc.h b/src/devices/bus/isa/pgc.h index d560dbdda09..c2a06dadb0d 100644 --- a/src/devices/bus/isa/pgc.h +++ b/src/devices/bus/isa/pgc.h @@ -24,10 +24,10 @@ class isa8_pgc_device : { public: // construction/destruction - isa8_pgc_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa8_pgc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: - isa8_pgc_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + isa8_pgc_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; diff --git a/src/devices/bus/isa/s3virge.cpp b/src/devices/bus/isa/s3virge.cpp index 9fb6f98d204..9a3b395ee50 100644 --- a/src/devices/bus/isa/s3virge.cpp +++ b/src/devices/bus/isa/s3virge.cpp @@ -35,28 +35,28 @@ DEFINE_DEVICE_TYPE(S3VIRGE, s3virge_vga_device, "virge_vga", "S3 DEFINE_DEVICE_TYPE(S3VIRGEDX, s3virgedx_vga_device, "virgedx_vga", "S3 86C375") DEFINE_DEVICE_TYPE(S3VIRGEDX1, s3virgedx_rev1_vga_device, "virgedx_vga_r1", "S3 86C375 (rev 1)") -s3virge_vga_device::s3virge_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +s3virge_vga_device::s3virge_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : s3virge_vga_device(mconfig, S3VIRGE, tag, owner, clock) { } -s3virge_vga_device::s3virge_vga_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +s3virge_vga_device::s3virge_vga_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : s3_vga_device(mconfig, type, tag, owner, clock) , m_linear_config_changed_cb(*this) { } -s3virgedx_vga_device::s3virgedx_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +s3virgedx_vga_device::s3virgedx_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : s3virgedx_vga_device(mconfig, S3VIRGEDX, tag, owner, clock) { } -s3virgedx_vga_device::s3virgedx_vga_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +s3virgedx_vga_device::s3virgedx_vga_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : s3virge_vga_device(mconfig, type, tag, owner, clock) { } -s3virgedx_rev1_vga_device::s3virgedx_rev1_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +s3virgedx_rev1_vga_device::s3virgedx_rev1_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : s3virgedx_vga_device(mconfig, S3VIRGEDX1, tag, owner, clock) { } diff --git a/src/devices/bus/isa/s3virge.h b/src/devices/bus/isa/s3virge.h index aec31340d7b..6146c8300e0 100644 --- a/src/devices/bus/isa/s3virge.h +++ b/src/devices/bus/isa/s3virge.h @@ -20,7 +20,7 @@ class s3virge_vga_device : public s3_vga_device { public: // construction/destruction - s3virge_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + s3virge_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); auto linear_config_changed() { return m_linear_config_changed_cb.bind(); } @@ -75,7 +75,7 @@ public: ibm8514a_device* get_8514() { fatalerror("s3virge requested non-existent 8514/A device\n"); return nullptr; } protected: - s3virge_vga_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + s3virge_vga_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; @@ -220,10 +220,10 @@ class s3virgedx_vga_device : public s3virge_vga_device { public: // construction/destruction - s3virgedx_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + s3virgedx_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: - s3virgedx_vga_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + s3virgedx_vga_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; @@ -236,7 +236,7 @@ class s3virgedx_rev1_vga_device : public s3virgedx_vga_device { public: // construction/destruction - s3virgedx_rev1_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + s3virgedx_rev1_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/isa/sb16.cpp b/src/devices/bus/isa/sb16.cpp index 333703f2cfc..4435981f030 100644 --- a/src/devices/bus/isa/sb16.cpp +++ b/src/devices/bus/isa/sb16.cpp @@ -434,8 +434,8 @@ void sb16_lle_device::device_add_mconfig(machine_config &config) ymf262.add_route(2, "lspeaker", 1.00); ymf262.add_route(3, "rspeaker", 1.00); - DAC_16BIT_R2R(config, m_ldac, 0).add_route(ALL_OUTPUTS, "lspeaker", 0.5); // unknown DAC - DAC_16BIT_R2R(config, m_rdac, 0).add_route(ALL_OUTPUTS, "rspeaker", 0.5); // unknown DAC + DAC_16BIT_R2R(config, m_ldac).add_route(ALL_OUTPUTS, "lspeaker", 0.5); // unknown DAC + DAC_16BIT_R2R(config, m_rdac).add_route(ALL_OUTPUTS, "rspeaker", 0.5); // unknown DAC PC_JOY(config, m_joy); } @@ -684,7 +684,7 @@ void sb16_lle_device::mpu401_w(offs_t offset, uint8_t data) } -sb16_lle_device::sb16_lle_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +sb16_lle_device::sb16_lle_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ISA16_SB16, tag, owner, clock), device_isa16_card_interface(mconfig, *this), m_ldac(*this, "ldac"), diff --git a/src/devices/bus/isa/sb16.h b/src/devices/bus/isa/sb16.h index 8710574ba85..06bf6254c8e 100644 --- a/src/devices/bus/isa/sb16.h +++ b/src/devices/bus/isa/sb16.h @@ -20,7 +20,7 @@ class sb16_lle_device : public device_t, public device_isa16_card_interface { public: // construction/destruction - sb16_lle_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + sb16_lle_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/isa/sblaster.cpp b/src/devices/bus/isa/sblaster.cpp index 33905e05da3..9a9c1fd7f02 100644 --- a/src/devices/bus/isa/sblaster.cpp +++ b/src/devices/bus/isa/sblaster.cpp @@ -1152,8 +1152,8 @@ void sb_device::common(machine_config &config) SPEAKER(config, "lspeaker").front_left(); SPEAKER(config, "rspeaker").front_right(); - DAC_16BIT_R2R(config, m_ldac, 0).add_route(ALL_OUTPUTS, "lspeaker", 0.5); // unknown DAC - DAC_16BIT_R2R(config, m_rdac, 0).add_route(ALL_OUTPUTS, "rspeaker", 0.5); // unknown DAC + DAC_16BIT_R2R(config, m_ldac).add_route(ALL_OUTPUTS, "lspeaker", 0.5); // unknown DAC + DAC_16BIT_R2R(config, m_rdac).add_route(ALL_OUTPUTS, "rspeaker", 0.5); // unknown DAC PC_JOY(config, m_joy); @@ -1203,7 +1203,7 @@ void isa16_sblaster16_device::device_add_mconfig(machine_config &config) // LIVE DEVICE //************************************************************************** -sb_device::sb_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) : +sb_device::sb_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_serial_interface(mconfig, *this), m_ldac(*this, "ldac"), @@ -1214,14 +1214,14 @@ sb_device::sb_device(const machine_config &mconfig, device_type type, const char { } -sb8_device::sb8_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) : +sb8_device::sb8_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : sb_device(mconfig, type, tag, owner, clock), device_isa8_card_interface(mconfig, *this), m_ym3812(*this, "ym3812") { } -sb16_device::sb16_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) : +sb16_device::sb16_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : sb_device(mconfig, type, tag, owner, clock), device_isa16_card_interface(mconfig, *this) { @@ -1231,19 +1231,19 @@ sb16_device::sb16_device(const machine_config &mconfig, device_type type, const // isa8_sblaster_device - constructor //------------------------------------------------- -isa8_sblaster1_0_device::isa8_sblaster1_0_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +isa8_sblaster1_0_device::isa8_sblaster1_0_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : sb8_device(mconfig, ISA8_SOUND_BLASTER_1_0, tag, owner, clock), m_saa1099_1(*this, "saa1099.1"), m_saa1099_2(*this, "saa1099.2") { } -isa8_sblaster1_5_device::isa8_sblaster1_5_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +isa8_sblaster1_5_device::isa8_sblaster1_5_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : sb8_device(mconfig, ISA8_SOUND_BLASTER_1_5, tag, owner, clock) { } -isa16_sblaster16_device::isa16_sblaster16_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +isa16_sblaster16_device::isa16_sblaster16_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : sb16_device(mconfig, ISA16_SOUND_BLASTER_16, tag, owner, clock) { } @@ -1425,7 +1425,7 @@ void sb_device::device_reset() // MIDI is 31250 baud, 8-N-1 set_data_frame(1, 8, PARITY_NONE, STOP_BITS_1); - set_rate(31250); + set_rate(XTAL::u(31250)); } uint8_t sb_device::dack_r(int line) diff --git a/src/devices/bus/isa/sblaster.h b/src/devices/bus/isa/sblaster.h index f09f05957be..32748cb8230 100644 --- a/src/devices/bus/isa/sblaster.h +++ b/src/devices/bus/isa/sblaster.h @@ -105,7 +105,7 @@ protected: }; // construction/destruction - sb_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + sb_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; @@ -157,7 +157,7 @@ public: virtual ioport_constructor device_input_ports() const override; protected: // construction/destruction - sb8_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + sb8_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); virtual void device_start() override; virtual void drq_w(int state) override; @@ -172,7 +172,7 @@ class isa8_sblaster1_0_device : public sb8_device { public: // construction/destruction - isa8_sblaster1_0_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa8_sblaster1_0_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); uint8_t saa1099_16_r(offs_t offset); void saa1099_1_16_w(offs_t offset, uint8_t data); @@ -195,7 +195,7 @@ class isa8_sblaster1_5_device : public sb8_device { public: // construction/destruction - isa8_sblaster1_5_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa8_sblaster1_5_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides @@ -216,7 +216,7 @@ public: virtual ioport_constructor device_input_ports() const override; protected: // construction/destruction - sb16_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + sb16_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); virtual void device_start() override; virtual uint16_t dack16_r(int line) override; virtual uint8_t dack_r(int line) override { return sb_device::dack_r(line); } @@ -236,7 +236,7 @@ class isa16_sblaster16_device : public sb16_device { public: // construction/destruction - isa16_sblaster16_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa16_sblaster16_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/isa/sc499.cpp b/src/devices/bus/isa/sc499.cpp index a670bb38aa4..ec1ef5cb84b 100644 --- a/src/devices/bus/isa/sc499.cpp +++ b/src/devices/bus/isa/sc499.cpp @@ -177,7 +177,7 @@ INPUT_PORTS_END void sc499_device::device_add_mconfig(machine_config &config) { - SC499_CTAPE(config, m_image, 0); + SC499_CTAPE(config, m_image); } @@ -307,7 +307,7 @@ DEFINE_DEVICE_TYPE(ISA8_SC499, sc499_device, "sc499", "Archive SC-499") // sc499_device - constructor //------------------------------------------------- -sc499_device::sc499_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +sc499_device::sc499_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ISA8_SC499, tag, owner, clock), device_isa8_card_interface(mconfig, *this), m_iobase(*this, "IO_BASE"), @@ -1272,7 +1272,7 @@ void sc499_device::block_set_filemark() DEFINE_DEVICE_TYPE(SC499_CTAPE, sc499_ctape_image_device, "sc499_ctape", "SC-499 Cartridge Tape") -sc499_ctape_image_device::sc499_ctape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +sc499_ctape_image_device::sc499_ctape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : microtape_image_device(mconfig, SC499_CTAPE, tag, owner, clock) { } diff --git a/src/devices/bus/isa/sc499.h b/src/devices/bus/isa/sc499.h index ffcd8c37a85..582c60a56b4 100644 --- a/src/devices/bus/isa/sc499.h +++ b/src/devices/bus/isa/sc499.h @@ -27,7 +27,7 @@ class sc499_ctape_image_device : public microtape_image_device { public: // construction/destruction - sc499_ctape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + sc499_ctape_image_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); // image-level overrides virtual image_init_result call_load() override; @@ -56,7 +56,7 @@ class sc499_device: public device_t, public device_isa8_card_interface { public: // construction/destruction - sc499_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + sc499_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: required_ioport m_iobase; diff --git a/src/devices/bus/isa/side116.cpp b/src/devices/bus/isa/side116.cpp index bad6645bf5a..7ddb89f6945 100644 --- a/src/devices/bus/isa/side116.cpp +++ b/src/devices/bus/isa/side116.cpp @@ -83,7 +83,7 @@ const tiny_rom_entry *side116_device::device_rom_region() const // side116_device - constructor //------------------------------------------------- -side116_device::side116_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +side116_device::side116_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ISA8_SIDE116, tag, owner, clock), device_isa8_card_interface( mconfig, *this ), m_ata(*this, "ata"), diff --git a/src/devices/bus/isa/side116.h b/src/devices/bus/isa/side116.h index 380e6206222..36d96e2d0b3 100644 --- a/src/devices/bus/isa/side116.h +++ b/src/devices/bus/isa/side116.h @@ -27,7 +27,7 @@ class side116_device : public device_t, public device_isa8_card_interface { public: // construction/destruction - side116_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + side116_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); uint8_t read(offs_t offset); void write(offs_t offset, uint8_t data); diff --git a/src/devices/bus/isa/ssi2001.cpp b/src/devices/bus/isa/ssi2001.cpp index e1d271dc6b4..96b4f2653cf 100644 --- a/src/devices/bus/isa/ssi2001.cpp +++ b/src/devices/bus/isa/ssi2001.cpp @@ -18,7 +18,7 @@ void ssi2001_device::device_add_mconfig(machine_config &config) PC_JOY(config, m_joy); } -ssi2001_device::ssi2001_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +ssi2001_device::ssi2001_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ISA8_SSI2001, tag, owner, clock), device_isa8_card_interface(mconfig, *this), m_joy(*this, "pc_joy"), diff --git a/src/devices/bus/isa/ssi2001.h b/src/devices/bus/isa/ssi2001.h index 85efa17c5ac..0123785e6b3 100644 --- a/src/devices/bus/isa/ssi2001.h +++ b/src/devices/bus/isa/ssi2001.h @@ -20,7 +20,7 @@ class ssi2001_device : public device_t, { public: // construction/destruction - ssi2001_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + ssi2001_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/isa/stereo_fx.cpp b/src/devices/bus/isa/stereo_fx.cpp index 70f3c5160c7..18336c15149 100644 --- a/src/devices/bus/isa/stereo_fx.cpp +++ b/src/devices/bus/isa/stereo_fx.cpp @@ -131,8 +131,8 @@ void stereo_fx_device::device_add_mconfig(machine_config &config) ym3812.add_route(ALL_OUTPUTS, "rspeaker", 1.00); /* no CM/S support (empty sockets) */ - DAC_8BIT_R2R(config, "ldac", 0).add_route(ALL_OUTPUTS, "lspeaker", 0.5); // unknown DAC - DAC_8BIT_R2R(config, "rdac", 0).add_route(ALL_OUTPUTS, "rspeaker", 0.5); // unknown DAC + DAC_8BIT_R2R(config, "ldac").add_route(ALL_OUTPUTS, "lspeaker", 0.5); // unknown DAC + DAC_8BIT_R2R(config, "rdac").add_route(ALL_OUTPUTS, "rspeaker", 0.5); // unknown DAC PC_JOY(config, m_joy); } @@ -194,7 +194,7 @@ uint8_t stereo_fx_device::invalid_r() return 0xff; } -stereo_fx_device::stereo_fx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +stereo_fx_device::stereo_fx_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ISA8_STEREO_FX, tag, owner, clock), device_isa8_card_interface(mconfig, *this), m_joy(*this, "pc_joy"), diff --git a/src/devices/bus/isa/stereo_fx.h b/src/devices/bus/isa/stereo_fx.h index 376d5dbff98..4ad2927d450 100644 --- a/src/devices/bus/isa/stereo_fx.h +++ b/src/devices/bus/isa/stereo_fx.h @@ -21,7 +21,7 @@ class stereo_fx_device : public device_t, { public: // construction/destruction - stereo_fx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + stereo_fx_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/isa/svga_cirrus.cpp b/src/devices/bus/isa/svga_cirrus.cpp index 750d0f41142..b68f34df1b9 100644 --- a/src/devices/bus/isa/svga_cirrus.cpp +++ b/src/devices/bus/isa/svga_cirrus.cpp @@ -36,7 +36,7 @@ void isa16_svga_cirrus_device::device_add_mconfig(machine_config &config) screen.set_raw(25.175_MHz_XTAL, 800, 0, 640, 524, 0, 480); screen.set_screen_update("vga", FUNC(cirrus_gd5430_device::screen_update)); - CIRRUS_GD5430(config, m_vga, 0); + CIRRUS_GD5430(config, m_vga); m_vga->set_screen("screen"); m_vga->set_vram_size(0x200000); } @@ -58,7 +58,7 @@ const tiny_rom_entry *isa16_svga_cirrus_device::device_rom_region() const // isa16_vga_device - constructor //------------------------------------------------- -isa16_svga_cirrus_device::isa16_svga_cirrus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +isa16_svga_cirrus_device::isa16_svga_cirrus_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ISA16_SVGA_CIRRUS, tag, owner, clock), device_isa16_card_interface(mconfig, *this), m_vga(*this, "vga") @@ -116,7 +116,7 @@ void isa16_svga_cirrus_gd542x_device::device_add_mconfig(machine_config &config) screen.set_raw(25.175_MHz_XTAL, 800, 0, 640, 524, 0, 480); screen.set_screen_update("vga", FUNC(cirrus_gd5428_device::screen_update)); - CIRRUS_GD5428(config, m_vga, 0); + CIRRUS_GD5428(config, m_vga); m_vga->set_screen("screen"); m_vga->set_vram_size(0x200000); } @@ -138,7 +138,7 @@ const tiny_rom_entry *isa16_svga_cirrus_gd542x_device::device_rom_region() const // isa16_vga_device - constructor //------------------------------------------------- -isa16_svga_cirrus_gd542x_device::isa16_svga_cirrus_gd542x_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +isa16_svga_cirrus_gd542x_device::isa16_svga_cirrus_gd542x_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ISA16_SVGA_CIRRUS_GD542X, tag, owner, clock), device_isa16_card_interface(mconfig, *this), m_vga(*this, "vga") diff --git a/src/devices/bus/isa/svga_cirrus.h b/src/devices/bus/isa/svga_cirrus.h index d2e7d75595c..bc805319f27 100644 --- a/src/devices/bus/isa/svga_cirrus.h +++ b/src/devices/bus/isa/svga_cirrus.h @@ -18,7 +18,7 @@ class isa16_svga_cirrus_device : { public: // construction/destruction - isa16_svga_cirrus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa16_svga_cirrus_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); uint8_t input_port_0_r(); @@ -41,7 +41,7 @@ class isa16_svga_cirrus_gd542x_device : { public: // construction/destruction - isa16_svga_cirrus_gd542x_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa16_svga_cirrus_gd542x_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); uint8_t input_port_0_r(); diff --git a/src/devices/bus/isa/svga_s3.cpp b/src/devices/bus/isa/svga_s3.cpp index 58984396d86..a55d9a8c2d3 100644 --- a/src/devices/bus/isa/svga_s3.cpp +++ b/src/devices/bus/isa/svga_s3.cpp @@ -57,7 +57,7 @@ void isa16_svga_s3_device::device_add_mconfig(machine_config &config) screen.set_raw(25.175_MHz_XTAL, 800, 0, 640, 524, 0, 480); screen.set_screen_update(m_vga, FUNC(s3_vga_device::screen_update)); - S3_VGA(config, m_vga, 0); + S3_VGA(config, m_vga); m_vga->set_screen("screen"); m_vga->set_vram_size(0x100000); } @@ -79,7 +79,7 @@ const tiny_rom_entry *isa16_svga_s3_device::device_rom_region() const // isa16_vga_device - constructor //------------------------------------------------- -isa16_svga_s3_device::isa16_svga_s3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +isa16_svga_s3_device::isa16_svga_s3_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ISA16_SVGA_S3, tag, owner, clock), device_isa16_card_interface(mconfig, *this), m_vga(*this, "vga"), m_8514(*this, "vga:8514a") @@ -162,7 +162,7 @@ void isa16_s3virge_device::device_add_mconfig(machine_config &config) screen.set_raw(25.175_MHz_XTAL, 800, 0, 640, 524, 0, 480); screen.set_screen_update(m_vga, FUNC(s3virge_vga_device::screen_update)); - S3VIRGE(config, m_vga, 0); + S3VIRGE(config, m_vga); m_vga->set_screen("screen"); m_vga->set_vram_size(0x400000); m_vga->linear_config_changed().set(FUNC(isa16_s3virge_device::linear_config_changed_w)); @@ -195,7 +195,7 @@ const tiny_rom_entry *isa16_s3virge_device::device_rom_region() const // isa16_vga_device - constructor //------------------------------------------------- -isa16_s3virge_device::isa16_s3virge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +isa16_s3virge_device::isa16_s3virge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ISA16_S3VIRGE, tag, owner, clock), device_isa16_card_interface(mconfig, *this), m_vga(*this, "vga") @@ -254,7 +254,7 @@ void isa16_s3virgedx_device::device_add_mconfig(machine_config &config) screen.set_raw(25.175_MHz_XTAL, 800, 0, 640, 524, 0, 480); screen.set_screen_update(m_vga, FUNC(s3virgedx_vga_device::screen_update)); - S3VIRGEDX(config, m_vga, 0); + S3VIRGEDX(config, m_vga); m_vga->set_screen("screen"); m_vga->set_vram_size(0x400000); m_vga->linear_config_changed().set(FUNC(isa16_s3virgedx_device::linear_config_changed_w)); @@ -303,7 +303,7 @@ const tiny_rom_entry *isa16_s3virgedx_device::device_rom_region() const // isa16_vga_device - constructor //------------------------------------------------- -isa16_s3virgedx_device::isa16_s3virgedx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +isa16_s3virgedx_device::isa16_s3virgedx_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ISA16_S3VIRGEDX, tag, owner, clock), device_isa16_card_interface(mconfig, *this), m_vga(*this, "vga") @@ -370,7 +370,7 @@ void isa16_stealth3d2kpro_device::device_add_mconfig(machine_config &config) screen.set_raw(25.175_MHz_XTAL, 800, 0, 640, 524, 0, 480); screen.set_screen_update(m_vga, FUNC(s3virgedx_rev1_vga_device::screen_update)); - S3VIRGEDX1(config, m_vga, 0); + S3VIRGEDX1(config, m_vga); m_vga->set_screen("screen"); m_vga->set_vram_size(0x400000); m_vga->linear_config_changed().set(FUNC(isa16_stealth3d2kpro_device::linear_config_changed_w)); @@ -403,7 +403,7 @@ const tiny_rom_entry *isa16_stealth3d2kpro_device::device_rom_region() const // isa16_vga_device - constructor //------------------------------------------------- -isa16_stealth3d2kpro_device::isa16_stealth3d2kpro_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +isa16_stealth3d2kpro_device::isa16_stealth3d2kpro_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ISA16_DMS3D2KPRO, tag, owner, clock), device_isa16_card_interface(mconfig, *this), m_vga(*this, "vga") diff --git a/src/devices/bus/isa/svga_s3.h b/src/devices/bus/isa/svga_s3.h index a07b0e039c6..eed9603c59e 100644 --- a/src/devices/bus/isa/svga_s3.h +++ b/src/devices/bus/isa/svga_s3.h @@ -21,7 +21,7 @@ class isa16_svga_s3_device : { public: // construction/destruction - isa16_svga_s3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa16_svga_s3_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); uint8_t input_port_0_r(); @@ -45,7 +45,7 @@ class isa16_s3virge_device : { public: // construction/destruction - isa16_s3virge_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa16_s3virge_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); uint8_t input_port_0_r(); @@ -70,7 +70,7 @@ class isa16_s3virgedx_device : { public: // construction/destruction - isa16_s3virgedx_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa16_s3virgedx_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); uint8_t input_port_0_r(); @@ -98,7 +98,7 @@ class isa16_stealth3d2kpro_device : { public: // construction/destruction - isa16_stealth3d2kpro_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa16_stealth3d2kpro_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); uint8_t input_port_0_r(); diff --git a/src/devices/bus/isa/svga_trident.cpp b/src/devices/bus/isa/svga_trident.cpp index f3b4e0f9a6f..240874a13ae 100644 --- a/src/devices/bus/isa/svga_trident.cpp +++ b/src/devices/bus/isa/svga_trident.cpp @@ -36,7 +36,7 @@ void isa16_svga_tgui9680_device::device_add_mconfig(machine_config &config) screen.set_raw(25.175_MHz_XTAL, 800, 0, 640, 524, 0, 480); screen.set_screen_update(m_vga, FUNC(trident_vga_device::screen_update)); - TRIDENT_VGA(config, m_vga, 0); + TRIDENT_VGA(config, m_vga); m_vga->set_screen("screen"); m_vga->set_vram_size(0x200000); } @@ -58,7 +58,7 @@ const tiny_rom_entry *isa16_svga_tgui9680_device::device_rom_region() const // isa8_vga_device - constructor //------------------------------------------------- -isa16_svga_tgui9680_device::isa16_svga_tgui9680_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +isa16_svga_tgui9680_device::isa16_svga_tgui9680_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ISA16_SVGA_TGUI9680, tag, owner, clock), device_isa16_card_interface(mconfig, *this), m_vga(*this, "vga") diff --git a/src/devices/bus/isa/svga_trident.h b/src/devices/bus/isa/svga_trident.h index c5c7bfdcf1d..bd537628845 100644 --- a/src/devices/bus/isa/svga_trident.h +++ b/src/devices/bus/isa/svga_trident.h @@ -25,7 +25,7 @@ class isa16_svga_tgui9680_device : { public: // construction/destruction - isa16_svga_tgui9680_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa16_svga_tgui9680_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); uint8_t input_port_0_r(); diff --git a/src/devices/bus/isa/svga_tseng.cpp b/src/devices/bus/isa/svga_tseng.cpp index 0d1485ad17d..dcbf63ead9d 100644 --- a/src/devices/bus/isa/svga_tseng.cpp +++ b/src/devices/bus/isa/svga_tseng.cpp @@ -35,7 +35,7 @@ void isa8_svga_et4k_device::device_add_mconfig(machine_config &config) screen.set_raw(25.175_MHz_XTAL, 800, 0, 640, 524, 0, 480); screen.set_screen_update(m_vga, FUNC(tseng_vga_device::screen_update)); - TSENG_VGA(config, m_vga, 0); + TSENG_VGA(config, m_vga); m_vga->set_screen("screen"); m_vga->set_vram_size(0x100000); } @@ -57,7 +57,7 @@ const tiny_rom_entry *isa8_svga_et4k_device::device_rom_region() const // isa8_vga_device - constructor //------------------------------------------------- -isa8_svga_et4k_device::isa8_svga_et4k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +isa8_svga_et4k_device::isa8_svga_et4k_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ISA8_SVGA_ET4K, tag, owner, clock), device_isa8_card_interface(mconfig, *this), m_vga(*this, "vga") diff --git a/src/devices/bus/isa/svga_tseng.h b/src/devices/bus/isa/svga_tseng.h index 690956741b5..602856ecf72 100644 --- a/src/devices/bus/isa/svga_tseng.h +++ b/src/devices/bus/isa/svga_tseng.h @@ -20,7 +20,7 @@ class isa8_svga_et4k_device : { public: // construction/destruction - isa8_svga_et4k_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa8_svga_et4k_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); uint8_t input_port_0_r(); diff --git a/src/devices/bus/isa/tekram_dc820.cpp b/src/devices/bus/isa/tekram_dc820.cpp index 56ffd8e4ccb..61233af1f3a 100644 --- a/src/devices/bus/isa/tekram_dc820.cpp +++ b/src/devices/bus/isa/tekram_dc820.cpp @@ -34,7 +34,7 @@ DEFINE_DEVICE_TYPE(TEKRAM_DC320E, tekram_dc320e_device, "dc320e", "Tekram DC-320 DEFINE_DEVICE_TYPE(TEKRAM_DC820, tekram_dc820_device, "dc820", "Tekram DC-820 SCSI Cache Controller") DEFINE_DEVICE_TYPE(TEKRAM_DC820B, tekram_dc820b_device, "dc820b", "Tekram DC-820B SCSI Cache Controller") -tekram_eisa_scsi_device::tekram_eisa_scsi_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) +tekram_eisa_scsi_device::tekram_eisa_scsi_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_isa16_card_interface(mconfig, *this) , m_mpu(*this, "mpu") @@ -46,22 +46,22 @@ tekram_eisa_scsi_device::tekram_eisa_scsi_device(const machine_config &mconfig, { } -tekram_dc320b_device::tekram_dc320b_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +tekram_dc320b_device::tekram_dc320b_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : tekram_eisa_scsi_device(mconfig, TEKRAM_DC320B, tag, owner, clock) { } -tekram_dc320e_device::tekram_dc320e_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +tekram_dc320e_device::tekram_dc320e_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : tekram_eisa_scsi_device(mconfig, TEKRAM_DC320E, tag, owner, clock) { } -tekram_dc820_device::tekram_dc820_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +tekram_dc820_device::tekram_dc820_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : tekram_eisa_scsi_device(mconfig, TEKRAM_DC820, tag, owner, clock) { } -tekram_dc820b_device::tekram_dc820b_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +tekram_dc820b_device::tekram_dc820b_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : tekram_eisa_scsi_device(mconfig, TEKRAM_DC820B, tag, owner, clock) { } @@ -214,7 +214,7 @@ void tekram_eisa_scsi_device::scsi_add(machine_config &config) void tekram_dc320b_device::device_add_mconfig(machine_config &config) { - I80186(config, m_mpu, 25'000'000); // verified for DC-320, but not DC-320B + I80186(config, m_mpu, XTAL::u(25'000'000)); // verified for DC-320, but not DC-320B m_mpu->set_addrmap(AS_PROGRAM, &tekram_dc320b_device::mpu_map); GENERIC_LATCH_8(config, m_cmdlatch); @@ -224,17 +224,17 @@ void tekram_dc320b_device::device_add_mconfig(machine_config &config) EEPROM_93C46_16BIT(config, m_eeprom); - i82355_device &bmic(I82355(config, "bmic", 0)); + i82355_device &bmic(I82355(config, "bmic")); bmic.lint_callback().set(m_mpu, FUNC(i80186_cpu_device::int2_w)); scsi_add(config); - WD37C65C(config, m_fdc, 32'000'000, 9'600'000); // clocks verified for DC-320, but not DC-320B + WD37C65C(config, m_fdc, XTAL::u(32'000'000), 9'600'000); // clocks verified for DC-320, but not DC-320B } void tekram_dc320e_device::device_add_mconfig(machine_config &config) { - I80186(config, m_mpu, 32'000'000); // clock guessed to be same as DC-820B due to identical firmware + I80186(config, m_mpu, XTAL::u(32'000'000)); // clock guessed to be same as DC-820B due to identical firmware m_mpu->set_addrmap(AS_PROGRAM, &tekram_dc320e_device::mpu_map); GENERIC_LATCH_8(config, m_cmdlatch); @@ -244,12 +244,12 @@ void tekram_dc320e_device::device_add_mconfig(machine_config &config) EEPROM_93C46_16BIT(config, m_eeprom); - i82355_device &bmic(I82355(config, "bmic", 0)); + i82355_device &bmic(I82355(config, "bmic")); bmic.lint_callback().set(m_mpu, FUNC(i80186_cpu_device::int2_w)); scsi_add(config); - WD37C65C(config, m_fdc, 32'000'000, 9'600'000); // clocks verified for DC-320, but not DC-320E + WD37C65C(config, m_fdc, XTAL::u(32'000'000), 9'600'000); // clocks verified for DC-320, but not DC-320E } void tekram_dc820_device::device_add_mconfig(machine_config &config) @@ -264,7 +264,7 @@ void tekram_dc820_device::device_add_mconfig(machine_config &config) EEPROM_93C46_16BIT(config, m_eeprom); - i82355_device &bmic(I82355(config, "bmic", 0)); + i82355_device &bmic(I82355(config, "bmic")); bmic.lint_callback().set(m_mpu, FUNC(i80186_cpu_device::int2_w)); scsi_add(config); @@ -284,7 +284,7 @@ void tekram_dc820b_device::device_add_mconfig(machine_config &config) EEPROM_93C46_16BIT(config, m_eeprom); - i82355_device &bmic(I82355(config, "bmic", 0)); + i82355_device &bmic(I82355(config, "bmic")); bmic.lint_callback().set(m_mpu, FUNC(i80186_cpu_device::int2_w)); scsi_add(config); diff --git a/src/devices/bus/isa/tekram_dc820.h b/src/devices/bus/isa/tekram_dc820.h index 2308eb8655a..73177ecaef3 100644 --- a/src/devices/bus/isa/tekram_dc820.h +++ b/src/devices/bus/isa/tekram_dc820.h @@ -22,7 +22,7 @@ public: static constexpr feature_type unemulated_features() { return feature::DISK; } protected: - tekram_eisa_scsi_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); + tekram_eisa_scsi_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); virtual void device_start() override; @@ -49,7 +49,7 @@ protected: class tekram_dc320b_device : public tekram_eisa_scsi_device { public: - tekram_dc320b_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + tekram_dc320b_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual void device_add_mconfig(machine_config &config) override; @@ -66,7 +66,7 @@ private: class tekram_dc320e_device : public tekram_eisa_scsi_device { public: - tekram_dc320e_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + tekram_dc320e_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual void device_add_mconfig(machine_config &config) override; @@ -79,7 +79,7 @@ private: class tekram_dc820_device : public tekram_eisa_scsi_device { public: - tekram_dc820_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + tekram_dc820_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual void device_add_mconfig(machine_config &config) override; @@ -94,7 +94,7 @@ private: class tekram_dc820b_device : public tekram_eisa_scsi_device { public: - tekram_dc820b_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + tekram_dc820b_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual void device_add_mconfig(machine_config &config) override; diff --git a/src/devices/bus/isa/trident.cpp b/src/devices/bus/isa/trident.cpp index 943f0de3432..1a91782c2f0 100644 --- a/src/devices/bus/isa/trident.cpp +++ b/src/devices/bus/isa/trident.cpp @@ -23,18 +23,18 @@ DEFINE_DEVICE_TYPE(TVGA9000_VGA, tvga9000_device, "tvga9000_vga", "Trident TVGA9 #define LOG (1) #define LOG_ACCEL (1) -trident_vga_device::trident_vga_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) +trident_vga_device::trident_vga_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) : svga_device(mconfig, type, tag, owner, clock) { } -tgui9860_device::tgui9860_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +tgui9860_device::tgui9860_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : trident_vga_device(mconfig, TRIDENT_VGA, tag, owner, clock) { m_version = 0xd3; // 0xd3 identifies at TGUI9660XGi (set to 0xe3 to identify at TGUI9440AGi) } -tvga9000_device::tvga9000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +tvga9000_device::tvga9000_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : trident_vga_device(mconfig, TVGA9000_VGA, tag, owner, clock) { m_version = 0x43; diff --git a/src/devices/bus/isa/trident.h b/src/devices/bus/isa/trident.h index 3dc8f63947c..6ffe4457dbc 100644 --- a/src/devices/bus/isa/trident.h +++ b/src/devices/bus/isa/trident.h @@ -38,7 +38,7 @@ public: protected: // construction/destruction - trident_vga_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + trident_vga_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; @@ -152,13 +152,13 @@ private: class tgui9860_device : public trident_vga_device { public: - tgui9860_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + tgui9860_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); }; class tvga9000_device : public trident_vga_device { public: - tvga9000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + tvga9000_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); }; // device type definition diff --git a/src/devices/bus/isa/ultra12f.cpp b/src/devices/bus/isa/ultra12f.cpp index fb5f89e485c..de3133efd6e 100644 --- a/src/devices/bus/isa/ultra12f.cpp +++ b/src/devices/bus/isa/ultra12f.cpp @@ -17,7 +17,7 @@ DEFINE_DEVICE_TYPE(ULTRA12F, ultra12f_device, "ultra12f", "Ultra 12F ESDI Caching Disk Controller") DEFINE_DEVICE_TYPE(ULTRA12F32, ultra12f32_device, "ultra12f32", "Ultra 12F/32 ESDI Caching Disk Controller") -ultra12f_device::ultra12f_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock) +ultra12f_device::ultra12f_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_isa16_card_interface(mconfig, *this) , m_hpc(*this, "hpc") @@ -26,12 +26,12 @@ ultra12f_device::ultra12f_device(const machine_config &mconfig, device_type type { } -ultra12f_device::ultra12f_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +ultra12f_device::ultra12f_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : ultra12f_device(mconfig, ULTRA12F, tag, owner, clock) { } -ultra12f32_device::ultra12f32_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +ultra12f32_device::ultra12f32_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : ultra12f_device(mconfig, ULTRA12F32, tag, owner, clock) { } diff --git a/src/devices/bus/isa/ultra12f.h b/src/devices/bus/isa/ultra12f.h index f4bb05d61c7..5ba993e3920 100644 --- a/src/devices/bus/isa/ultra12f.h +++ b/src/devices/bus/isa/ultra12f.h @@ -18,12 +18,12 @@ class ultra12f_device : public device_t, public device_isa16_card_interface { public: - ultra12f_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + ultra12f_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); static constexpr feature_type unemulated_features() { return feature::DISK; } protected: - ultra12f_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, u32 clock); + ultra12f_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock); virtual void device_start() override; virtual ioport_constructor device_input_ports() const override; @@ -41,7 +41,7 @@ private: class ultra12f32_device : public ultra12f_device { public: - ultra12f32_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + ultra12f32_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: virtual const tiny_rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/isa/ultra14f.cpp b/src/devices/bus/isa/ultra14f.cpp index f97b0acb54e..d5c5cf7447c 100644 --- a/src/devices/bus/isa/ultra14f.cpp +++ b/src/devices/bus/isa/ultra14f.cpp @@ -16,7 +16,7 @@ DEFINE_DEVICE_TYPE(ULTRA14F, ultra14f_device, "ultra14f", "Ultra-14F SCSI Host Adapter") -ultra14f_device::ultra14f_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +ultra14f_device::ultra14f_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ULTRA14F, tag, owner, clock) , device_isa16_card_interface(mconfig, *this) , m_uscpu(*this, "uscpu") diff --git a/src/devices/bus/isa/ultra14f.h b/src/devices/bus/isa/ultra14f.h index 9661e24a4b3..b56869bb1c0 100644 --- a/src/devices/bus/isa/ultra14f.h +++ b/src/devices/bus/isa/ultra14f.h @@ -17,7 +17,7 @@ class ultra14f_device : public device_t, public device_isa16_card_interface { public: - ultra14f_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + ultra14f_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); static constexpr feature_type unemulated_features() { return feature::DISK; } diff --git a/src/devices/bus/isa/ultra24f.cpp b/src/devices/bus/isa/ultra24f.cpp index 211c1ab4b80..3ea77976752 100644 --- a/src/devices/bus/isa/ultra24f.cpp +++ b/src/devices/bus/isa/ultra24f.cpp @@ -16,7 +16,7 @@ DEFINE_DEVICE_TYPE(ULTRA24F, ultra24f_device, "ultra24f", "Ultra-24F SCSI Host Adapter") -ultra24f_device::ultra24f_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) +ultra24f_device::ultra24f_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ULTRA24F, tag, owner, clock) , device_isa16_card_interface(mconfig, *this) , m_uscpu(*this, "uscpu") @@ -69,7 +69,7 @@ void ultra24f_device::device_add_mconfig(machine_config &config) M68000(config, m_uscpu, 32_MHz_XTAL / 4); // custom-marked as USC080-5-12A; clock guessed m_uscpu->set_addrmap(AS_PROGRAM, &ultra24f_device::uscpu_map); - I82355(config, m_bmic, 0); + I82355(config, m_bmic); NSCSI_BUS(config, "scsi"); NSCSI_CONNECTOR(config, "scsi:0", default_scsi_devices, nullptr); diff --git a/src/devices/bus/isa/ultra24f.h b/src/devices/bus/isa/ultra24f.h index 69a5d3a29d2..628561cba86 100644 --- a/src/devices/bus/isa/ultra24f.h +++ b/src/devices/bus/isa/ultra24f.h @@ -18,7 +18,7 @@ class ultra24f_device : public device_t, public device_isa16_card_interface { public: - ultra24f_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock); + ultra24f_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); static constexpr feature_type unemulated_features() { return feature::DISK; } diff --git a/src/devices/bus/isa/vga.cpp b/src/devices/bus/isa/vga.cpp index b573f4c5701..e4b250b99d0 100644 --- a/src/devices/bus/isa/vga.cpp +++ b/src/devices/bus/isa/vga.cpp @@ -33,7 +33,7 @@ void isa8_vga_device::device_add_mconfig(machine_config &config) screen.set_raw(25.175_MHz_XTAL, 800, 0, 640, 524, 0, 480); screen.set_screen_update(m_vga, FUNC(vga_device::screen_update)); - VGA(config, m_vga, 0); + VGA(config, m_vga); m_vga->set_screen("screen"); m_vga->set_vram_size(0x100000); } @@ -55,7 +55,7 @@ const tiny_rom_entry *isa8_vga_device::device_rom_region() const // isa8_vga_device - constructor //------------------------------------------------- -isa8_vga_device::isa8_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +isa8_vga_device::isa8_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ISA8_VGA, tag, owner, clock), device_isa8_card_interface(mconfig, *this), m_vga(*this, "vga") diff --git a/src/devices/bus/isa/vga.h b/src/devices/bus/isa/vga.h index c1b4d7226aa..6771dc54031 100644 --- a/src/devices/bus/isa/vga.h +++ b/src/devices/bus/isa/vga.h @@ -20,7 +20,7 @@ class isa8_vga_device : { public: // construction/destruction - isa8_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa8_vga_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); uint8_t input_port_0_r(); diff --git a/src/devices/bus/isa/vga_ati.cpp b/src/devices/bus/isa/vga_ati.cpp index aaebcf3969b..99772daaa75 100644 --- a/src/devices/bus/isa/vga_ati.cpp +++ b/src/devices/bus/isa/vga_ati.cpp @@ -82,7 +82,7 @@ void isa16_vga_gfxultra_device::device_add_mconfig(machine_config &config) screen.set_raw(25.175_MHz_XTAL, 800, 0, 640, 524, 0, 480); screen.set_screen_update(m_vga, FUNC(ati_vga_device::screen_update)); - ATI_VGA(config, m_vga, 0); + ATI_VGA(config, m_vga); m_vga->set_screen("screen"); m_vga->set_vram_size(0x100000); } @@ -93,7 +93,7 @@ void isa16_vga_gfxultrapro_device::device_add_mconfig(machine_config &config) screen.set_raw(25.175_MHz_XTAL, 800, 0, 640, 524, 0, 480); screen.set_screen_update(m_vga, FUNC(mach32_device::screen_update)); - ATIMACH32(config, m_vga, 0); + ATIMACH32(config, m_vga); m_vga->set_screen("screen"); m_vga->set_vram_size(0x400000); } @@ -104,7 +104,7 @@ void isa16_vga_mach64_device::device_add_mconfig(machine_config &config) screen.set_raw(25.175_MHz_XTAL, 800, 0, 640, 524, 0, 480); screen.set_screen_update(m_vga, FUNC(mach64_device::screen_update)); - ATIMACH64(config, m_vga, 0); + ATIMACH64(config, m_vga); m_vga->set_screen("screen"); m_vga->set_vram_size(0x400000); } @@ -137,21 +137,21 @@ const tiny_rom_entry *isa16_vga_mach64_device::device_rom_region() const // isa8_vga_device - constructor //------------------------------------------------- -isa16_vga_gfxultra_device::isa16_vga_gfxultra_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +isa16_vga_gfxultra_device::isa16_vga_gfxultra_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ISA16_VGA_GFXULTRA, tag, owner, clock), device_isa16_card_interface(mconfig, *this), m_vga(*this, "vga"), m_8514(*this, "vga:8514a") { } -isa16_vga_gfxultrapro_device::isa16_vga_gfxultrapro_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +isa16_vga_gfxultrapro_device::isa16_vga_gfxultrapro_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ISA16_SVGA_GFXULTRAPRO, tag, owner, clock), device_isa16_card_interface(mconfig, *this), m_vga(*this, "vga") { } -isa16_vga_mach64_device::isa16_vga_mach64_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) : +isa16_vga_mach64_device::isa16_vga_mach64_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ISA16_SVGA_MACH64, tag, owner, clock), device_isa16_card_interface(mconfig, *this), m_vga(*this, "vga") diff --git a/src/devices/bus/isa/vga_ati.h b/src/devices/bus/isa/vga_ati.h index f92f3c563ca..6a9c563bc56 100644 --- a/src/devices/bus/isa/vga_ati.h +++ b/src/devices/bus/isa/vga_ati.h @@ -28,7 +28,7 @@ class isa16_vga_gfxultra_device : { public: // construction/destruction - isa16_vga_gfxultra_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa16_vga_gfxultra_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); uint8_t input_port_0_r(); @@ -52,7 +52,7 @@ class isa16_vga_gfxultrapro_device : { public: // construction/destruction - isa16_vga_gfxultrapro_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa16_vga_gfxultrapro_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); uint8_t input_port_0_r(); @@ -75,7 +75,7 @@ class isa16_vga_mach64_device : { public: // construction/destruction - isa16_vga_mach64_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa16_vga_mach64_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); uint8_t input_port_0_r(); diff --git a/src/devices/bus/isa/wd1002a_wx1.cpp b/src/devices/bus/isa/wd1002a_wx1.cpp index 2e86d3b0523..cd52fbfb925 100644 --- a/src/devices/bus/isa/wd1002a_wx1.cpp +++ b/src/devices/bus/isa/wd1002a_wx1.cpp @@ -46,7 +46,7 @@ const tiny_rom_entry *isa8_wd1002a_wx1_device::device_rom_region() const // isa8_wd1002a_wx1_device - constructor //------------------------------------------------- -isa8_wd1002a_wx1_device::isa8_wd1002a_wx1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +isa8_wd1002a_wx1_device::isa8_wd1002a_wx1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ISA8_WD1002A_WX1, tag, owner, clock) , device_isa8_card_interface(mconfig, *this) { diff --git a/src/devices/bus/isa/wd1002a_wx1.h b/src/devices/bus/isa/wd1002a_wx1.h index 7a66db54dd5..9d9e13576b4 100644 --- a/src/devices/bus/isa/wd1002a_wx1.h +++ b/src/devices/bus/isa/wd1002a_wx1.h @@ -26,7 +26,7 @@ class isa8_wd1002a_wx1_device : public device_t, { public: // construction/destruction - isa8_wd1002a_wx1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + isa8_wd1002a_wx1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); // optional information overrides virtual const tiny_rom_entry *device_rom_region() const override; diff --git a/src/devices/bus/isa/wd1007a.cpp b/src/devices/bus/isa/wd1007a.cpp index 22d9863e392..b83ce881fb4 100644 --- a/src/devices/bus/isa/wd1007a.cpp +++ b/src/devices/bus/isa/wd1007a.cpp @@ -34,7 +34,7 @@ const tiny_rom_entry *wd1007a_device::device_rom_region() const // wd1007a_device - constructor //------------------------------------------------- -wd1007a_device::wd1007a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +wd1007a_device::wd1007a_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, WD1007A, tag, owner, clock) , device_isa16_card_interface(mconfig, *this) { diff --git a/src/devices/bus/isa/wd1007a.h b/src/devices/bus/isa/wd1007a.h index 1a761ecb66d..320acd80e63 100644 --- a/src/devices/bus/isa/wd1007a.h +++ b/src/devices/bus/isa/wd1007a.h @@ -25,7 +25,7 @@ class wd1007a_device : public device_t, public device_isa16_card_interface { public: // construction/destruction - wd1007a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + wd1007a_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); static constexpr feature_type unemulated_features() { return feature::DISK; } protected: diff --git a/src/devices/bus/isa/wdxt_gen.cpp b/src/devices/bus/isa/wdxt_gen.cpp index fb2a8fd1965..dd849835376 100644 --- a/src/devices/bus/isa/wdxt_gen.cpp +++ b/src/devices/bus/isa/wdxt_gen.cpp @@ -139,7 +139,7 @@ void wdxt_gen_device::ram_w(offs_t offset, uint8_t data) void wdxt_gen_device::device_add_mconfig(machine_config &config) { - mcs48_cpu_device &cpu(I8049(config, m_maincpu, 5000000)); + mcs48_cpu_device &cpu(I8049(config, m_maincpu, XTAL::u(5000000))); cpu.set_addrmap(AS_IO, &wdxt_gen_device::wd1015_io); cpu.t0_in_cb().set(m_host, FUNC(wd11c00_17_device::busy_r)); cpu.t1_in_cb().set(FUNC(wdxt_gen_device::wd1015_t1_r)); @@ -148,7 +148,7 @@ void wdxt_gen_device::device_add_mconfig(machine_config &config) cpu.p2_in_cb().set(FUNC(wdxt_gen_device::wd1015_p2_r)); cpu.p2_out_cb().set(FUNC(wdxt_gen_device::wd1015_p2_w)); - WD11C00_17(config, m_host, 5000000); + WD11C00_17(config, m_host, XTAL::u(5000000)); m_host->out_irq5_callback().set(FUNC(wdxt_gen_device::irq5_w)); m_host->out_drq3_callback().set(FUNC(wdxt_gen_device::drq3_w)); m_host->out_mr_callback().set(FUNC(wdxt_gen_device::mr_w)); @@ -159,7 +159,7 @@ void wdxt_gen_device::device_add_mconfig(machine_config &config) m_host->in_cs1010_callback().set(m_hdc, FUNC(wd2010_device::read)); m_host->out_cs1010_callback().set(m_hdc, FUNC(wd2010_device::write)); - WD2010(config, m_hdc, 5000000); + WD2010(config, m_hdc, XTAL::u(5000000)); m_hdc->out_bcr_callback().set(m_host, FUNC(wd11c00_17_device::clct_w)); m_hdc->in_bcs_callback().set(m_host, FUNC(wd11c00_17_device::read)); m_hdc->out_bcs_callback().set(m_host, FUNC(wd11c00_17_device::write)); @@ -169,8 +169,8 @@ void wdxt_gen_device::device_add_mconfig(machine_config &config) m_hdc->in_tk000_callback().set_constant(1); m_hdc->in_sc_callback().set_constant(1); - HARDDISK(config, "hard0", 0); - HARDDISK(config, "hard1", 0); + HARDDISK(config, "hard0"); + HARDDISK(config, "hard1"); } @@ -182,7 +182,7 @@ void wdxt_gen_device::device_add_mconfig(machine_config &config) // wdxt_gen_device - constructor //------------------------------------------------- -wdxt_gen_device::wdxt_gen_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +wdxt_gen_device::wdxt_gen_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ISA8_WDXT_GEN, tag, owner, clock) , device_isa8_card_interface(mconfig, *this) , m_maincpu(*this, WD1015_TAG) diff --git a/src/devices/bus/isa/wdxt_gen.h b/src/devices/bus/isa/wdxt_gen.h index f238f6750a1..ee55e60bd2c 100644 --- a/src/devices/bus/isa/wdxt_gen.h +++ b/src/devices/bus/isa/wdxt_gen.h @@ -38,7 +38,7 @@ class wdxt_gen_device : public device_t, { public: // construction/destruction - wdxt_gen_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + wdxt_gen_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); protected: // device-level overrides diff --git a/src/devices/bus/isa/xtide.cpp b/src/devices/bus/isa/xtide.cpp index a22f69a9b13..c62d610e82e 100644 --- a/src/devices/bus/isa/xtide.cpp +++ b/src/devices/bus/isa/xtide.cpp @@ -295,7 +295,7 @@ const tiny_rom_entry *xtide_device::device_rom_region() const // xtide_device - constructor //------------------------------------------------- -xtide_device::xtide_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) +xtide_device::xtide_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) : device_t(mconfig, ISA8_XTIDE, tag, owner, clock), device_isa8_card_interface( mconfig, *this ), m_ata(*this, "ata"), diff --git a/src/devices/bus/isa/xtide.h b/src/devices/bus/isa/xtide.h index b06d39d5dbb..b7a450d0a7c 100644 --- a/src/devices/bus/isa/xtide.h +++ b/src/devices/bus/isa/xtide.h @@ -17,7 +17,7 @@ class xtide_device : public device_t, public device_isa8_card_interface { public: // construction/destruction - xtide_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + xtide_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock); uint8_t read(offs_t offset); void write(offs_t offset, uint8_t data); |