summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/mackbd
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/mackbd
parent5c14bcdfcb4aefb71b5b62387c4ad05dbeb3814e (diff)
full xtal conversionxtal
Diffstat (limited to 'src/devices/bus/mackbd')
-rw-r--r--src/devices/bus/mackbd/keyboard.cpp20
-rw-r--r--src/devices/bus/mackbd/mackbd.cpp2
-rw-r--r--src/devices/bus/mackbd/mackbd.h4
-rw-r--r--src/devices/bus/mackbd/pluskbd.cpp8
4 files changed, 17 insertions, 17 deletions
diff --git a/src/devices/bus/mackbd/keyboard.cpp b/src/devices/bus/mackbd/keyboard.cpp
index bda86980a05..8186b13dec6 100644
--- a/src/devices/bus/mackbd/keyboard.cpp
+++ b/src/devices/bus/mackbd/keyboard.cpp
@@ -256,7 +256,7 @@ public:
}
protected:
- peripheral_base(machine_config const &mconfig, device_type type, char const *tag, device_t *owner, u32 clock)
+ peripheral_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_mac_keyboard_interface(mconfig, *this)
, m_mpu{ *this, "mpu" }
@@ -271,7 +271,7 @@ protected:
virtual void device_add_mconfig(machine_config &config) override
{
- I8021(config, m_mpu, 3'000'000); // 100µH inductor gives approximately 3MHz
+ I8021(config, m_mpu, XTAL::u(3'000'000)); // 100µH inductor gives approximately 3MHz
m_mpu->p0_out_cb().set(FUNC(peripheral_base::host_clock_w)).bit(7);
m_mpu->p2_out_cb().set(FUNC(peripheral_base::host_data_w)).bit(0);
}
@@ -383,7 +383,7 @@ private:
class keyboard_base : public peripheral_base<9>
{
protected:
- keyboard_base(machine_config const &mconfig, device_type type, char const *tag, device_t *owner, u32 clock)
+ keyboard_base(machine_config const &mconfig, device_type type, char const *tag, device_t *owner, const XTAL &clock)
: peripheral_base<9>(mconfig, type, tag, owner, clock)
{
}
@@ -416,7 +416,7 @@ public:
}
protected:
- keypad_base(machine_config const &mconfig, device_type type, char const *tag, device_t *owner, u32 clock)
+ keypad_base(machine_config const &mconfig, device_type type, char const *tag, device_t *owner, const XTAL &clock)
: peripheral_base<3>(mconfig, type, tag, owner, clock)
, m_keyboard_port(*this, "kbd")
{
@@ -722,7 +722,7 @@ INPUT_PORTS_END
class m0110_device : public keyboard_base
{
public:
- m0110_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+ m0110_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: keyboard_base(mconfig, MACKBD_M0110, tag, owner, clock)
{
}
@@ -737,7 +737,7 @@ protected:
class m0110b_device : public keyboard_base
{
public:
- m0110b_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+ m0110b_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: keyboard_base(mconfig, MACKBD_M0110B, tag, owner, clock)
{
}
@@ -754,7 +754,7 @@ protected:
class m0110f_device : public keyboard_base
{
public:
- m0110f_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+ m0110f_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: keyboard_base(mconfig, MACKBD_M0110F, tag, owner, clock)
{
}
@@ -771,7 +771,7 @@ protected:
class m0110t_device : public keyboard_base
{
public:
- m0110t_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+ m0110t_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: keyboard_base(mconfig, MACKBD_M0110T, tag, owner, clock)
{
}
@@ -840,7 +840,7 @@ INPUT_PORTS_END
class m0120_device : public keypad_base
{
public:
- m0120_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+ m0120_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: keypad_base(mconfig, MACKBD_M0120, tag, owner, clock)
{
}
@@ -857,7 +857,7 @@ protected:
class m0120p_device : public keypad_base
{
public:
- m0120p_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+ m0120p_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: keypad_base(mconfig, MACKBD_M0120P, tag, owner, clock)
{
}
diff --git a/src/devices/bus/mackbd/mackbd.cpp b/src/devices/bus/mackbd/mackbd.cpp
index 0e13787c9cf..853fbac9a6d 100644
--- a/src/devices/bus/mackbd/mackbd.cpp
+++ b/src/devices/bus/mackbd/mackbd.cpp
@@ -99,7 +99,7 @@ DEFINE_DEVICE_TYPE(MAC_KEYBOARD_PORT, mac_keyboard_port_device, "mackbd_port", "
// HOST PORT
//**************************************************************************
-mac_keyboard_port_device::mac_keyboard_port_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+mac_keyboard_port_device::mac_keyboard_port_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, MAC_KEYBOARD_PORT, tag, owner, clock)
, device_single_card_slot_interface<device_mac_keyboard_interface>(mconfig, *this)
, m_clock_cb{ *this }
diff --git a/src/devices/bus/mackbd/mackbd.h b/src/devices/bus/mackbd/mackbd.h
index 29be2d6e4ea..f436cca402d 100644
--- a/src/devices/bus/mackbd/mackbd.h
+++ b/src/devices/bus/mackbd/mackbd.h
@@ -33,14 +33,14 @@ class mac_keyboard_port_device : public device_t, public device_single_card_slot
public:
template <typename T>
mac_keyboard_port_device(machine_config const &mconfig, char const *tag, device_t *owner, T &&opts, char const *dflt)
- : mac_keyboard_port_device(mconfig, tag, owner, 0U)
+ : mac_keyboard_port_device(mconfig, tag, owner)
{
option_reset();
opts(*this);
set_default_option(dflt);
set_fixed(false);
}
- mac_keyboard_port_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock = 0U);
+ mac_keyboard_port_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock = XTAL());
virtual ~mac_keyboard_port_device() override;
auto clock_cb() { return m_clock_cb.bind(); }
diff --git a/src/devices/bus/mackbd/pluskbd.cpp b/src/devices/bus/mackbd/pluskbd.cpp
index de744f9219b..a477b1b3205 100644
--- a/src/devices/bus/mackbd/pluskbd.cpp
+++ b/src/devices/bus/mackbd/pluskbd.cpp
@@ -114,7 +114,7 @@ public:
}
protected:
- keyboard_base(machine_config const &mconfig, device_type type, char const *tag, device_t *owner, u32 clock)
+ 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_mac_keyboard_interface(mconfig, *this)
, m_mpu{ *this, "mpu" }
@@ -455,7 +455,7 @@ INPUT_PORTS_END
class m0110a_device : public keyboard_base
{
public:
- m0110a_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+ m0110a_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: keyboard_base(mconfig, MACKBD_M0110A, tag, owner, clock)
{
}
@@ -470,7 +470,7 @@ protected:
class m0110a_f_device : public keyboard_base
{
public:
- m0110a_f_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+ m0110a_f_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: keyboard_base(mconfig, MACKBD_M0110A_F, tag, owner, clock)
{
}
@@ -487,7 +487,7 @@ protected:
class m0110a_j_device : public keyboard_base
{
public:
- m0110a_j_device(machine_config const &mconfig, char const *tag, device_t *owner, u32 clock)
+ m0110a_j_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock)
: keyboard_base(mconfig, MACKBD_M0110A_J, tag, owner, clock)
{
}