summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/a800/a8sio.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/a800/a8sio.h')
-rw-r--r--src/devices/bus/a800/a8sio.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/devices/bus/a800/a8sio.h b/src/devices/bus/a800/a8sio.h
index 31d853ec633..a9a1b4eec8b 100644
--- a/src/devices/bus/a800/a8sio.h
+++ b/src/devices/bus/a800/a8sio.h
@@ -43,10 +43,10 @@
#define MCFG_A8SIO_SLOT_ADD(_nbtag, _tag, _def_slot) \
MCFG_DEVICE_ADD(_tag, A8SIO_SLOT, 0) \
MCFG_DEVICE_SLOT_INTERFACE(a8sio_cards, _def_slot, false) \
- a8sio_slot_device::static_set_a8sio_slot(*device, _nbtag, _tag);
+ downcast<a8sio_slot_device &>(*device).set_a8sio_slot(_nbtag, _tag);
#define MCFG_A8SIO_DATA_IN_CB(_devcb) \
- devcb = &a8sio_device::set_data_in_callback(*device, DEVCB_##_devcb);
+ devcb = &downcast<a8sio_device &>(*device).set_data_in_callback(DEVCB_##_devcb);
class a8sio_slot_device : public device_t,
@@ -57,7 +57,7 @@ public:
a8sio_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// inline configuration
- static void static_set_a8sio_slot(device_t &device, const char *tag, const char *slottag);
+ void set_a8sio_slot(const char *tag, const char *slottag) { m_a8sio_tag = tag; m_a8sio_slottag = slottag; }
protected:
a8sio_slot_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
@@ -84,9 +84,9 @@ public:
a8sio_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// inline configuration
- template <class Object> static devcb_base &set_clock_in_callback(device_t &device, Object &&cb) { return downcast<a8sio_device &>(device).m_out_clock_in_cb.set_callback(std::forward<Object>(cb)); }
- template <class Object> static devcb_base &set_data_in_callback(device_t &device, Object &&cb) { return downcast<a8sio_device &>(device).m_out_data_in_cb.set_callback(std::forward<Object>(cb)); }
- template <class Object> static devcb_base &set_audio_in_callback(device_t &device, Object &&cb) { return downcast<a8sio_device &>(device).m_out_audio_in_cb.set_callback(std::forward<Object>(cb)); }
+ template <class Object> devcb_base &set_clock_in_callback(Object &&cb) { return m_out_clock_in_cb.set_callback(std::forward<Object>(cb)); }
+ template <class Object> devcb_base &set_data_in_callback(Object &&cb) { return m_out_data_in_cb.set_callback(std::forward<Object>(cb)); }
+ template <class Object> devcb_base &set_audio_in_callback(Object &&cb) { return m_out_audio_in_cb.set_callback(std::forward<Object>(cb)); }
void add_a8sio_card(device_a8sio_card_interface *card);
device_a8sio_card_interface *get_a8sio_card();
@@ -129,7 +129,7 @@ public:
void set_a8sio_device();
// inline configuration
- static void static_set_a8sio_tag(device_t &device, const char *tag, const char *slottag);
+ void set_a8sio_tag(const char *tag, const char *slottag) { m_a8sio_tag = tag; m_a8sio_slottag = slottag; }
virtual DECLARE_WRITE_LINE_MEMBER( motor_w );