summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/abcbus
diff options
context:
space:
mode:
author Olivier Galibert <galibert@pobox.com>2022-06-16 12:47:52 +0200
committer Olivier Galibert <galibert@pobox.com>2025-04-29 23:06:41 +0200
commit45d4cd52a8194f2ef9e0383cfb2e2a35634af6ff (patch)
tree4e8d8fcb7382a5e9e0bce5ec59939bcfbe67155a /src/devices/bus/abcbus
parent5c14bcdfcb4aefb71b5b62387c4ad05dbeb3814e (diff)
full xtal conversionxtal
Diffstat (limited to 'src/devices/bus/abcbus')
-rw-r--r--src/devices/bus/abcbus/abc890.cpp14
-rw-r--r--src/devices/bus/abcbus/abc890.h14
-rw-r--r--src/devices/bus/abcbus/abcbus.cpp2
-rw-r--r--src/devices/bus/abcbus/abcbus.h4
-rw-r--r--src/devices/bus/abcbus/cadmouse.cpp2
-rw-r--r--src/devices/bus/abcbus/cadmouse.h2
-rw-r--r--src/devices/bus/abcbus/db4106.cpp4
-rw-r--r--src/devices/bus/abcbus/db4106.h2
-rw-r--r--src/devices/bus/abcbus/db4107.cpp6
-rw-r--r--src/devices/bus/abcbus/db4107.h2
-rw-r--r--src/devices/bus/abcbus/db4112.cpp4
-rw-r--r--src/devices/bus/abcbus/db4112.h2
-rw-r--r--src/devices/bus/abcbus/fd2.cpp2
-rw-r--r--src/devices/bus/abcbus/fd2.h2
-rw-r--r--src/devices/bus/abcbus/lux10828.cpp2
-rw-r--r--src/devices/bus/abcbus/lux10828.h2
-rw-r--r--src/devices/bus/abcbus/lux21046.cpp14
-rw-r--r--src/devices/bus/abcbus/lux21046.h14
-rw-r--r--src/devices/bus/abcbus/lux21056.cpp2
-rw-r--r--src/devices/bus/abcbus/lux21056.h2
-rw-r--r--src/devices/bus/abcbus/lux4105.cpp2
-rw-r--r--src/devices/bus/abcbus/lux4105.h2
-rw-r--r--src/devices/bus/abcbus/memcard.cpp2
-rw-r--r--src/devices/bus/abcbus/memcard.h2
-rw-r--r--src/devices/bus/abcbus/ram.cpp2
-rw-r--r--src/devices/bus/abcbus/ram.h2
-rw-r--r--src/devices/bus/abcbus/sio.cpp4
-rw-r--r--src/devices/bus/abcbus/sio.h2
-rw-r--r--src/devices/bus/abcbus/slutprov.cpp2
-rw-r--r--src/devices/bus/abcbus/slutprov.h2
-rw-r--r--src/devices/bus/abcbus/ssa.cpp2
-rw-r--r--src/devices/bus/abcbus/ssa.h2
-rw-r--r--src/devices/bus/abcbus/uni800.cpp2
-rw-r--r--src/devices/bus/abcbus/uni800.h2
-rw-r--r--src/devices/bus/abcbus/unidisk.cpp4
-rw-r--r--src/devices/bus/abcbus/unidisk.h2
36 files changed, 67 insertions, 67 deletions
diff --git a/src/devices/bus/abcbus/abc890.cpp b/src/devices/bus/abcbus/abc890.cpp
index 9374096f38b..b0d76352697 100644
--- a/src/devices/bus/abcbus/abc890.cpp
+++ b/src/devices/bus/abcbus/abc890.cpp
@@ -127,38 +127,38 @@ void abc856_device::device_add_mconfig(machine_config &config)
// abc890_device - constructor
//-------------------------------------------------
-abc890_device::abc890_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+abc890_device::abc890_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_abcbus_card_interface(mconfig, *this)
{
}
-abc890_device::abc890_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+abc890_device::abc890_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
abc890_device(mconfig, ABC890, tag, owner, clock)
{
}
-abc_expansion_unit_device::abc_expansion_unit_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+abc_expansion_unit_device::abc_expansion_unit_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
abc890_device(mconfig, ABC_EXPANSION_UNIT, tag, owner, clock)
{
}
-abc894_device::abc894_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+abc894_device::abc894_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
abc890_device(mconfig, ABC894, tag, owner, clock)
{
}
-abc850_device::abc850_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+abc850_device::abc850_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
abc890_device(mconfig, ABC850, tag, owner, clock)
{
}
-abc852_device::abc852_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+abc852_device::abc852_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
abc890_device(mconfig, ABC852, tag, owner, clock)
{
}
-abc856_device::abc856_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+abc856_device::abc856_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
abc890_device(mconfig, ABC856, tag, owner, clock)
{
}
diff --git a/src/devices/bus/abcbus/abc890.h b/src/devices/bus/abcbus/abc890.h
index 5a56b9804fe..70f5b97e838 100644
--- a/src/devices/bus/abcbus/abc890.h
+++ b/src/devices/bus/abcbus/abc890.h
@@ -26,10 +26,10 @@ class abc890_device : public device_t,
{
public:
// construction/destruction
- abc890_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ abc890_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- abc890_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ abc890_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;
@@ -58,7 +58,7 @@ class abc_expansion_unit_device : public abc890_device
{
public:
// construction/destruction
- abc_expansion_unit_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ abc_expansion_unit_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// optional information overrides
@@ -72,7 +72,7 @@ class abc894_device : public abc890_device
{
public:
// construction/destruction
- abc894_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ abc894_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// optional information overrides
@@ -86,7 +86,7 @@ class abc850_device : public abc890_device
{
public:
// construction/destruction
- abc850_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ abc850_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// optional information overrides
@@ -100,7 +100,7 @@ class abc852_device : public abc890_device
{
public:
// construction/destruction
- abc852_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ abc852_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// optional information overrides
@@ -114,7 +114,7 @@ class abc856_device : public abc890_device
{
public:
// construction/destruction
- abc856_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ abc856_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// optional information overrides
diff --git a/src/devices/bus/abcbus/abcbus.cpp b/src/devices/bus/abcbus/abcbus.cpp
index 5e0adb49c3f..e0335f56aac 100644
--- a/src/devices/bus/abcbus/abcbus.cpp
+++ b/src/devices/bus/abcbus/abcbus.cpp
@@ -38,7 +38,7 @@ device_abcbus_card_interface::device_abcbus_card_interface(const machine_config
// abcbus_slot_device - constructor
//-------------------------------------------------
-abcbus_slot_device::abcbus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+abcbus_slot_device::abcbus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, ABCBUS_SLOT, tag, owner, clock),
device_single_card_slot_interface<device_abcbus_card_interface>(mconfig, *this),
m_write_irq(*this),
diff --git a/src/devices/bus/abcbus/abcbus.h b/src/devices/bus/abcbus/abcbus.h
index e8ce92a2d9b..e1a1940ec21 100644
--- a/src/devices/bus/abcbus/abcbus.h
+++ b/src/devices/bus/abcbus/abcbus.h
@@ -158,9 +158,9 @@ class abcbus_slot_device : public device_t,
{
public:
// construction/destruction
- abcbus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ abcbus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
template <typename T>
- abcbus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, T &&opts, const char *dflt)
+ abcbus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock, T &&opts, const char *dflt)
: abcbus_slot_device(mconfig, tag, owner, clock)
{
option_reset();
diff --git a/src/devices/bus/abcbus/cadmouse.cpp b/src/devices/bus/abcbus/cadmouse.cpp
index 7a4d90916f9..222a7113fa7 100644
--- a/src/devices/bus/abcbus/cadmouse.cpp
+++ b/src/devices/bus/abcbus/cadmouse.cpp
@@ -140,7 +140,7 @@ void abc_cadmouse_device::device_add_mconfig(machine_config &config)
// abc_cadmouse_device - constructor
//-------------------------------------------------
-abc_cadmouse_device::abc_cadmouse_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+abc_cadmouse_device::abc_cadmouse_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, ABC_CADMOUSE, tag, owner, clock),
device_abcbus_card_interface(mconfig, *this),
m_maincpu(*this, Z80_TAG)
diff --git a/src/devices/bus/abcbus/cadmouse.h b/src/devices/bus/abcbus/cadmouse.h
index 317c67e97aa..aef4abfe991 100644
--- a/src/devices/bus/abcbus/cadmouse.h
+++ b/src/devices/bus/abcbus/cadmouse.h
@@ -17,7 +17,7 @@ class abc_cadmouse_device : public device_t,
{
public:
// construction/destruction
- abc_cadmouse_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ abc_cadmouse_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::MOUSE | feature::GRAPHICS; }
diff --git a/src/devices/bus/abcbus/db4106.cpp b/src/devices/bus/abcbus/db4106.cpp
index edd604f610c..8fb2e3c0112 100644
--- a/src/devices/bus/abcbus/db4106.cpp
+++ b/src/devices/bus/abcbus/db4106.cpp
@@ -70,7 +70,7 @@ void databoard_4106_device::databoard_4106_io(address_map &map)
void databoard_4106_device::device_add_mconfig(machine_config &config)
{
- Z80(config, m_maincpu, 4000000);
+ Z80(config, m_maincpu, XTAL::u(4000000));
m_maincpu->set_memory_map(&databoard_4106_device::databoard_4106_mem);
m_maincpu->set_io_map(&databoard_4106_device::databoard_4106_io);
}
@@ -103,7 +103,7 @@ ioport_constructor databoard_4106_device::device_input_ports() const
// databoard_4106_device - constructor
//-------------------------------------------------
-databoard_4106_device::databoard_4106_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+databoard_4106_device::databoard_4106_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, DATABOARD_4106, tag, owner, clock),
device_abcbus_card_interface(mconfig, *this),
m_maincpu(*this, Z80_TAG)
diff --git a/src/devices/bus/abcbus/db4106.h b/src/devices/bus/abcbus/db4106.h
index 74e49631dbe..ad54f511c19 100644
--- a/src/devices/bus/abcbus/db4106.h
+++ b/src/devices/bus/abcbus/db4106.h
@@ -27,7 +27,7 @@ class databoard_4106_device : public device_t,
{
public:
// construction/destruction
- databoard_4106_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ databoard_4106_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/abcbus/db4107.cpp b/src/devices/bus/abcbus/db4107.cpp
index 0b9ab0ed062..2e31f02f5ab 100644
--- a/src/devices/bus/abcbus/db4107.cpp
+++ b/src/devices/bus/abcbus/db4107.cpp
@@ -96,11 +96,11 @@ void databoard_4107_device::databoard_4107_io(address_map &map)
void databoard_4107_device::device_add_mconfig(machine_config &config)
{
- Z80(config, m_maincpu, 4000000);
+ Z80(config, m_maincpu, XTAL::u(4000000));
m_maincpu->set_memory_map(&databoard_4107_device::databoard_4107_mem);
m_maincpu->set_io_map(&databoard_4107_device::databoard_4107_io);
- Z80DMA(config, m_dma, 4000000);
+ Z80DMA(config, m_dma, XTAL::u(4000000));
}
@@ -131,7 +131,7 @@ ioport_constructor databoard_4107_device::device_input_ports() const
// databoard_4107_device - constructor
//-------------------------------------------------
-databoard_4107_device::databoard_4107_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+databoard_4107_device::databoard_4107_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, DATABOARD_4107, tag, owner, clock),
device_abcbus_card_interface(mconfig, *this),
m_maincpu(*this, Z80_TAG),
diff --git a/src/devices/bus/abcbus/db4107.h b/src/devices/bus/abcbus/db4107.h
index 4ae301084ca..4db86a3f041 100644
--- a/src/devices/bus/abcbus/db4107.h
+++ b/src/devices/bus/abcbus/db4107.h
@@ -28,7 +28,7 @@ class databoard_4107_device : public device_t,
{
public:
// construction/destruction
- databoard_4107_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ databoard_4107_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/abcbus/db4112.cpp b/src/devices/bus/abcbus/db4112.cpp
index a2631f0b244..6054d4acc21 100644
--- a/src/devices/bus/abcbus/db4112.cpp
+++ b/src/devices/bus/abcbus/db4112.cpp
@@ -74,7 +74,7 @@ void abc_databoard_4112_device::databoard_4112_io(address_map &map)
void abc_databoard_4112_device::device_add_mconfig(machine_config &config)
{
- Z80(config, m_maincpu, 4000000);
+ Z80(config, m_maincpu, XTAL::u(4000000));
m_maincpu->set_memory_map(&abc_databoard_4112_device::databoard_4112_mem);
m_maincpu->set_io_map(&abc_databoard_4112_device::databoard_4112_io);
}
@@ -107,7 +107,7 @@ ioport_constructor abc_databoard_4112_device::device_input_ports() const
// abc_databoard_4112_device - constructor
//-------------------------------------------------
-abc_databoard_4112_device::abc_databoard_4112_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+abc_databoard_4112_device::abc_databoard_4112_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, DATABOARD_4112, tag, owner, clock),
device_abcbus_card_interface(mconfig, *this),
m_maincpu(*this, Z80_TAG)
diff --git a/src/devices/bus/abcbus/db4112.h b/src/devices/bus/abcbus/db4112.h
index c28da004297..0f8aae355df 100644
--- a/src/devices/bus/abcbus/db4112.h
+++ b/src/devices/bus/abcbus/db4112.h
@@ -27,7 +27,7 @@ class abc_databoard_4112_device : public device_t,
{
public:
// construction/destruction
- abc_databoard_4112_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ abc_databoard_4112_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/abcbus/fd2.cpp b/src/devices/bus/abcbus/fd2.cpp
index b23daa8ebd7..eb16b40e80b 100644
--- a/src/devices/bus/abcbus/fd2.cpp
+++ b/src/devices/bus/abcbus/fd2.cpp
@@ -271,7 +271,7 @@ void abc_fd2_device::device_add_mconfig(machine_config &config)
// abc_fd2_device - constructor
//-------------------------------------------------
-abc_fd2_device::abc_fd2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+abc_fd2_device::abc_fd2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, ABC_FD2, tag, owner, clock),
device_abcbus_card_interface(mconfig, *this),
m_maincpu(*this, Z80_TAG),
diff --git a/src/devices/bus/abcbus/fd2.h b/src/devices/bus/abcbus/fd2.h
index a476b66c821..15c55a2e393 100644
--- a/src/devices/bus/abcbus/fd2.h
+++ b/src/devices/bus/abcbus/fd2.h
@@ -32,7 +32,7 @@ class abc_fd2_device : public device_t,
{
public:
// construction/destruction
- abc_fd2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ abc_fd2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/abcbus/lux10828.cpp b/src/devices/bus/abcbus/lux10828.cpp
index e349cd76bb5..2c54c6cf825 100644
--- a/src/devices/bus/abcbus/lux10828.cpp
+++ b/src/devices/bus/abcbus/lux10828.cpp
@@ -403,7 +403,7 @@ ioport_constructor luxor_55_10828_device::device_input_ports() const
// luxor_55_10828_device - constructor
//-------------------------------------------------
-luxor_55_10828_device::luxor_55_10828_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+luxor_55_10828_device::luxor_55_10828_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, LUXOR_55_10828, tag, owner, clock),
device_abcbus_card_interface(mconfig, *this),
m_maincpu(*this, Z80_TAG),
diff --git a/src/devices/bus/abcbus/lux10828.h b/src/devices/bus/abcbus/lux10828.h
index c5bf46a8c89..55e3fce585f 100644
--- a/src/devices/bus/abcbus/lux10828.h
+++ b/src/devices/bus/abcbus/lux10828.h
@@ -54,7 +54,7 @@ class luxor_55_10828_device : public device_t,
{
public:
// construction/destruction
- luxor_55_10828_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ luxor_55_10828_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/abcbus/lux21046.cpp b/src/devices/bus/abcbus/lux21046.cpp
index 7dd4ebfb791..6b496722ccc 100644
--- a/src/devices/bus/abcbus/lux21046.cpp
+++ b/src/devices/bus/abcbus/lux21046.cpp
@@ -710,12 +710,12 @@ ioport_constructor abc850_floppy_device::device_input_ports() const
// luxor_55_21046_device - constructor
//-------------------------------------------------
-luxor_55_21046_device::luxor_55_21046_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+luxor_55_21046_device::luxor_55_21046_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
luxor_55_21046_device(mconfig, LUXOR_55_21046, tag, owner, clock)
{
}
-luxor_55_21046_device::luxor_55_21046_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock) :
+luxor_55_21046_device::luxor_55_21046_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_abcbus_card_interface(mconfig, *this),
m_floppy0(*this, SAB1793_TAG":0"),
@@ -738,27 +738,27 @@ luxor_55_21046_device::luxor_55_21046_device(const machine_config &mconfig, devi
{
}
-abc830_device::abc830_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+abc830_device::abc830_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
luxor_55_21046_device(mconfig, ABC830, tag, owner, clock)
{
}
-abc832_device::abc832_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+abc832_device::abc832_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
luxor_55_21046_device(mconfig, ABC832, tag, owner, clock)
{
}
-abc834_device::abc834_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+abc834_device::abc834_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
luxor_55_21046_device(mconfig, ABC834, tag, owner, clock)
{
}
-abc838_device::abc838_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+abc838_device::abc838_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
luxor_55_21046_device(mconfig, ABC838, tag, owner, clock)
{
}
-abc850_floppy_device::abc850_floppy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+abc850_floppy_device::abc850_floppy_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
luxor_55_21046_device(mconfig, ABC850_FLOPPY, tag, owner, clock)
{
}
diff --git a/src/devices/bus/abcbus/lux21046.h b/src/devices/bus/abcbus/lux21046.h
index 735de99641c..b18f393b4b2 100644
--- a/src/devices/bus/abcbus/lux21046.h
+++ b/src/devices/bus/abcbus/lux21046.h
@@ -53,10 +53,10 @@ class luxor_55_21046_device : public device_t,
{
public:
// construction/destruction
- luxor_55_21046_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ luxor_55_21046_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
- luxor_55_21046_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+ luxor_55_21046_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;
@@ -127,7 +127,7 @@ class abc830_device : public luxor_55_21046_device
{
public:
// construction/destruction
- abc830_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ abc830_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// optional information overrides
@@ -142,7 +142,7 @@ class abc832_device : public luxor_55_21046_device
{
public:
// construction/destruction
- abc832_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ abc832_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// optional information overrides
@@ -157,7 +157,7 @@ class abc834_device : public luxor_55_21046_device
{
public:
// construction/destruction
- abc834_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ abc834_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// optional information overrides
@@ -172,7 +172,7 @@ class abc838_device : public luxor_55_21046_device
{
public:
// construction/destruction
- abc838_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ abc838_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// optional information overrides
@@ -187,7 +187,7 @@ class abc850_floppy_device : public luxor_55_21046_device
{
public:
// construction/destruction
- abc850_floppy_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ abc850_floppy_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// optional information overrides
diff --git a/src/devices/bus/abcbus/lux21056.cpp b/src/devices/bus/abcbus/lux21056.cpp
index f14ea5a0f68..970ced7ab57 100644
--- a/src/devices/bus/abcbus/lux21056.cpp
+++ b/src/devices/bus/abcbus/lux21056.cpp
@@ -334,7 +334,7 @@ ioport_constructor luxor_55_21056_device::device_input_ports() const
// luxor_55_21056_device - constructor
//-------------------------------------------------
-luxor_55_21056_device::luxor_55_21056_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+luxor_55_21056_device::luxor_55_21056_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, LUXOR_55_21056, tag, owner, clock),
device_abcbus_card_interface(mconfig, *this),
m_maincpu(*this, Z80_TAG),
diff --git a/src/devices/bus/abcbus/lux21056.h b/src/devices/bus/abcbus/lux21056.h
index 812bb8325a3..c7f06bf2b30 100644
--- a/src/devices/bus/abcbus/lux21056.h
+++ b/src/devices/bus/abcbus/lux21056.h
@@ -30,7 +30,7 @@ class luxor_55_21056_device : public device_t,
{
public:
// construction/destruction
- luxor_55_21056_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ luxor_55_21056_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/abcbus/lux4105.cpp b/src/devices/bus/abcbus/lux4105.cpp
index 324fd542ac7..48369bb8f82 100644
--- a/src/devices/bus/abcbus/lux4105.cpp
+++ b/src/devices/bus/abcbus/lux4105.cpp
@@ -136,7 +136,7 @@ ioport_constructor luxor_4105_device::device_input_ports() const
// luxor_4105_device - constructor
//-------------------------------------------------
-luxor_4105_device::luxor_4105_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+luxor_4105_device::luxor_4105_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, LUXOR_4105, tag, owner, clock),
device_abcbus_card_interface(mconfig, *this),
m_sasi(*this, "sasi:7:scsicb"),
diff --git a/src/devices/bus/abcbus/lux4105.h b/src/devices/bus/abcbus/lux4105.h
index dde20ad3075..179fa47ca47 100644
--- a/src/devices/bus/abcbus/lux4105.h
+++ b/src/devices/bus/abcbus/lux4105.h
@@ -30,7 +30,7 @@ class luxor_4105_device : public device_t,
{
public:
// construction/destruction
- luxor_4105_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ luxor_4105_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/abcbus/memcard.cpp b/src/devices/bus/abcbus/memcard.cpp
index e8cd5464ae7..af82487d28e 100644
--- a/src/devices/bus/abcbus/memcard.cpp
+++ b/src/devices/bus/abcbus/memcard.cpp
@@ -110,7 +110,7 @@ const tiny_rom_entry *abc_memory_card_device::device_rom_region() const
// abc_memory_card_device - constructor
//-------------------------------------------------
-abc_memory_card_device::abc_memory_card_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+abc_memory_card_device::abc_memory_card_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, ABC_MEMORY_CARD, tag, owner, clock),
device_abcbus_card_interface(mconfig, *this),
m_dos_rom(*this, "dos"),
diff --git a/src/devices/bus/abcbus/memcard.h b/src/devices/bus/abcbus/memcard.h
index dae0a14fd50..09ffc2b4c12 100644
--- a/src/devices/bus/abcbus/memcard.h
+++ b/src/devices/bus/abcbus/memcard.h
@@ -25,7 +25,7 @@ class abc_memory_card_device : public device_t, public device_abcbus_card_interf
{
public:
// construction/destruction
- abc_memory_card_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ abc_memory_card_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/abcbus/ram.cpp b/src/devices/bus/abcbus/ram.cpp
index 563964041c5..11b823a2381 100644
--- a/src/devices/bus/abcbus/ram.cpp
+++ b/src/devices/bus/abcbus/ram.cpp
@@ -27,7 +27,7 @@ DEFINE_DEVICE_TYPE(ABC80_16KB_RAM_CARD, abc80_16kb_ram_card_device, "abc80_16kb"
// abc80_16kb_ram_card_device - constructor
//-------------------------------------------------
-abc80_16kb_ram_card_device::abc80_16kb_ram_card_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+abc80_16kb_ram_card_device::abc80_16kb_ram_card_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, ABC80_16KB_RAM_CARD, tag, owner, clock),
device_abcbus_card_interface(mconfig, *this),
m_ram(*this, "ram", 0x4000, ENDIANNESS_LITTLE)
diff --git a/src/devices/bus/abcbus/ram.h b/src/devices/bus/abcbus/ram.h
index cf552c6412f..eb8016f570d 100644
--- a/src/devices/bus/abcbus/ram.h
+++ b/src/devices/bus/abcbus/ram.h
@@ -25,7 +25,7 @@ class abc80_16kb_ram_card_device : public device_t, public device_abcbus_card_in
{
public:
// construction/destruction
- abc80_16kb_ram_card_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ abc80_16kb_ram_card_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/abcbus/sio.cpp b/src/devices/bus/abcbus/sio.cpp
index 326d4f07a73..ba3bca1a884 100644
--- a/src/devices/bus/abcbus/sio.cpp
+++ b/src/devices/bus/abcbus/sio.cpp
@@ -79,7 +79,7 @@ const tiny_rom_entry *abc_sio_device::device_rom_region() const
void abc_sio_device::device_add_mconfig(machine_config &config)
{
Z80CTC(config, m_ctc, XTAL(4'915'200));
- Z80DART(config, m_sio, 0);
+ Z80DART(config, m_sio);
}
@@ -92,7 +92,7 @@ void abc_sio_device::device_add_mconfig(machine_config &config)
// abc_sio_device - constructor
//-------------------------------------------------
-abc_sio_device::abc_sio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+abc_sio_device::abc_sio_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, ABC_SIO, tag, owner, clock),
device_abcbus_card_interface(mconfig, *this),
m_ctc(*this, Z80CTC_TAG),
diff --git a/src/devices/bus/abcbus/sio.h b/src/devices/bus/abcbus/sio.h
index 156939808df..90e9f364666 100644
--- a/src/devices/bus/abcbus/sio.h
+++ b/src/devices/bus/abcbus/sio.h
@@ -22,7 +22,7 @@ class abc_sio_device : public device_t,
{
public:
// construction/destruction
- abc_sio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ abc_sio_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides
diff --git a/src/devices/bus/abcbus/slutprov.cpp b/src/devices/bus/abcbus/slutprov.cpp
index 8ca4bc5934e..79b69ee5863 100644
--- a/src/devices/bus/abcbus/slutprov.cpp
+++ b/src/devices/bus/abcbus/slutprov.cpp
@@ -41,7 +41,7 @@ const tiny_rom_entry *abc_slutprov_device::device_rom_region() const
// abc_slutprov_device - constructor
//-------------------------------------------------
-abc_slutprov_device::abc_slutprov_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+abc_slutprov_device::abc_slutprov_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, ABC_SLUTPROV, tag, owner, clock),
device_abcbus_card_interface(mconfig, *this)
{
diff --git a/src/devices/bus/abcbus/slutprov.h b/src/devices/bus/abcbus/slutprov.h
index 16f6b0e9f79..9eb6319d376 100644
--- a/src/devices/bus/abcbus/slutprov.h
+++ b/src/devices/bus/abcbus/slutprov.h
@@ -20,7 +20,7 @@ class abc_slutprov_device : public device_t,
{
public:
// construction/destruction
- abc_slutprov_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ abc_slutprov_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/abcbus/ssa.cpp b/src/devices/bus/abcbus/ssa.cpp
index c17c2e2a826..e8e79c84822 100644
--- a/src/devices/bus/abcbus/ssa.cpp
+++ b/src/devices/bus/abcbus/ssa.cpp
@@ -113,7 +113,7 @@ const tiny_rom_entry *abc_super_smartaid_device::device_rom_region() const
// abc_super_smartaid_device - constructor
//-------------------------------------------------
-abc_super_smartaid_device::abc_super_smartaid_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+abc_super_smartaid_device::abc_super_smartaid_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, ABC_SUPER_SMARTAID, tag, owner, clock),
device_abcbus_card_interface(mconfig, *this),
device_nvram_interface(mconfig, *this),
diff --git a/src/devices/bus/abcbus/ssa.h b/src/devices/bus/abcbus/ssa.h
index f8f94bd2f93..81cbbdcd3de 100644
--- a/src/devices/bus/abcbus/ssa.h
+++ b/src/devices/bus/abcbus/ssa.h
@@ -27,7 +27,7 @@ class abc_super_smartaid_device : public device_t,
{
public:
// construction/destruction
- abc_super_smartaid_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ abc_super_smartaid_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;
diff --git a/src/devices/bus/abcbus/uni800.cpp b/src/devices/bus/abcbus/uni800.cpp
index 2b38faac748..aa54f6ee2d6 100644
--- a/src/devices/bus/abcbus/uni800.cpp
+++ b/src/devices/bus/abcbus/uni800.cpp
@@ -72,7 +72,7 @@ const tiny_rom_entry *abc_uni800_device::device_rom_region() const
// abc_uni800_device - constructor
//-------------------------------------------------
-abc_uni800_device::abc_uni800_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+abc_uni800_device::abc_uni800_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, ABC_UNI800, tag, owner, clock),
device_abcbus_card_interface(mconfig, *this)
{
diff --git a/src/devices/bus/abcbus/uni800.h b/src/devices/bus/abcbus/uni800.h
index c6eb9400d40..8d8c341a6d4 100644
--- a/src/devices/bus/abcbus/uni800.h
+++ b/src/devices/bus/abcbus/uni800.h
@@ -20,7 +20,7 @@ class abc_uni800_device : public device_t,
{
public:
// construction/destruction
- abc_uni800_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ abc_uni800_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/abcbus/unidisk.cpp b/src/devices/bus/abcbus/unidisk.cpp
index 4661bc1fc03..57a429e51aa 100644
--- a/src/devices/bus/abcbus/unidisk.cpp
+++ b/src/devices/bus/abcbus/unidisk.cpp
@@ -75,7 +75,7 @@ void abc_unidisk_device::unidisk_io(address_map &map)
void abc_unidisk_device::device_add_mconfig(machine_config &config)
{
- TMS9995(config, m_maincpu, 12000000);
+ TMS9995(config, m_maincpu, XTAL::u(12000000));
m_maincpu->set_addrmap(AS_PROGRAM, &abc_unidisk_device::unidisk_mem);
m_maincpu->set_addrmap(AS_IO, &abc_unidisk_device::unidisk_io);
}
@@ -108,7 +108,7 @@ ioport_constructor abc_unidisk_device::device_input_ports() const
// abc_unidisk_device - constructor
//-------------------------------------------------
-abc_unidisk_device::abc_unidisk_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+abc_unidisk_device::abc_unidisk_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, ABC_UNIDISK, tag, owner, clock),
device_abcbus_card_interface(mconfig, *this),
m_maincpu(*this, TMS9995_TAG)
diff --git a/src/devices/bus/abcbus/unidisk.h b/src/devices/bus/abcbus/unidisk.h
index 6d95e34208e..54d365e11e9 100644
--- a/src/devices/bus/abcbus/unidisk.h
+++ b/src/devices/bus/abcbus/unidisk.h
@@ -27,7 +27,7 @@ class abc_unidisk_device : public device_t,
{
public:
// construction/destruction
- abc_unidisk_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ abc_unidisk_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
protected:
// device-level overrides