summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/hp80_io
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/hp80_io')
-rw-r--r--src/devices/bus/hp80_io/82900.cpp4
-rw-r--r--src/devices/bus/hp80_io/82900.h2
-rw-r--r--src/devices/bus/hp80_io/82937.cpp10
-rw-r--r--src/devices/bus/hp80_io/82937.h2
-rw-r--r--src/devices/bus/hp80_io/82939.cpp4
-rw-r--r--src/devices/bus/hp80_io/82939.h2
-rw-r--r--src/devices/bus/hp80_io/hp80_io.cpp6
-rw-r--r--src/devices/bus/hp80_io/hp80_io.h11
8 files changed, 18 insertions, 23 deletions
diff --git a/src/devices/bus/hp80_io/82900.cpp b/src/devices/bus/hp80_io/82900.cpp
index 72b9c08c092..b8b2a5ac3fa 100644
--- a/src/devices/bus/hp80_io/82900.cpp
+++ b/src/devices/bus/hp80_io/82900.cpp
@@ -28,7 +28,7 @@ namespace {
}
}
-hp82900_io_card_device::hp82900_io_card_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+hp82900_io_card_device::hp82900_io_card_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig , HP82900_IO_CARD , tag , owner , clock),
device_hp80_io_interface(mconfig, *this),
m_cpu(*this , "cpu"),
@@ -163,7 +163,7 @@ void hp82900_io_card_device::device_add_mconfig(machine_config &config)
m_cpu->set_addrmap(AS_IO , &hp82900_io_card_device::cpu_io_map);
m_cpu->refresh_cb().set(FUNC(hp82900_io_card_device::z80_m1_w));
- HP_1MB5(config, m_translator, 0);
+ HP_1MB5(config, m_translator);
m_translator->irl_handler().set(FUNC(hp82900_io_card_device::irl_w));
m_translator->halt_handler().set(FUNC(hp82900_io_card_device::halt_w));
m_translator->reset_handler().set(FUNC(hp82900_io_card_device::reset_w));
diff --git a/src/devices/bus/hp80_io/82900.h b/src/devices/bus/hp80_io/82900.h
index 613783cbc3f..b233de376b6 100644
--- a/src/devices/bus/hp80_io/82900.h
+++ b/src/devices/bus/hp80_io/82900.h
@@ -21,7 +21,7 @@ class hp82900_io_card_device : public device_t, public device_hp80_io_interface
{
public:
// construction/destruction
- hp82900_io_card_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ hp82900_io_card_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
virtual ~hp82900_io_card_device();
protected:
diff --git a/src/devices/bus/hp80_io/82937.cpp b/src/devices/bus/hp80_io/82937.cpp
index 24fae1d68c6..8ef6ee169e2 100644
--- a/src/devices/bus/hp80_io/82937.cpp
+++ b/src/devices/bus/hp80_io/82937.cpp
@@ -54,7 +54,7 @@ constexpr unsigned P1_DAV_BIT = 2;
constexpr unsigned P1_NDAC_BIT = 1;
constexpr unsigned P1_NRFD_BIT = 0;
-hp82937_io_card_device::hp82937_io_card_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+hp82937_io_card_device::hp82937_io_card_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig , HP82937_IO_CARD , tag , owner , clock),
device_hp80_io_interface(mconfig, *this),
m_cpu(*this , "cpu"),
@@ -337,17 +337,17 @@ void hp82937_io_card_device::device_add_mconfig(machine_config &config)
m_cpu->p2_in_cb().set(FUNC(hp82937_io_card_device::dio_r));
m_cpu->p2_out_cb().set(FUNC(hp82937_io_card_device::dio_w));
- HP_1MB5(config, m_translator, 0);
+ HP_1MB5(config, m_translator);
m_translator->irl_handler().set(FUNC(hp82937_io_card_device::irl_w));
m_translator->halt_handler().set(FUNC(hp82937_io_card_device::halt_w));
m_translator->reset_handler().set(FUNC(hp82937_io_card_device::reset_w));
- ieee488_slot_device &ieee_dev(IEEE488_SLOT(config, "ieee_dev", 0));
+ ieee488_slot_device &ieee_dev(IEEE488_SLOT(config, "ieee_dev"));
hp_ieee488_devices(ieee_dev);
- ieee488_slot_device &ieee_rem(IEEE488_SLOT(config, "ieee_rem", 0));
+ ieee488_slot_device &ieee_rem(IEEE488_SLOT(config, "ieee_rem"));
remote488_devices(ieee_rem);
- IEEE488(config, m_ieee488, 0);
+ IEEE488(config, m_ieee488);
m_ieee488->ifc_callback().set(FUNC(hp82937_io_card_device::ieee488_ctrl_w));
m_ieee488->atn_callback().set(FUNC(hp82937_io_card_device::ieee488_ctrl_w));
m_ieee488->ren_callback().set(FUNC(hp82937_io_card_device::ieee488_ctrl_w));
diff --git a/src/devices/bus/hp80_io/82937.h b/src/devices/bus/hp80_io/82937.h
index 07f3dec991a..f926c4321f1 100644
--- a/src/devices/bus/hp80_io/82937.h
+++ b/src/devices/bus/hp80_io/82937.h
@@ -22,7 +22,7 @@ class hp82937_io_card_device : public device_t, public device_hp80_io_interface
{
public:
// construction/destruction
- hp82937_io_card_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ hp82937_io_card_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
virtual ~hp82937_io_card_device();
protected:
diff --git a/src/devices/bus/hp80_io/82939.cpp b/src/devices/bus/hp80_io/82939.cpp
index 4649758f753..ad93da3017a 100644
--- a/src/devices/bus/hp80_io/82939.cpp
+++ b/src/devices/bus/hp80_io/82939.cpp
@@ -34,7 +34,7 @@ namespace {
}
}
-hp82939_io_card_device::hp82939_io_card_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+hp82939_io_card_device::hp82939_io_card_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig , HP82939_IO_CARD , tag , owner , clock),
device_hp80_io_interface(mconfig, *this),
m_cpu(*this , "cpu"),
@@ -203,7 +203,7 @@ void hp82939_io_card_device::device_add_mconfig(machine_config &config)
m_cpu->p1_out_cb().set(FUNC(hp82939_io_card_device::p1_w));
m_cpu->p2_in_cb().set(FUNC(hp82939_io_card_device::p2_r));
- HP_1MB5(config, m_translator, 0);
+ HP_1MB5(config, m_translator);
m_translator->irl_handler().set(FUNC(hp82939_io_card_device::irl_w));
m_translator->halt_handler().set(FUNC(hp82939_io_card_device::halt_w));
m_translator->reset_handler().set_inputline(m_cpu , INPUT_LINE_RESET);
diff --git a/src/devices/bus/hp80_io/82939.h b/src/devices/bus/hp80_io/82939.h
index fb9e07dd3ec..43879059257 100644
--- a/src/devices/bus/hp80_io/82939.h
+++ b/src/devices/bus/hp80_io/82939.h
@@ -23,7 +23,7 @@ class hp82939_io_card_device : public device_t, public device_hp80_io_interface
{
public:
// construction/destruction
- hp82939_io_card_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ hp82939_io_card_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
virtual ~hp82939_io_card_device();
protected:
diff --git a/src/devices/bus/hp80_io/hp80_io.cpp b/src/devices/bus/hp80_io/hp80_io.cpp
index 591435bafac..f6ed74c9da1 100644
--- a/src/devices/bus/hp80_io/hp80_io.cpp
+++ b/src/devices/bus/hp80_io/hp80_io.cpp
@@ -21,13 +21,17 @@ DEFINE_DEVICE_TYPE(HP80_IO_SLOT, hp80_io_slot_device, "hp80_io_slot", "HP80 I/O
// +-------------------+
// |hp80_io_slot_device|
// +-------------------+
-hp80_io_slot_device::hp80_io_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+hp80_io_slot_device::hp80_io_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, HP80_IO_SLOT, tag, owner, clock),
device_single_card_slot_interface<device_hp80_io_interface>(mconfig, *this),
m_irl_cb_func(*this),
m_halt_cb_func(*this),
m_slot_no(0)
{
+ option_reset();
+ hp80_io_slot_devices(*this);
+ set_default_option(nullptr);
+ set_fixed(false);
}
hp80_io_slot_device::~hp80_io_slot_device()
diff --git a/src/devices/bus/hp80_io/hp80_io.h b/src/devices/bus/hp80_io/hp80_io.h
index 3963d56d29e..86f00677b58 100644
--- a/src/devices/bus/hp80_io/hp80_io.h
+++ b/src/devices/bus/hp80_io/hp80_io.h
@@ -36,16 +36,7 @@ class hp80_io_slot_device : public device_t,
{
public:
// construction/destruction
- hp80_io_slot_device(machine_config const &mconfig, char const *tag, device_t *owner)
- : hp80_io_slot_device(mconfig, tag, owner, (uint32_t)0)
- {
- option_reset();
- hp80_io_slot_devices(*this);
- set_default_option(nullptr);
- set_fixed(false);
- }
-
- hp80_io_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ hp80_io_slot_device(machine_config const &mconfig, char const *tag, device_t *owner, const XTAL &clock = XTAL());
virtual ~hp80_io_slot_device();
// configuration helpers