summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/hp9845_io
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/hp9845_io')
-rw-r--r--src/devices/bus/hp9845_io/98032.cpp6
-rw-r--r--src/devices/bus/hp9845_io/98032.h6
-rw-r--r--src/devices/bus/hp9845_io/98034.cpp4
-rw-r--r--src/devices/bus/hp9845_io/98034.h2
-rw-r--r--src/devices/bus/hp9845_io/98035.cpp2
-rw-r--r--src/devices/bus/hp9845_io/98035.h2
-rw-r--r--src/devices/bus/hp9845_io/98036.cpp4
-rw-r--r--src/devices/bus/hp9845_io/98036.h2
-rw-r--r--src/devices/bus/hp9845_io/98046.cpp2
-rw-r--r--src/devices/bus/hp9845_io/98046.h2
-rw-r--r--src/devices/bus/hp9845_io/hp9845_io.cpp2
-rw-r--r--src/devices/bus/hp9845_io/hp9845_io.h2
-rw-r--r--src/devices/bus/hp9845_io/hp9885.cpp2
-rw-r--r--src/devices/bus/hp9845_io/hp9885.h2
14 files changed, 20 insertions, 20 deletions
diff --git a/src/devices/bus/hp9845_io/98032.cpp b/src/devices/bus/hp9845_io/98032.cpp
index ecfc92ba706..d12fe1be8fd 100644
--- a/src/devices/bus/hp9845_io/98032.cpp
+++ b/src/devices/bus/hp9845_io/98032.cpp
@@ -46,7 +46,7 @@ DEFINE_DEVICE_TYPE(HP98032_GPIO_LOOPBACK , hp98032_gpio_loopback_device , "hp980
// |hp98032_io_card_device|
// +----------------------+
-hp98032_io_card_device::hp98032_io_card_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+hp98032_io_card_device::hp98032_io_card_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, HP98032_IO_CARD, tag, owner, clock)
, device_hp9845_io_interface(mconfig, *this)
, m_gpio(*this, "gpio")
@@ -347,7 +347,7 @@ void hp98032_io_card_device::latch_input_LSB()
// |hp98032_gpio_slot_device|
// +------------------------+
-hp98032_gpio_slot_device::hp98032_gpio_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+hp98032_gpio_slot_device::hp98032_gpio_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig , HP98032_GPIO_SLOT , tag , owner , clock)
, device_single_card_slot_interface<device_hp98032_gpio_interface>(mconfig , *this)
, m_pflg_handler(*this)
@@ -502,7 +502,7 @@ WRITE_LINE_MEMBER(device_hp98032_gpio_interface::eir_w)
// |hp98032_gpio_loopback_device|
// +----------------------------+
-hp98032_gpio_loopback_device::hp98032_gpio_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+hp98032_gpio_loopback_device::hp98032_gpio_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, HP98032_GPIO_LOOPBACK, tag, owner, clock)
, device_hp98032_gpio_interface(mconfig, *this)
{
diff --git a/src/devices/bus/hp9845_io/98032.h b/src/devices/bus/hp9845_io/98032.h
index 059b0248ae9..1d1ab475222 100644
--- a/src/devices/bus/hp9845_io/98032.h
+++ b/src/devices/bus/hp9845_io/98032.h
@@ -22,7 +22,7 @@ class hp98032_io_card_device : public device_t, public device_hp9845_io_interfac
{
public:
// construction/destruction
- hp98032_io_card_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ hp98032_io_card_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
virtual ~hp98032_io_card_device();
protected:
@@ -67,7 +67,7 @@ class hp98032_gpio_slot_device : public device_t,
{
public:
// construction/destruction
- hp98032_gpio_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ hp98032_gpio_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
virtual ~hp98032_gpio_slot_device();
// Bits in jumper configuration
@@ -163,7 +163,7 @@ class hp98032_gpio_loopback_device : public device_t, public device_hp98032_gpio
{
public:
// construction/destruction
- hp98032_gpio_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ hp98032_gpio_loopback_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
virtual ~hp98032_gpio_loopback_device();
virtual uint16_t get_jumpers() const override;
diff --git a/src/devices/bus/hp9845_io/98034.cpp b/src/devices/bus/hp9845_io/98034.cpp
index 988d8e47705..b35eaac9659 100644
--- a/src/devices/bus/hp9845_io/98034.cpp
+++ b/src/devices/bus/hp9845_io/98034.cpp
@@ -27,7 +27,7 @@
#define BIT_CLR(w , n) ((w) &= ~BIT_MASK(n))
#define BIT_SET(w , n) ((w) |= BIT_MASK(n))
-hp98034_io_card_device::hp98034_io_card_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+hp98034_io_card_device::hp98034_io_card_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig , HP98034_IO_CARD , tag , owner , clock),
device_hp9845_io_interface(mconfig, *this),
m_cpu(*this , "np"),
@@ -394,7 +394,7 @@ void hp98034_io_card_device::device_add_mconfig(machine_config &config)
// Clock for NP is generated by a RC oscillator. Manual says its typical frequency
// is around 2 MHz. A quick simulation of the oscillator gives the following data though:
// 2.5 MHz frequency, 33% duty cycle.
- HP_NANOPROCESSOR(config, m_cpu, 2500000);
+ HP_NANOPROCESSOR(config, m_cpu, XTAL::u(2500000));
m_cpu->set_addrmap(AS_PROGRAM, &hp98034_io_card_device::np_program_map);
m_cpu->set_addrmap(AS_IO, &hp98034_io_card_device::np_io_map);
m_cpu->dc_changed().set(FUNC(hp98034_io_card_device::dc_w));
diff --git a/src/devices/bus/hp9845_io/98034.h b/src/devices/bus/hp9845_io/98034.h
index c8cb5ff8765..cadffcc1bda 100644
--- a/src/devices/bus/hp9845_io/98034.h
+++ b/src/devices/bus/hp9845_io/98034.h
@@ -21,7 +21,7 @@ class hp98034_io_card_device : public device_t, public device_hp9845_io_interfac
{
public:
// construction/destruction
- hp98034_io_card_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ hp98034_io_card_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
virtual ~hp98034_io_card_device();
protected:
diff --git a/src/devices/bus/hp9845_io/98035.cpp b/src/devices/bus/hp9845_io/98035.cpp
index 79017edd4c2..0e19d5e0c71 100644
--- a/src/devices/bus/hp9845_io/98035.cpp
+++ b/src/devices/bus/hp9845_io/98035.cpp
@@ -142,7 +142,7 @@ static const uint8_t dec_2_seven_segs[] = {
0xc8 // 9
};
-hp98035_io_card_device::hp98035_io_card_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+hp98035_io_card_device::hp98035_io_card_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig , HP98035_IO_CARD , tag , owner , clock),
device_hp9845_io_interface(mconfig, *this),
device_rtc_interface(mconfig , *this),
diff --git a/src/devices/bus/hp9845_io/98035.h b/src/devices/bus/hp9845_io/98035.h
index f92e1734047..2833661d74b 100644
--- a/src/devices/bus/hp9845_io/98035.h
+++ b/src/devices/bus/hp9845_io/98035.h
@@ -21,7 +21,7 @@ class hp98035_io_card_device : public device_t, public device_hp9845_io_interfac
{
public:
// construction/destruction
- hp98035_io_card_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ hp98035_io_card_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
virtual ~hp98035_io_card_device();
protected:
diff --git a/src/devices/bus/hp9845_io/98036.cpp b/src/devices/bus/hp9845_io/98036.cpp
index 6f328062152..c67c406f157 100644
--- a/src/devices/bus/hp9845_io/98036.cpp
+++ b/src/devices/bus/hp9845_io/98036.cpp
@@ -34,7 +34,7 @@ namespace {
// device type definitions
DEFINE_DEVICE_TYPE(HP98036_IO_CARD, hp98036_io_card_device, "hp98036", "HP98036 card")
-hp98036_io_card_device::hp98036_io_card_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+hp98036_io_card_device::hp98036_io_card_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, HP98036_IO_CARD, tag, owner, clock)
, device_hp9845_io_interface(mconfig, *this)
, m_uart(*this, "uart")
@@ -159,7 +159,7 @@ void hp98036_io_card_device::reg_w(address_space &space, offs_t offset, uint16_t
void hp98036_io_card_device::device_add_mconfig(machine_config &config)
{
- I8251(config, m_uart, 0);
+ I8251(config, m_uart);
m_uart->txd_handler().set(FUNC(hp98036_io_card_device::txd_w));
m_uart->dtr_handler().set(FUNC(hp98036_io_card_device::dtr_w));
m_uart->rts_handler().set(FUNC(hp98036_io_card_device::rts_w));
diff --git a/src/devices/bus/hp9845_io/98036.h b/src/devices/bus/hp9845_io/98036.h
index c1ee6b351bd..4f97e622fee 100644
--- a/src/devices/bus/hp9845_io/98036.h
+++ b/src/devices/bus/hp9845_io/98036.h
@@ -22,7 +22,7 @@ class hp98036_io_card_device : public device_t, public device_hp9845_io_interfac
{
public:
// construction/destruction
- hp98036_io_card_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ hp98036_io_card_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
virtual ~hp98036_io_card_device();
virtual uint16_t reg_r(address_space &space, offs_t offset) override;
diff --git a/src/devices/bus/hp9845_io/98046.cpp b/src/devices/bus/hp9845_io/98046.cpp
index 8b7e601f0f4..a76dd77c5d1 100644
--- a/src/devices/bus/hp9845_io/98046.cpp
+++ b/src/devices/bus/hp9845_io/98046.cpp
@@ -58,7 +58,7 @@ namespace {
// device type definition
DEFINE_DEVICE_TYPE(HP98046_IO_CARD, hp98046_io_card_device , "hp98046" , "HP98046 card")
-hp98046_io_card_device::hp98046_io_card_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+hp98046_io_card_device::hp98046_io_card_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig, HP98046_IO_CARD, tag, owner, clock)
, device_hp9845_io_interface(mconfig, *this)
, m_cpu(*this, "cpu")
diff --git a/src/devices/bus/hp9845_io/98046.h b/src/devices/bus/hp9845_io/98046.h
index 90debbb8c03..d10767a9017 100644
--- a/src/devices/bus/hp9845_io/98046.h
+++ b/src/devices/bus/hp9845_io/98046.h
@@ -23,7 +23,7 @@ class hp98046_io_card_device : public device_t, public device_hp9845_io_interfac
{
public:
// construction/destruction
- hp98046_io_card_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ hp98046_io_card_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
virtual ~hp98046_io_card_device();
virtual uint16_t reg_r(address_space &space, offs_t offset) override;
diff --git a/src/devices/bus/hp9845_io/hp9845_io.cpp b/src/devices/bus/hp9845_io/hp9845_io.cpp
index bf304622f24..2d3f2a45aa6 100644
--- a/src/devices/bus/hp9845_io/hp9845_io.cpp
+++ b/src/devices/bus/hp9845_io/hp9845_io.cpp
@@ -22,7 +22,7 @@ DEFINE_DEVICE_TYPE(HP9845_IO_SLOT, hp9845_io_slot_device, "hp98x5_io_slot", "HP9
// +---------------------+
// |hp9845_io_slot_device|
// +---------------------+
-hp9845_io_slot_device::hp9845_io_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock) :
+hp9845_io_slot_device::hp9845_io_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock) :
device_t(mconfig, HP9845_IO_SLOT, tag, owner, clock),
device_single_card_slot_interface<device_hp9845_io_interface>(mconfig, *this),
m_irq_cb_func(*this),
diff --git a/src/devices/bus/hp9845_io/hp9845_io.h b/src/devices/bus/hp9845_io/hp9845_io.h
index bebe12c3408..0bb7aed5d55 100644
--- a/src/devices/bus/hp9845_io/hp9845_io.h
+++ b/src/devices/bus/hp9845_io/hp9845_io.h
@@ -38,7 +38,7 @@ class hp9845_io_slot_device : public device_t,
{
public:
// construction/destruction
- hp9845_io_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ hp9845_io_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock = XTAL());
virtual ~hp9845_io_slot_device();
// Callback setups
diff --git a/src/devices/bus/hp9845_io/hp9885.cpp b/src/devices/bus/hp9845_io/hp9885.cpp
index 1fadbc54679..07e82d4800d 100644
--- a/src/devices/bus/hp9845_io/hp9885.cpp
+++ b/src/devices/bus/hp9845_io/hp9885.cpp
@@ -224,7 +224,7 @@ enum : unsigned {
ERR_HW_FAILURE = 8
};
-hp9885_device::hp9885_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock)
+hp9885_device::hp9885_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock)
: device_t(mconfig , HP9885 , tag , owner , clock)
, device_hp98032_gpio_interface(mconfig, *this)
, m_drive_connector{*this , "floppy"}
diff --git a/src/devices/bus/hp9845_io/hp9885.h b/src/devices/bus/hp9845_io/hp9885.h
index 1c9af5c3066..99ca3fcd91f 100644
--- a/src/devices/bus/hp9845_io/hp9885.h
+++ b/src/devices/bus/hp9845_io/hp9885.h
@@ -20,7 +20,7 @@
class hp9885_device : public device_t, public device_hp98032_gpio_interface
{
public:
- hp9885_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
+ hp9885_device(const machine_config &mconfig, const char *tag, device_t *owner, const XTAL &clock);
virtual ~hp9885_device();
// hp98032_gpio_card_device overrides