summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/ss50
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/ss50')
-rw-r--r--src/devices/bus/ss50/dc5.cpp4
-rw-r--r--src/devices/bus/ss50/interface.cpp2
-rw-r--r--src/devices/bus/ss50/interface.h4
-rw-r--r--src/devices/bus/ss50/mpc.cpp4
-rw-r--r--src/devices/bus/ss50/mps.cpp4
-rw-r--r--src/devices/bus/ss50/mps2.cpp6
-rw-r--r--src/devices/bus/ss50/mpt.cpp4
-rw-r--r--src/devices/bus/ss50/piaide.cpp4
8 files changed, 16 insertions, 16 deletions
diff --git a/src/devices/bus/ss50/dc5.cpp b/src/devices/bus/ss50/dc5.cpp
index d3c105bc2a8..16c574ca3b7 100644
--- a/src/devices/bus/ss50/dc5.cpp
+++ b/src/devices/bus/ss50/dc5.cpp
@@ -40,7 +40,7 @@
class ss50_dc5_device : public device_t, public ss50_card_interface
{
public:
- ss50_dc5_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+ ss50_dc5_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, SS50_DC5, tag, owner, clock)
, ss50_card_interface(mconfig, *this)
, m_fdc(*this, "fdc")
@@ -786,7 +786,7 @@ void ss50_dc5_device::register_write(offs_t offset, uint8_t data)
uint32_t expected_clock_div = m_expected_clock->read();
if (expected_clock_div && clock_div != expected_clock_div)
{
- logerror("%s Unexpected clock rate of %dHz expected %dHz.\n", machine().describe_context(), 12'000'000 / clock_div, 12'000'000 / expected_clock_div);
+ logerror("%s Unexpected clock rate of %dHz expected %dHz.\n", machine().describe_context(), XTAL::u(12'000'000) / clock_div, 12'000'000 / expected_clock_div);
clock_div = expected_clock_div;
}
diff --git a/src/devices/bus/ss50/interface.cpp b/src/devices/bus/ss50/interface.cpp
index a3100585a76..123bdeb32c2 100644
--- a/src/devices/bus/ss50/interface.cpp
+++ b/src/devices/bus/ss50/interface.cpp
@@ -103,7 +103,7 @@ DEFINE_DEVICE_TYPE(SS50_INTERFACE, ss50_interface_port_device, "ss50_interface",
// ss50_interface_port_device - construction
//-------------------------------------------------
-ss50_interface_port_device::ss50_interface_port_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock) :
+ss50_interface_port_device::ss50_interface_port_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, SS50_INTERFACE, tag, owner, clock),
device_single_card_slot_interface<ss50_card_interface>(mconfig, *this),
m_irq_cb(*this),
diff --git a/src/devices/bus/ss50/interface.h b/src/devices/bus/ss50/interface.h
index 28e8f82c8c9..79e209f51cc 100644
--- a/src/devices/bus/ss50/interface.h
+++ b/src/devices/bus/ss50/interface.h
@@ -29,7 +29,7 @@ public:
// construction/destruction
template <typename T>
ss50_interface_port_device(machine_config const &mconfig, char const *tag, device_t *owner, T &&opts, char const *dflt)
- : ss50_interface_port_device(mconfig, tag, owner, 0)
+ : ss50_interface_port_device(mconfig, tag, owner)
{
option_reset();
opts(*this);
@@ -37,7 +37,7 @@ public:
set_fixed(false);
}
- ss50_interface_port_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock = 0);
+ ss50_interface_port_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL());
// static configuration
auto irq_cb() { return m_irq_cb.bind(); }
diff --git a/src/devices/bus/ss50/mpc.cpp b/src/devices/bus/ss50/mpc.cpp
index 99c476684b3..dbea6e692b4 100644
--- a/src/devices/bus/ss50/mpc.cpp
+++ b/src/devices/bus/ss50/mpc.cpp
@@ -24,7 +24,7 @@ class ss50_mpc_device : public device_t, public ss50_card_interface
{
public:
// construction/destruction
- ss50_mpc_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+ ss50_mpc_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, SS50_MPC, tag, owner, clock)
, ss50_card_interface(mconfig, *this)
, m_pia(*this, "pia")
@@ -101,7 +101,7 @@ DEVICE_INPUT_DEFAULTS_END
void ss50_mpc_device::device_add_mconfig(machine_config &config)
{
- PIA6821(config, m_pia, 0); // actually MC6820
+ PIA6821(config, m_pia); // actually MC6820
m_pia->writepa_handler().set("outgate", FUNC(input_merger_device::in_w<0>)).bit(0);
m_pia->cb2_handler().set(FUNC(ss50_mpc_device::reader_control_w));
m_pia->readpb_handler().set_ioport("STOP").mask(0x01).lshift(6);
diff --git a/src/devices/bus/ss50/mps.cpp b/src/devices/bus/ss50/mps.cpp
index b79d1dddbc0..3220ae97ec6 100644
--- a/src/devices/bus/ss50/mps.cpp
+++ b/src/devices/bus/ss50/mps.cpp
@@ -22,7 +22,7 @@ class ss50_mps_device : public device_t, public ss50_card_interface
{
public:
// construction/destruction
- ss50_mps_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+ ss50_mps_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, SS50_MPS, tag, owner, clock)
, ss50_card_interface(mconfig, *this)
, m_acia(*this, "acia")
@@ -109,7 +109,7 @@ DEVICE_INPUT_DEFAULTS_END
void ss50_mps_device::device_add_mconfig(machine_config &config)
{
- ACIA6850(config, m_acia, 0);
+ ACIA6850(config, m_acia);
m_acia->txd_handler().set("rs232", FUNC(rs232_port_device::write_txd));
//m_acia->rts_handler().set(FUNC(ss50_mps_device::reader_control_w));
m_acia->irq_handler().set(FUNC(ss50_mps_device::acia_irq_w));
diff --git a/src/devices/bus/ss50/mps2.cpp b/src/devices/bus/ss50/mps2.cpp
index f0d9350bfb8..28bce3c6b4c 100644
--- a/src/devices/bus/ss50/mps2.cpp
+++ b/src/devices/bus/ss50/mps2.cpp
@@ -24,7 +24,7 @@ class ss50_mps2_device : public device_t, public ss50_card_interface
{
public:
// construction/destruction
- ss50_mps2_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+ ss50_mps2_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, SS50_MPS2, tag, owner, clock)
, ss50_card_interface(mconfig, *this)
, m_acia_upper(*this, "acia_upper")
@@ -130,7 +130,7 @@ DEVICE_INPUT_DEFAULTS_END
void ss50_mps2_device::device_add_mconfig(machine_config &config)
{
- ACIA6850(config, m_acia_upper, 0);
+ ACIA6850(config, m_acia_upper);
m_acia_upper->txd_handler().set("rs232_upper", FUNC(rs232_port_device::write_txd));
m_acia_upper->rts_handler().set("rs232_upper", FUNC(rs232_port_device::write_rts));
m_acia_upper->irq_handler().set("irq", FUNC(input_merger_device::in_w<0>));
@@ -141,7 +141,7 @@ void ss50_mps2_device::device_add_mconfig(machine_config &config)
rs232_upper.dcd_handler().set(m_acia_upper, FUNC(acia6850_device::write_dcd));
rs232_upper.set_option_device_input_defaults("terminal", DEVICE_INPUT_DEFAULTS_NAME(terminal_upper));
- ACIA6850(config, m_acia_lower, 0);
+ ACIA6850(config, m_acia_lower);
m_acia_lower->txd_handler().set("rs232_lower", FUNC(rs232_port_device::write_txd));
m_acia_lower->rts_handler().set("rs232_lower", FUNC(rs232_port_device::write_rts));
m_acia_lower->irq_handler().set("irq", FUNC(input_merger_device::in_w<1>));
diff --git a/src/devices/bus/ss50/mpt.cpp b/src/devices/bus/ss50/mpt.cpp
index f9078aee4ac..3513856336e 100644
--- a/src/devices/bus/ss50/mpt.cpp
+++ b/src/devices/bus/ss50/mpt.cpp
@@ -17,7 +17,7 @@
class ss50_mpt_device : public device_t, public ss50_card_interface
{
public:
- ss50_mpt_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+ ss50_mpt_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, SS50_MPT, tag, owner, clock)
, ss50_card_interface(mconfig, *this)
, m_pia(*this, "pia")
@@ -80,7 +80,7 @@ ioport_constructor ss50_mpt_device::device_input_ports() const
void ss50_mpt_device::device_add_mconfig(machine_config &config)
{
- PIA6821(config, m_pia, 0);
+ PIA6821(config, m_pia);
m_pia->writepb_handler().set(FUNC(ss50_mpt_device::pia_b_w));
m_pia->cb1_w(0);
m_pia->irqa_handler().set(FUNC(ss50_mpt_device::pia_irqa_w));
diff --git a/src/devices/bus/ss50/piaide.cpp b/src/devices/bus/ss50/piaide.cpp
index a8ac76efdf6..b7e62c8dd97 100644
--- a/src/devices/bus/ss50/piaide.cpp
+++ b/src/devices/bus/ss50/piaide.cpp
@@ -49,7 +49,7 @@ class ss50_piaide_device : public device_t, public ss50_card_interface
{
public:
// construction/destruction
- ss50_piaide_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock)
+ ss50_piaide_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, SS50_PIAIDE, tag, owner, clock)
, ss50_card_interface(mconfig, *this)
, m_pia(*this, "pia")
@@ -93,7 +93,7 @@ void ss50_piaide_device::device_start()
void ss50_piaide_device::device_add_mconfig(machine_config &config)
{
- PIA6821(config, m_pia, 0);
+ PIA6821(config, m_pia);
m_pia->readpa_handler().set(FUNC(ss50_piaide_device::pia_a_r));
m_pia->readpb_handler().set(FUNC(ss50_piaide_device::pia_b_r));
m_pia->writepa_handler().set(FUNC(ss50_piaide_device::pia_a_w));