summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/amiga
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/amiga')
-rw-r--r--src/devices/bus/amiga/keyboard/a1200.cpp2
-rw-r--r--src/devices/bus/amiga/keyboard/a1200.h2
-rw-r--r--src/devices/bus/amiga/keyboard/a2000.cpp12
-rw-r--r--src/devices/bus/amiga/keyboard/keyboard.cpp2
-rw-r--r--src/devices/bus/amiga/keyboard/keyboard.h4
-rw-r--r--src/devices/bus/amiga/keyboard/mitsumi.cpp80
-rw-r--r--src/devices/bus/amiga/zorro/a2052.cpp2
-rw-r--r--src/devices/bus/amiga/zorro/a2052.h2
-rw-r--r--src/devices/bus/amiga/zorro/a2058.cpp2
-rw-r--r--src/devices/bus/amiga/zorro/a2058.h2
-rw-r--r--src/devices/bus/amiga/zorro/a2065.cpp2
-rw-r--r--src/devices/bus/amiga/zorro/a2065.h2
-rw-r--r--src/devices/bus/amiga/zorro/a2232.cpp2
-rw-r--r--src/devices/bus/amiga/zorro/a2232.h2
-rw-r--r--src/devices/bus/amiga/zorro/a590.cpp12
-rw-r--r--src/devices/bus/amiga/zorro/a590.h6
-rw-r--r--src/devices/bus/amiga/zorro/action_replay.cpp8
-rw-r--r--src/devices/bus/amiga/zorro/action_replay.h8
-rw-r--r--src/devices/bus/amiga/zorro/buddha.cpp2
-rw-r--r--src/devices/bus/amiga/zorro/buddha.h2
-rw-r--r--src/devices/bus/amiga/zorro/zorro.cpp14
-rw-r--r--src/devices/bus/amiga/zorro/zorro.h16
22 files changed, 93 insertions, 93 deletions
diff --git a/src/devices/bus/amiga/keyboard/a1200.cpp b/src/devices/bus/amiga/keyboard/a1200.cpp
index 4877903d73a..76ee506b8bc 100644
--- a/src/devices/bus/amiga/keyboard/a1200.cpp
+++ b/src/devices/bus/amiga/keyboard/a1200.cpp
@@ -102,7 +102,7 @@ ROM_END
// LIVE DEVICE
//**************************************************************************
-a1200_kbd_device::a1200_kbd_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock)
+a1200_kbd_device::a1200_kbd_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, A1200_KBD, tag, owner, clock)
, device_amiga_keyboard_interface(mconfig, *this)
, m_rows(*this, "ROW%u", 0)
diff --git a/src/devices/bus/amiga/keyboard/a1200.h b/src/devices/bus/amiga/keyboard/a1200.h
index 4cbba0616db..6131db77149 100644
--- a/src/devices/bus/amiga/keyboard/a1200.h
+++ b/src/devices/bus/amiga/keyboard/a1200.h
@@ -24,7 +24,7 @@ class a1200_kbd_device : public device_t, public device_amiga_keyboard_interface
{
public:
// construction/destruction
- a1200_kbd_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock);
+ a1200_kbd_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock);
// from host
virtual DECLARE_WRITE_LINE_MEMBER(kdat_w) override;
diff --git a/src/devices/bus/amiga/keyboard/a2000.cpp b/src/devices/bus/amiga/keyboard/a2000.cpp
index 59aac50b652..8d01e4c4d85 100644
--- a/src/devices/bus/amiga/keyboard/a2000.cpp
+++ b/src/devices/bus/amiga/keyboard/a2000.cpp
@@ -103,7 +103,7 @@ public:
protected:
// construction/destruction
- a2000_kbd_g80_device(machine_config const &mconfig, device_type type, char const *tag, device_t *owner, uint32_t clock)
+ a2000_kbd_g80_device(machine_config const &mconfig, device_type type, char const *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, type, tag, owner, clock)
, device_amiga_keyboard_interface(mconfig, *this)
, m_rows(*this, "ROW%u", 0U)
@@ -614,7 +614,7 @@ INPUT_PORTS_END
class a2000_kbd_g80_us_device : public a2000_kbd_g80_device
{
public:
- a2000_kbd_g80_us_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock)
+ a2000_kbd_g80_us_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: a2000_kbd_g80_device(mconfig, A2000_KBD_G80_US, tag, owner, clock)
{
}
@@ -630,7 +630,7 @@ protected:
class a2000_kbd_g80_de_device : public a2000_kbd_g80_device
{
public:
- a2000_kbd_g80_de_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock)
+ a2000_kbd_g80_de_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: a2000_kbd_g80_device(mconfig, A2000_KBD_G80_DE, tag, owner, clock)
{
}
@@ -648,7 +648,7 @@ protected:
class a2000_kbd_g80_se_device : public a2000_kbd_g80_device
{
public:
- a2000_kbd_g80_se_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock)
+ a2000_kbd_g80_se_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: a2000_kbd_g80_device(mconfig, A2000_KBD_G80_SE, tag, owner, clock)
{
}
@@ -666,7 +666,7 @@ protected:
class a2000_kbd_g80_dk_device : public a2000_kbd_g80_device
{
public:
- a2000_kbd_g80_dk_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock)
+ a2000_kbd_g80_dk_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: a2000_kbd_g80_device(mconfig, A2000_KBD_G80_DK, tag, owner, clock)
{
}
@@ -684,7 +684,7 @@ protected:
class a2000_kbd_g80_gb_device : public a2000_kbd_g80_device
{
public:
- a2000_kbd_g80_gb_device(machine_config const &mconfig, char const *tag, device_t *owner, uint32_t clock)
+ a2000_kbd_g80_gb_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: a2000_kbd_g80_device(mconfig, A2000_KBD_G80_GB, tag, owner, clock)
{
}
diff --git a/src/devices/bus/amiga/keyboard/keyboard.cpp b/src/devices/bus/amiga/keyboard/keyboard.cpp
index 141998a15fa..c097bc1f8c6 100644
--- a/src/devices/bus/amiga/keyboard/keyboard.cpp
+++ b/src/devices/bus/amiga/keyboard/keyboard.cpp
@@ -32,7 +32,7 @@ template class device_finder<device_amiga_keyboard_interface, true>;
// amiga_keyboard_bus_device - constructor
//-------------------------------------------------
-amiga_keyboard_bus_device::amiga_keyboard_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+amiga_keyboard_bus_device::amiga_keyboard_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, AMIGA_KEYBOARD_INTERFACE, tag, owner, clock),
device_single_card_slot_interface<device_amiga_keyboard_interface>(mconfig, *this),
m_kbd(nullptr),
diff --git a/src/devices/bus/amiga/keyboard/keyboard.h b/src/devices/bus/amiga/keyboard/keyboard.h
index ce11d82ba32..cb90bc9b333 100644
--- a/src/devices/bus/amiga/keyboard/keyboard.h
+++ b/src/devices/bus/amiga/keyboard/keyboard.h
@@ -33,14 +33,14 @@ public:
// construction/destruction
template <typename T>
amiga_keyboard_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, T &&opts, const char *dflt)
- : amiga_keyboard_bus_device(mconfig, tag, owner, 0)
+ : amiga_keyboard_bus_device(mconfig, tag, owner)
{
option_reset();
opts(*this);
set_default_option(dflt);
set_fixed(false);
}
- amiga_keyboard_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0U);
+ amiga_keyboard_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL());
virtual ~amiga_keyboard_bus_device();
// callbacks
diff --git a/src/devices/bus/amiga/keyboard/mitsumi.cpp b/src/devices/bus/amiga/keyboard/mitsumi.cpp
index ccc68d5d1d4..a3b6c6bc12a 100644
--- a/src/devices/bus/amiga/keyboard/mitsumi.cpp
+++ b/src/devices/bus/amiga/keyboard/mitsumi.cpp
@@ -144,7 +144,7 @@ public:
}
protected:
- mitsumi_keyboard_base(machine_config const &mconfig, device_type type, char const *tag, device_t *owner, u32 clock)
+ mitsumi_keyboard_base(machine_config const &mconfig, device_type type, char const *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, type, tag, owner, clock)
, device_amiga_keyboard_interface(mconfig, *this)
, m_mcu{ *this, "mcu" }
@@ -267,7 +267,7 @@ private:
class a500_keyboard_base : public mitsumi_watchdog_keyboard_base
{
protected:
- a500_keyboard_base(machine_config const &mconfig, device_type type, char const *tag, device_t *owner, u32 clock)
+ a500_keyboard_base(machine_config const &mconfig, device_type type, char const *tag, device_t *owner, const XTAL &clock)
: mitsumi_watchdog_keyboard_base(mconfig, type, tag, owner, clock)
, m_reset_merger(*this, "reset")
{
@@ -325,7 +325,7 @@ private:
class a600_keyboard_base : public mitsumi_keyboard_base
{
protected:
- a600_keyboard_base(machine_config const &mconfig, device_type type, char const *tag, device_t *owner, u32 clock)
+ a600_keyboard_base(machine_config const &mconfig, device_type type, char const *tag, device_t *owner, const XTAL &clock)
: mitsumi_keyboard_base(mconfig, type, tag, owner, clock)
, m_reset_merger(*this, "reset")
{
@@ -661,7 +661,7 @@ INPUT_PORTS_END
class a500_keyboard_us : public a500_keyboard_base
{
public:
- a500_keyboard_us(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+ a500_keyboard_us(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: a500_keyboard_base(mconfig, A500_KBD_US, tag, owner, clock)
{ }
@@ -674,7 +674,7 @@ protected:
class a500_keyboard_de : public a500_keyboard_base
{
public:
- a500_keyboard_de(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+ a500_keyboard_de(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: a500_keyboard_base(mconfig, A500_KBD_DE, tag, owner, clock)
{ }
@@ -687,7 +687,7 @@ protected:
class a500_keyboard_fr : public a500_keyboard_base
{
public:
- a500_keyboard_fr(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+ a500_keyboard_fr(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: a500_keyboard_base(mconfig, A500_KBD_FR, tag, owner, clock)
{ }
@@ -700,7 +700,7 @@ protected:
class a500_keyboard_it : public a500_keyboard_base
{
public:
- a500_keyboard_it(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+ a500_keyboard_it(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: a500_keyboard_base(mconfig, A500_KBD_IT, tag, owner, clock)
{ }
@@ -713,7 +713,7 @@ protected:
class a500_keyboard_se : public a500_keyboard_base
{
public:
- a500_keyboard_se(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+ a500_keyboard_se(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: a500_keyboard_base(mconfig, A500_KBD_SE, tag, owner, clock)
{ }
@@ -726,7 +726,7 @@ protected:
class a500_keyboard_es : public a500_keyboard_base
{
public:
- a500_keyboard_es(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+ a500_keyboard_es(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: a500_keyboard_base(mconfig, A500_KBD_ES, tag, owner, clock)
{ }
@@ -739,7 +739,7 @@ protected:
class a500_keyboard_dk : public a500_keyboard_base
{
public:
- a500_keyboard_dk(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+ a500_keyboard_dk(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: a500_keyboard_base(mconfig, A500_KBD_DK, tag, owner, clock)
{ }
@@ -752,7 +752,7 @@ protected:
class a500_keyboard_ch : public a500_keyboard_base
{
public:
- a500_keyboard_ch(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+ a500_keyboard_ch(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: a500_keyboard_base(mconfig, A500_KBD_CH, tag, owner, clock)
{ }
@@ -765,7 +765,7 @@ protected:
class a500_keyboard_no : public a500_keyboard_base
{
public:
- a500_keyboard_no(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+ a500_keyboard_no(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: a500_keyboard_base(mconfig, A500_KBD_NO, tag, owner, clock)
{ }
@@ -778,7 +778,7 @@ protected:
class a500_keyboard_gb : public a500_keyboard_base
{
public:
- a500_keyboard_gb(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+ a500_keyboard_gb(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: a500_keyboard_base(mconfig, A500_KBD_GB, tag, owner, clock)
{ }
@@ -796,7 +796,7 @@ protected:
class a600_keyboard_us : public a600_keyboard_base
{
public:
- a600_keyboard_us(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+ a600_keyboard_us(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: a600_keyboard_base(mconfig, A600_KBD_US, tag, owner, clock)
{ }
@@ -809,7 +809,7 @@ protected:
class a600_keyboard_de : public a600_keyboard_base
{
public:
- a600_keyboard_de(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+ a600_keyboard_de(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: a600_keyboard_base(mconfig, A600_KBD_DE, tag, owner, clock)
{ }
@@ -822,7 +822,7 @@ protected:
class a600_keyboard_fr : public a600_keyboard_base
{
public:
- a600_keyboard_fr(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+ a600_keyboard_fr(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: a600_keyboard_base(mconfig, A600_KBD_FR, tag, owner, clock)
{ }
@@ -835,7 +835,7 @@ protected:
class a600_keyboard_it : public a600_keyboard_base
{
public:
- a600_keyboard_it(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+ a600_keyboard_it(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: a600_keyboard_base(mconfig, A600_KBD_IT, tag, owner, clock)
{ }
@@ -848,7 +848,7 @@ protected:
class a600_keyboard_se : public a600_keyboard_base
{
public:
- a600_keyboard_se(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+ a600_keyboard_se(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: a600_keyboard_base(mconfig, A600_KBD_SE, tag, owner, clock)
{ }
@@ -861,7 +861,7 @@ protected:
class a600_keyboard_es : public a600_keyboard_base
{
public:
- a600_keyboard_es(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+ a600_keyboard_es(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: a600_keyboard_base(mconfig, A600_KBD_ES, tag, owner, clock)
{ }
@@ -874,7 +874,7 @@ protected:
class a600_keyboard_dk : public a600_keyboard_base
{
public:
- a600_keyboard_dk(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+ a600_keyboard_dk(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: a600_keyboard_base(mconfig, A600_KBD_DK, tag, owner, clock)
{ }
@@ -887,7 +887,7 @@ protected:
class a600_keyboard_ch : public a600_keyboard_base
{
public:
- a600_keyboard_ch(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+ a600_keyboard_ch(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: a600_keyboard_base(mconfig, A600_KBD_CH, tag, owner, clock)
{ }
@@ -900,7 +900,7 @@ protected:
class a600_keyboard_no : public a600_keyboard_base
{
public:
- a600_keyboard_no(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+ a600_keyboard_no(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: a600_keyboard_base(mconfig, A600_KBD_NO, tag, owner, clock)
{ }
@@ -913,7 +913,7 @@ protected:
class a600_keyboard_gb : public a600_keyboard_base
{
public:
- a600_keyboard_gb(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+ a600_keyboard_gb(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: a600_keyboard_base(mconfig, A600_KBD_GB, tag, owner, clock)
{ }
@@ -931,7 +931,7 @@ protected:
class a1000_keyboard_us : public a1000_keyboard_base
{
public:
- a1000_keyboard_us(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+ a1000_keyboard_us(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: a1000_keyboard_base(mconfig, A1000_KBD_US, tag, owner, clock)
{ }
@@ -942,7 +942,7 @@ protected:
class a1000_keyboard_de : public a1000_keyboard_base
{
public:
- a1000_keyboard_de(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+ a1000_keyboard_de(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: a1000_keyboard_base(mconfig, A1000_KBD_DE, tag, owner, clock)
{ }
@@ -955,7 +955,7 @@ protected:
class a1000_keyboard_fr : public a1000_keyboard_base
{
public:
- a1000_keyboard_fr(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+ a1000_keyboard_fr(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: a1000_keyboard_base(mconfig, A1000_KBD_FR, tag, owner, clock)
{ }
@@ -968,7 +968,7 @@ protected:
class a1000_keyboard_it : public a1000_keyboard_base
{
public:
- a1000_keyboard_it(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+ a1000_keyboard_it(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: a1000_keyboard_base(mconfig, A1000_KBD_IT, tag, owner, clock)
{ }
@@ -981,7 +981,7 @@ protected:
class a1000_keyboard_se : public a1000_keyboard_base
{
public:
- a1000_keyboard_se(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+ a1000_keyboard_se(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: a1000_keyboard_base(mconfig, A1000_KBD_SE, tag, owner, clock)
{ }
@@ -994,7 +994,7 @@ protected:
class a1000_keyboard_dk : public a1000_keyboard_base
{
public:
- a1000_keyboard_dk(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+ a1000_keyboard_dk(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: a1000_keyboard_base(mconfig, A1000_KBD_DK, tag, owner, clock)
{ }
@@ -1007,7 +1007,7 @@ protected:
class a1000_keyboard_gb : public a1000_keyboard_base
{
public:
- a1000_keyboard_gb(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+ a1000_keyboard_gb(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: a1000_keyboard_base(mconfig, A1000_KBD_GB, tag, owner, clock)
{ }
@@ -1025,7 +1025,7 @@ protected:
class a2000_keyboard_us : public mitsumi_watchdog_keyboard_base
{
public:
- a2000_keyboard_us(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+ a2000_keyboard_us(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: mitsumi_watchdog_keyboard_base(mconfig, A2000_KBD_US, tag, owner, clock)
{ }
@@ -1036,7 +1036,7 @@ protected:
class a2000_keyboard_de : public mitsumi_watchdog_keyboard_base
{
public:
- a2000_keyboard_de(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+ a2000_keyboard_de(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: mitsumi_watchdog_keyboard_base(mconfig, A2000_KBD_DE, tag, owner, clock)
{ }
@@ -1049,7 +1049,7 @@ protected:
class a2000_keyboard_fr : public mitsumi_watchdog_keyboard_base
{
public:
- a2000_keyboard_fr(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+ a2000_keyboard_fr(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: mitsumi_watchdog_keyboard_base(mconfig, A2000_KBD_FR, tag, owner, clock)
{ }
@@ -1062,7 +1062,7 @@ protected:
class a2000_keyboard_it : public mitsumi_watchdog_keyboard_base
{
public:
- a2000_keyboard_it(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+ a2000_keyboard_it(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: mitsumi_watchdog_keyboard_base(mconfig, A2000_KBD_IT, tag, owner, clock)
{ }
@@ -1075,7 +1075,7 @@ protected:
class a2000_keyboard_se : public mitsumi_watchdog_keyboard_base
{
public:
- a2000_keyboard_se(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+ a2000_keyboard_se(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: mitsumi_watchdog_keyboard_base(mconfig, A2000_KBD_SE, tag, owner, clock)
{ }
@@ -1088,7 +1088,7 @@ protected:
class a2000_keyboard_es : public mitsumi_watchdog_keyboard_base
{
public:
- a2000_keyboard_es(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+ a2000_keyboard_es(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: mitsumi_watchdog_keyboard_base(mconfig, A2000_KBD_ES, tag, owner, clock)
{ }
@@ -1101,7 +1101,7 @@ protected:
class a2000_keyboard_dk : public mitsumi_watchdog_keyboard_base
{
public:
- a2000_keyboard_dk(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+ a2000_keyboard_dk(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: mitsumi_watchdog_keyboard_base(mconfig, A2000_KBD_DK, tag, owner, clock)
{ }
@@ -1114,7 +1114,7 @@ protected:
class a2000_keyboard_ch : public mitsumi_watchdog_keyboard_base
{
public:
- a2000_keyboard_ch(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+ a2000_keyboard_ch(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: mitsumi_watchdog_keyboard_base(mconfig, A2000_KBD_CH, tag, owner, clock)
{ }
@@ -1127,7 +1127,7 @@ protected:
class a2000_keyboard_no : public mitsumi_watchdog_keyboard_base
{
public:
- a2000_keyboard_no(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+ a2000_keyboard_no(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: mitsumi_watchdog_keyboard_base(mconfig, A2000_KBD_NO, tag, owner, clock)
{ }
@@ -1140,7 +1140,7 @@ protected:
class a2000_keyboard_gb : public mitsumi_watchdog_keyboard_base
{
public:
- a2000_keyboard_gb(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+ a2000_keyboard_gb(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: mitsumi_watchdog_keyboard_base(mconfig, A2000_KBD_GB, tag, owner, clock)
{ }
diff --git a/src/devices/bus/amiga/zorro/a2052.cpp b/src/devices/bus/amiga/zorro/a2052.cpp
index 379a75270c5..e51d020085a 100644
--- a/src/devices/bus/amiga/zorro/a2052.cpp
+++ b/src/devices/bus/amiga/zorro/a2052.cpp
@@ -50,7 +50,7 @@ ioport_constructor a2052_device::device_input_ports() const
// a2052_device - constructor
//-------------------------------------------------
-a2052_device::a2052_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2052_device::a2052_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, ZORRO_A2052, tag, owner, clock),
device_zorro2_card_interface(mconfig, *this),
m_config(*this, "config")
diff --git a/src/devices/bus/amiga/zorro/a2052.h b/src/devices/bus/amiga/zorro/a2052.h
index f64bf06196d..046a8dc7879 100644
--- a/src/devices/bus/amiga/zorro/a2052.h
+++ b/src/devices/bus/amiga/zorro/a2052.h
@@ -29,7 +29,7 @@ class a2052_device : public device_t, public device_zorro2_card_interface, publi
{
public:
// construction/destruction
- a2052_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2052_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
virtual ioport_constructor device_input_ports() const override ATTR_COLD;
diff --git a/src/devices/bus/amiga/zorro/a2058.cpp b/src/devices/bus/amiga/zorro/a2058.cpp
index 26d5f393222..c88969a80c1 100644
--- a/src/devices/bus/amiga/zorro/a2058.cpp
+++ b/src/devices/bus/amiga/zorro/a2058.cpp
@@ -51,7 +51,7 @@ ioport_constructor a2058_device::device_input_ports() const
// a2058_device - constructor
//-------------------------------------------------
-a2058_device::a2058_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2058_device::a2058_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, ZORRO_A2058, tag, owner, clock),
device_zorro2_card_interface(mconfig, *this),
m_config(*this, "config"),
diff --git a/src/devices/bus/amiga/zorro/a2058.h b/src/devices/bus/amiga/zorro/a2058.h
index 9b361b403e4..5e3b9f774c8 100644
--- a/src/devices/bus/amiga/zorro/a2058.h
+++ b/src/devices/bus/amiga/zorro/a2058.h
@@ -29,7 +29,7 @@ class a2058_device : public device_t, public device_zorro2_card_interface, publi
{
public:
// construction/destruction
- a2058_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2058_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
virtual ioport_constructor device_input_ports() const override ATTR_COLD;
diff --git a/src/devices/bus/amiga/zorro/a2065.cpp b/src/devices/bus/amiga/zorro/a2065.cpp
index a76b289bb7f..6f34016a6b9 100644
--- a/src/devices/bus/amiga/zorro/a2065.cpp
+++ b/src/devices/bus/amiga/zorro/a2065.cpp
@@ -50,7 +50,7 @@ void a2065_device::device_add_mconfig(machine_config &config)
// a2065_device - constructor
//-------------------------------------------------
-a2065_device::a2065_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2065_device::a2065_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, ZORRO_A2065, tag, owner, clock),
device_zorro2_card_interface(mconfig, *this),
m_lance(*this, "lance")
diff --git a/src/devices/bus/amiga/zorro/a2065.h b/src/devices/bus/amiga/zorro/a2065.h
index 43e66c29678..fdb5e4a52ed 100644
--- a/src/devices/bus/amiga/zorro/a2065.h
+++ b/src/devices/bus/amiga/zorro/a2065.h
@@ -30,7 +30,7 @@ class a2065_device : public device_t, public device_zorro2_card_interface, publi
{
public:
// construction/destruction
- a2065_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2065_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
uint16_t host_ram_r(offs_t offset);
void host_ram_w(offs_t offset, uint16_t data, uint16_t mem_mask = ~0);
diff --git a/src/devices/bus/amiga/zorro/a2232.cpp b/src/devices/bus/amiga/zorro/a2232.cpp
index b9d6726bc7e..4dd94a3f971 100644
--- a/src/devices/bus/amiga/zorro/a2232.cpp
+++ b/src/devices/bus/amiga/zorro/a2232.cpp
@@ -117,7 +117,7 @@ void a2232_device::device_add_mconfig(machine_config &config)
// a2232_device - constructor
//-------------------------------------------------
-a2232_device::a2232_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2232_device::a2232_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, ZORRO_A2232, tag, owner, clock),
device_zorro2_card_interface(mconfig, *this),
m_iocpu(*this, "iocpu"),
diff --git a/src/devices/bus/amiga/zorro/a2232.h b/src/devices/bus/amiga/zorro/a2232.h
index e8a5da3258c..a703f0cec7e 100644
--- a/src/devices/bus/amiga/zorro/a2232.h
+++ b/src/devices/bus/amiga/zorro/a2232.h
@@ -36,7 +36,7 @@ class a2232_device : public device_t, public device_zorro2_card_interface, publi
{
public:
// construction/destruction
- a2232_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2232_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
// zorro slot
uint16_t shared_ram_r(offs_t offset, uint16_t mem_mask = ~0);
diff --git a/src/devices/bus/amiga/zorro/a590.cpp b/src/devices/bus/amiga/zorro/a590.cpp
index 3fe72c69a42..f804bee8263 100644
--- a/src/devices/bus/amiga/zorro/a590.cpp
+++ b/src/devices/bus/amiga/zorro/a590.cpp
@@ -119,20 +119,20 @@ ioport_constructor a2091_device::device_input_ports() const
void dmac_hdc_device_base::wd33c93(device_t *device)
{
- device->set_clock(10000000);
+ device->set_clock(XTAL::u(10000000));
downcast<wd33c93a_device *>(device)->irq_cb().set(*this, FUNC(dmac_hdc_device_base::scsi_irq_w));
downcast<wd33c93a_device *>(device)->drq_cb().set(*this, FUNC(dmac_hdc_device_base::scsi_drq_w));
}
void dmac_hdc_device_base::device_add_mconfig(machine_config &config)
{
- amiga_dmac_device &dmac(AMIGA_DMAC(config, "dmac", 0));
+ amiga_dmac_device &dmac(AMIGA_DMAC(config, "dmac"));
dmac.scsi_read_handler().set(FUNC(dmac_hdc_device_base::dmac_scsi_r));
dmac.scsi_write_handler().set(FUNC(dmac_hdc_device_base::dmac_scsi_w));
dmac.int_handler().set(FUNC(dmac_hdc_device_base::dmac_int_w));
dmac.cfgout_handler().set(FUNC(dmac_hdc_device_base::dmac_cfgout_w));
- NSCSI_BUS(config, "scsi", 0);
+ NSCSI_BUS(config, "scsi");
NSCSI_CONNECTOR(config, "scsi:0", default_scsi_devices, nullptr, false);
NSCSI_CONNECTOR(config, "scsi:1", default_scsi_devices, "harddisk", false);
NSCSI_CONNECTOR(config, "scsi:3", default_scsi_devices, nullptr, false);
@@ -214,7 +214,7 @@ const tiny_rom_entry *dmac_hdc_device_base::device_rom_region() const
// dmac_hdc_device_base - constructor
//-------------------------------------------------
-dmac_hdc_device_base::dmac_hdc_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+dmac_hdc_device_base::dmac_hdc_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),
m_int6(false),
m_dmac(*this, "dmac"),
@@ -222,7 +222,7 @@ dmac_hdc_device_base::dmac_hdc_device_base(const machine_config &mconfig, device
{
}
-a590_device::a590_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a590_device::a590_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
dmac_hdc_device_base(mconfig, ZORRO_A590, tag, owner, clock),
device_exp_card_interface(mconfig, *this),
m_dips(*this, "dips"),
@@ -232,7 +232,7 @@ a590_device::a590_device(const machine_config &mconfig, const char *tag, device_
{
}
-a2091_device::a2091_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+a2091_device::a2091_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
dmac_hdc_device_base(mconfig, ZORRO_A2091, tag, owner, clock),
device_zorro2_card_interface(mconfig, *this),
m_jp1(*this, "jp1"),
diff --git a/src/devices/bus/amiga/zorro/a590.h b/src/devices/bus/amiga/zorro/a590.h
index ab2a71bb0ce..82b4ef1af7c 100644
--- a/src/devices/bus/amiga/zorro/a590.h
+++ b/src/devices/bus/amiga/zorro/a590.h
@@ -30,7 +30,7 @@ class dmac_hdc_device_base : public device_t
{
protected:
// construction/destruction
- dmac_hdc_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ dmac_hdc_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
// device-level overrides
virtual void device_start() override ATTR_COLD;
@@ -75,7 +75,7 @@ class a590_device : public dmac_hdc_device_base, public device_exp_card_interfac
{
public:
// construction/destruction
- a590_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a590_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
@@ -106,7 +106,7 @@ class a2091_device : public dmac_hdc_device_base, public device_zorro2_card_inte
{
public:
// construction/destruction
- a2091_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ a2091_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/amiga/zorro/action_replay.cpp b/src/devices/bus/amiga/zorro/action_replay.cpp
index 9466305049d..40d43350535 100644
--- a/src/devices/bus/amiga/zorro/action_replay.cpp
+++ b/src/devices/bus/amiga/zorro/action_replay.cpp
@@ -101,24 +101,24 @@ const tiny_rom_entry *action_replay_mk3_device::device_rom_region() const
// action_replay_device_base - constructor
//-------------------------------------------------
-action_replay_device_base::action_replay_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+action_replay_device_base::action_replay_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_exp_card_interface(mconfig, *this),
m_button(*this, "freeze")
{
}
-action_replay_mk1_device::action_replay_mk1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+action_replay_mk1_device::action_replay_mk1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
action_replay_device_base(mconfig, ZORRO_ACTION_REPLAY_MK1, tag, owner, clock)
{
}
-action_replay_mk2_device::action_replay_mk2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+action_replay_mk2_device::action_replay_mk2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
action_replay_device_base(mconfig, ZORRO_ACTION_REPLAY_MK2, tag, owner, clock)
{
}
-action_replay_mk3_device::action_replay_mk3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+action_replay_mk3_device::action_replay_mk3_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
action_replay_device_base(mconfig, ZORRO_ACTION_REPLAY_MK3, tag, owner, clock)
{
}
diff --git a/src/devices/bus/amiga/zorro/action_replay.h b/src/devices/bus/amiga/zorro/action_replay.h
index 18a3c6c6456..74b309a8c78 100644
--- a/src/devices/bus/amiga/zorro/action_replay.h
+++ b/src/devices/bus/amiga/zorro/action_replay.h
@@ -31,7 +31,7 @@ public:
protected:
// construction/destruction
- action_replay_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ action_replay_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
// optional information overrides
virtual ioport_constructor device_input_ports() const override ATTR_COLD;
@@ -48,7 +48,7 @@ class action_replay_mk1_device : public action_replay_device_base
{
public:
// construction/destruction
- action_replay_mk1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ action_replay_mk1_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// optional information overrides
@@ -59,7 +59,7 @@ class action_replay_mk2_device : public action_replay_device_base
{
public:
// construction/destruction
- action_replay_mk2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ action_replay_mk2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// optional information overrides
@@ -70,7 +70,7 @@ class action_replay_mk3_device : public action_replay_device_base
{
public:
// construction/destruction
- action_replay_mk3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ action_replay_mk3_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// optional information overrides
diff --git a/src/devices/bus/amiga/zorro/buddha.cpp b/src/devices/bus/amiga/zorro/buddha.cpp
index 16a27d07ff2..9f138dbe953 100644
--- a/src/devices/bus/amiga/zorro/buddha.cpp
+++ b/src/devices/bus/amiga/zorro/buddha.cpp
@@ -94,7 +94,7 @@ const tiny_rom_entry *buddha_device::device_rom_region() const
// buddha_device - constructor
//-------------------------------------------------
-buddha_device::buddha_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+buddha_device::buddha_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, ZORRO_BUDDHA, tag, owner, clock),
device_zorro2_card_interface(mconfig, *this),
m_ata_0(*this, "ata_0"),
diff --git a/src/devices/bus/amiga/zorro/buddha.h b/src/devices/bus/amiga/zorro/buddha.h
index 80fce2682c5..dfef57d1a86 100644
--- a/src/devices/bus/amiga/zorro/buddha.h
+++ b/src/devices/bus/amiga/zorro/buddha.h
@@ -30,7 +30,7 @@ class buddha_device : public device_t, public device_zorro2_card_interface, publ
{
public:
// construction/destruction
- buddha_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ buddha_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/amiga/zorro/zorro.cpp b/src/devices/bus/amiga/zorro/zorro.cpp
index 6bd8b280c86..8619314fb5e 100644
--- a/src/devices/bus/amiga/zorro/zorro.cpp
+++ b/src/devices/bus/amiga/zorro/zorro.cpp
@@ -22,12 +22,12 @@ DEFINE_DEVICE_TYPE(ZORRO_SLOT, zorro_slot_device, "zorro_slot", "Zorro slot")
// zorro_slot_device - constructor
//-------------------------------------------------
-zorro_slot_device::zorro_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+zorro_slot_device::zorro_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
zorro_slot_device(mconfig, ZORRO_SLOT, tag, owner, clock)
{
}
-zorro_slot_device::zorro_slot_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+zorro_slot_device::zorro_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_zorro_bus(*this, finder_base::DUMMY_TAG)
@@ -64,7 +64,7 @@ void zorro_slot_device::device_start()
// exp_slot_device - constructor
//-------------------------------------------------
-zorro_bus_device_base::zorro_bus_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+zorro_bus_device_base::zorro_bus_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),
m_space(*this, finder_base::DUMMY_TAG, -1),
m_ovr_handler(*this),
@@ -111,12 +111,12 @@ DEFINE_DEVICE_TYPE(EXP_SLOT, exp_slot_device, "exp_slot", "86-pin expansion slot
// exp_slot_device - constructor
//-------------------------------------------------
-exp_slot_device::exp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+exp_slot_device::exp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
exp_slot_device(mconfig, EXP_SLOT, tag, owner, clock)
{
}
-exp_slot_device::exp_slot_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+exp_slot_device::exp_slot_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) :
zorro_bus_device_base(mconfig, type, tag, owner, clock),
m_ipl_handler(*this),
m_dev(nullptr)
@@ -185,12 +185,12 @@ DEFINE_DEVICE_TYPE(ZORRO2, zorro2_bus_device, "zorro2", "Zorro-II bus")
// zorro2_bus_device - constructor
//-------------------------------------------------
-zorro2_bus_device::zorro2_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+zorro2_bus_device::zorro2_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
zorro2_bus_device(mconfig, ZORRO2, tag, owner, clock)
{
}
-zorro2_bus_device::zorro2_bus_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+zorro2_bus_device::zorro2_bus_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock) :
zorro_bus_device_base(mconfig, type, tag, owner, clock),
m_eint1_handler(*this),
m_eint4_handler(*this),
diff --git a/src/devices/bus/amiga/zorro/zorro.h b/src/devices/bus/amiga/zorro/zorro.h
index 632a5de9f6a..286fa081332 100644
--- a/src/devices/bus/amiga/zorro/zorro.h
+++ b/src/devices/bus/amiga/zorro/zorro.h
@@ -160,10 +160,10 @@ class zorro_slot_device : public device_t, public device_slot_interface
{
public:
// construction/destruction
- zorro_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ zorro_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL());
template <typename T, typename O>
zorro_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, T &&zorrotag, O &&opts, const char *dflt)
- : zorro_slot_device(mconfig, tag, owner, 0)
+ : zorro_slot_device(mconfig, tag, owner)
{
set_zorro_slot(std::forward<T>(zorrotag));
option_reset();
@@ -176,7 +176,7 @@ public:
template <class T> void set_zorro_slot(T &&zorro_tag) { m_zorro_bus.set_tag(zorro_tag); }
protected:
- zorro_slot_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ zorro_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 ATTR_COLD;
@@ -217,7 +217,7 @@ public:
protected:
// construction/destruction
- zorro_bus_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ zorro_bus_device_base(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
// device-level overrides
virtual void device_resolve_objects() override ATTR_COLD;
@@ -237,7 +237,7 @@ class exp_slot_device : public zorro_bus_device_base
{
public:
// construction/destruction
- exp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ exp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
auto ipl_handler() { return m_ipl_handler.bind(); }
@@ -251,7 +251,7 @@ public:
virtual void fc_w(int code) override;
protected:
- exp_slot_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ exp_slot_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
// device-level overrides
virtual void device_resolve_objects() override ATTR_COLD;
@@ -272,7 +272,7 @@ class zorro2_bus_device : public zorro_bus_device_base
{
public:
// construction/destruction
- zorro2_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ zorro2_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
~zorro2_bus_device();
auto eint1_handler() { return m_eint1_handler.bind(); }
@@ -295,7 +295,7 @@ public:
virtual void fc_w(int code) override;
protected:
- zorro2_bus_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ zorro2_bus_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, const XTAL &clock);
// device-level overrides
virtual void device_resolve_objects() override ATTR_COLD;