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/interface.cpp10
-rw-r--r--src/devices/bus/ss50/interface.h37
-rw-r--r--src/devices/bus/ss50/mpc.cpp23
-rw-r--r--src/devices/bus/ss50/mps.cpp12
4 files changed, 43 insertions, 39 deletions
diff --git a/src/devices/bus/ss50/interface.cpp b/src/devices/bus/ss50/interface.cpp
index a811c790ef9..b17f54f9c68 100644
--- a/src/devices/bus/ss50/interface.cpp
+++ b/src/devices/bus/ss50/interface.cpp
@@ -139,22 +139,22 @@ void ss50_interface_port_device::device_start()
// read - interface read access (pre-decoded)
//-------------------------------------------------
-u8 ss50_interface_port_device::read(offs_t offset)
+READ8_MEMBER(ss50_interface_port_device::read)
{
if (m_card == nullptr)
{
logerror("%s: Read from unspecified interface (RS = %X)\n", machine().describe_context(), offset);
- return 0xff;
+ return space.unmap();
}
- return m_card->register_read(offset);
+ return m_card->register_read(space, offset);
}
//-------------------------------------------------
// write - interface write access (pre-decoded)
//-------------------------------------------------
-void ss50_interface_port_device::write(offs_t offset, u8 data)
+WRITE8_MEMBER(ss50_interface_port_device::write)
{
if (m_card == nullptr)
{
@@ -162,7 +162,7 @@ void ss50_interface_port_device::write(offs_t offset, u8 data)
return;
}
- m_card->register_write(offset, data);
+ m_card->register_write(space, offset, data);
}
//-------------------------------------------------
diff --git a/src/devices/bus/ss50/interface.h b/src/devices/bus/ss50/interface.h
index 0be5f422c98..1865eda6324 100644
--- a/src/devices/bus/ss50/interface.h
+++ b/src/devices/bus/ss50/interface.h
@@ -11,6 +11,19 @@
#ifndef MAME_DEVICES_BUS_SS50_INTERFACE_H
#define MAME_DEVICES_BUS_SS50_INTERFACE_H
+//**************************************************************************
+// CONFIGURATION MACROS
+//**************************************************************************
+
+#define MCFG_SS50_INTERFACE_PORT_ADD(_tag, _slot_intf, _def_slot) \
+ MCFG_DEVICE_ADD(_tag, SS50_INTERFACE, 0) \
+ MCFG_DEVICE_SLOT_INTERFACE(ss50_##_slot_intf, _def_slot, false)
+
+#define MCFG_SS50_INTERFACE_IRQ_CALLBACK(_devcb) \
+ downcast<ss50_interface_port_device &>(*device).set_irq_cb(DEVCB_##_devcb);
+
+#define MCFG_SS50_INTERFACE_FIRQ_CALLBACK(_devcb) \
+ downcast<ss50_interface_port_device &>(*device).set_firq_cb(DEVCB_##_devcb);
//**************************************************************************
// TYPE DEFINITIONS
@@ -27,25 +40,15 @@ class ss50_interface_port_device : public device_t, public device_slot_interface
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)
- {
- option_reset();
- opts(*this);
- set_default_option(dflt);
- 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, u32 clock);
// static configuration
- auto irq_cb() { return m_irq_cb.bind(); }
- auto firq_cb() { return m_firq_cb.bind(); }
+ template<class Object> devcb_base &set_irq_cb(Object &&object) { return m_irq_cb.set_callback(std::forward<Object>(object)); }
+ template<class Object> devcb_base &set_firq_cb(Object &&object) { return m_firq_cb.set_callback(std::forward<Object>(object)); }
// memory accesses
- u8 read(offs_t offset);
- void write(offs_t offset, u8 data);
+ DECLARE_READ8_MEMBER(read);
+ DECLARE_WRITE8_MEMBER(write);
// baud rates
DECLARE_WRITE_LINE_MEMBER(f110_w);
@@ -79,8 +82,8 @@ protected:
ss50_card_interface(const machine_config &mconfig, device_t &device);
// required overrides
- virtual u8 register_read(offs_t offset) = 0;
- virtual void register_write(offs_t offset, u8 data) = 0;
+ virtual DECLARE_READ8_MEMBER(register_read) = 0;
+ virtual DECLARE_WRITE8_MEMBER(register_write) = 0;
// optional overrides
virtual DECLARE_WRITE_LINE_MEMBER(f110_w) { }
diff --git a/src/devices/bus/ss50/mpc.cpp b/src/devices/bus/ss50/mpc.cpp
index ba05d80e8e3..eeff1928e92 100644
--- a/src/devices/bus/ss50/mpc.cpp
+++ b/src/devices/bus/ss50/mpc.cpp
@@ -42,8 +42,8 @@ protected:
virtual void device_start() override;
// interface-specific overrides
- virtual u8 register_read(offs_t offset) override;
- virtual void register_write(offs_t offset, u8 data) override;
+ virtual DECLARE_READ8_MEMBER(register_read) override;
+ virtual DECLARE_WRITE8_MEMBER(register_write) override;
virtual DECLARE_WRITE_LINE_MEMBER(f110_w) override;
virtual DECLARE_WRITE_LINE_MEMBER(f300_w) override;
@@ -100,8 +100,7 @@ DEVICE_INPUT_DEFAULTS_END
// machine configuration
//-------------------------------------------------
-void ss50_mpc_device::device_add_mconfig(machine_config &config)
-{
+MACHINE_CONFIG_START(ss50_mpc_device::device_add_mconfig)
PIA6821(config, m_pia, 0); // 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));
@@ -116,13 +115,15 @@ void ss50_mpc_device::device_add_mconfig(machine_config &config)
rs232.rxd_handler().set(FUNC(ss50_mpc_device::serial_input_w));
rs232.set_option_device_input_defaults("terminal", DEVICE_INPUT_DEFAULTS_NAME(terminal));
- INPUT_MERGER_ALL_HIGH(config, "outgate").output_handler().set("rs232", FUNC(rs232_port_device::write_txd));
+ MCFG_INPUT_MERGER_ALL_HIGH("outgate")
+ MCFG_INPUT_MERGER_OUTPUT_HANDLER(WRITELINE("rs232", rs232_port_device, write_txd))
- INPUT_MERGER_ANY_HIGH(config, m_loopback).output_handler().set("outgate", FUNC(input_merger_device::in_w<1>));
+ MCFG_INPUT_MERGER_ANY_HIGH("loopback")
+ MCFG_INPUT_MERGER_OUTPUT_HANDLER(WRITELINE("outgate", input_merger_device, in_w<1>))
RIPPLE_COUNTER(config, m_counter); // CD4024AE (IC3)
m_counter->set_stages(7); // only Q5 (÷32) and Q4 (÷16) are actually used
-}
+MACHINE_CONFIG_END
//-------------------------------------------------
@@ -161,18 +162,18 @@ WRITE_LINE_MEMBER(ss50_mpc_device::count_select_w)
// register_read - read from a port register
//-------------------------------------------------
-u8 ss50_mpc_device::register_read(offs_t offset)
+READ8_MEMBER(ss50_mpc_device::register_read)
{
- return m_pia->read(offset & 3);
+ return m_pia->read(space, offset & 3, 0);
}
//-------------------------------------------------
// register_write - write to a port register
//-------------------------------------------------
-void ss50_mpc_device::register_write(offs_t offset, u8 data)
+WRITE8_MEMBER(ss50_mpc_device::register_write)
{
- m_pia->write(offset & 3, data);
+ m_pia->write(space, offset & 3, data);
}
WRITE_LINE_MEMBER(ss50_mpc_device::f110_w)
diff --git a/src/devices/bus/ss50/mps.cpp b/src/devices/bus/ss50/mps.cpp
index d66dd3b767e..dab93db2cd3 100644
--- a/src/devices/bus/ss50/mps.cpp
+++ b/src/devices/bus/ss50/mps.cpp
@@ -38,8 +38,8 @@ protected:
virtual void device_start() override { }
// interface-specific overrides
- virtual u8 register_read(offs_t offset) override;
- virtual void register_write(offs_t offset, u8 data) override;
+ virtual DECLARE_READ8_MEMBER(register_read) override;
+ virtual DECLARE_WRITE8_MEMBER(register_write) override;
virtual DECLARE_WRITE_LINE_MEMBER(f110_w) override;
virtual DECLARE_WRITE_LINE_MEMBER(f150_9600_w) override;
virtual DECLARE_WRITE_LINE_MEMBER(f300_w) override;
@@ -113,18 +113,18 @@ void ss50_mps_device::device_add_mconfig(machine_config &config)
// register_read - read from a port register
//-------------------------------------------------
-u8 ss50_mps_device::register_read(offs_t offset)
+READ8_MEMBER(ss50_mps_device::register_read)
{
- return m_acia->read(offset & 1);
+ return m_acia->read(space, offset & 1, 0);
}
//-------------------------------------------------
// register_write - write to a port register
//-------------------------------------------------
-void ss50_mps_device::register_write(offs_t offset, u8 data)
+WRITE8_MEMBER(ss50_mps_device::register_write)
{
- m_acia->write(offset & 1, data);
+ m_acia->write(space, offset & 1, data);
}
WRITE_LINE_MEMBER(ss50_mps_device::f110_w)