summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/amiga/zorro/zorro.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/amiga/zorro/zorro.h')
-rw-r--r--src/devices/bus/amiga/zorro/zorro.h58
1 files changed, 25 insertions, 33 deletions
diff --git a/src/devices/bus/amiga/zorro/zorro.h b/src/devices/bus/amiga/zorro/zorro.h
index 38c172ead49..02ece4b59a4 100644
--- a/src/devices/bus/amiga/zorro/zorro.h
+++ b/src/devices/bus/amiga/zorro/zorro.h
@@ -159,59 +159,59 @@
#define MCFG_ZORRO_SLOT_ADD(_zorrotag, _tag, _slot_intf, _def_slot) \
MCFG_DEVICE_ADD(_tag, ZORRO_SLOT, 0) \
MCFG_DEVICE_SLOT_INTERFACE(_slot_intf, _def_slot, false) \
- zorro_slot_device::set_zorro_slot(*device, this, _zorrotag);
+ downcast<zorro_slot_device &>(*device).set_zorro_slot(this, _zorrotag);
// ======================> expansion slot
#define MCFG_EXPANSION_SLOT_ADD(_cputag, _slot_intf, _def_slot) \
MCFG_DEVICE_ADD(EXP_SLOT_TAG, EXP_SLOT, 0) \
device_t *temp = device; \
- zorro_device::set_cputag(*device, _cputag); \
+ downcast<zorro_device &>(*device).set_cputag(_cputag); \
MCFG_ZORRO_SLOT_ADD(EXP_SLOT_TAG, "slot", _slot_intf, _def_slot) \
device = temp;
// callbacks
#define MCFG_EXPANSION_SLOT_OVR_HANDLER(_devcb) \
- devcb = &zorro_device::set_ovr_handler(*device, DEVCB_##_devcb);
+ devcb = &downcast<zorro_device &>(*device).set_ovr_handler(DEVCB_##_devcb);
#define MCFG_EXPANSION_SLOT_INT2_HANDLER(_devcb) \
- devcb = &zorro_device::set_int2_handler(*device, DEVCB_##_devcb);
+ devcb = &downcast<zorro_device &>(*device).set_int2_handler(DEVCB_##_devcb);
#define MCFG_EXPANSION_SLOT_INT6_HANDLER(_devcb) \
- devcb = &zorro_device::set_int6_handler(*device, DEVCB_##_devcb);
+ devcb = &downcast<zorro_device &>(*device).set_int6_handler(DEVCB_##_devcb);
#define MCFG_EXPANSION_SLOT_IPL_HANDLER(_devcb) \
- devcb = &exp_slot_device::set_ipl_handler(*device, DEVCB_##_devcb);
+ devcb = &downcast<exp_slot_device &>(*device).set_ipl_handler(DEVCB_##_devcb);
// ======================> zorro 2 bus
#define MCFG_ZORRO2_ADD(_cputag) \
MCFG_DEVICE_ADD(ZORROBUS_TAG, ZORRO2, 0) \
- zorro_device::set_cputag(*device, _cputag);
+ downcast<zorro_device &>(*device).set_cputag(_cputag);
#define MCFG_ZORRO2_SLOT_ADD(_tag, _slot_intf, _def_slot) \
MCFG_ZORRO_SLOT_ADD(ZORROBUS_TAG, _tag, _slot_intf, _def_slot)
#define MCFG_ZORRO2_OVR_HANDLER(_devcb) \
- devcb = &zorro_device::set_ovr_handler(*device, DEVCB_##_devcb);
+ devcb = &downcast<zorro_device &>(*device).set_ovr_handler(DEVCB_##_devcb);
#define MCFG_ZORRO2_INT2_HANDLER(_devcb) \
- devcb = &zorro_device::set_int2_handler(*device, DEVCB_##_devcb);
+ devcb = &downcast<zorro_device &>(*device).set_int2_handler(DEVCB_##_devcb);
#define MCFG_ZORRO2_INT6_HANDLER(_devcb) \
- devcb = &zorro_device::set_int6_handler(*device, DEVCB_##_devcb);
+ devcb = &downcast<zorro_device &>(*device).set_int6_handler(DEVCB_##_devcb);
#define MCFG_ZORRO2_EINT1_HANDLER(_devcb) \
- devcb = &zorro2_device::set_eint1_handler(*device, DEVCB_##_devcb);
+ devcb = &downcast<zorro2_device &>(*device).set_eint1_handler(DEVCB_##_devcb);
#define MCFG_ZORRO2_EINT4_HANDLER(_devcb) \
- devcb = &zorro2_device::set_eint4_handler(*device, DEVCB_##_devcb);
+ devcb = &downcast<zorro2_device &>(*device).set_eint4_handler(DEVCB_##_devcb);
#define MCFG_ZORRO2_EINT5_HANDLER(_devcb) \
- devcb = &zorro2_device::set_eint5_handler(*device, DEVCB_##_devcb);
+ devcb = &downcast<zorro2_device &>(*device).set_eint5_handler(DEVCB_##_devcb);
#define MCFG_ZORRO2_EINT7_HANDLER(_devcb) \
- devcb = &zorro2_device::set_eint7_handler(*device, DEVCB_##_devcb);
+ devcb = &downcast<zorro2_device &>(*device).set_eint7_handler(DEVCB_##_devcb);
//**************************************************************************
@@ -235,7 +235,7 @@ public:
virtual void device_start() override;
// inline configuration
- static void set_zorro_slot(device_t &device, device_t *owner, const char *zorro_tag);
+ void set_zorro_slot(device_t *owner, const char *zorro_tag) { m_owner = owner; m_zorro_tag = zorro_tag; }
protected:
zorro_slot_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
@@ -252,15 +252,12 @@ DECLARE_DEVICE_TYPE(ZORRO_SLOT, zorro_slot_device)
class zorro_device : public device_t
{
public:
- // static configuration helpers
- static void set_cputag(device_t &device, const char *tag);
+ // configuration helpers
+ void set_cputag(const char *tag) { m_cputag = tag; }
- template <class Object> static devcb_base &set_int2_handler(device_t &device, Object &&cb)
- { return downcast<zorro_device &>(device).m_int2_handler.set_callback(std::forward<Object>(cb)); }
- template <class Object> static devcb_base &set_int6_handler(device_t &device, Object &&cb)
- { return downcast<zorro_device &>(device).m_int6_handler.set_callback(std::forward<Object>(cb)); }
- template <class Object> static devcb_base &set_ovr_handler(device_t &device, Object &&cb)
- { return downcast<zorro_device &>(device).m_ovr_handler.set_callback(std::forward<Object>(cb)); }
+ template <class Object> devcb_base &set_int2_handler(Object &&cb) { return m_int2_handler.set_callback(std::forward<Object>(cb)); }
+ template <class Object> devcb_base &set_int6_handler(Object &&cb) { return m_int6_handler.set_callback(std::forward<Object>(cb)); }
+ template <class Object> devcb_base &set_ovr_handler(Object &&cb) { return m_ovr_handler.set_callback(std::forward<Object>(cb)); }
virtual void add_card(device_zorro_card_interface *card) = 0;
@@ -300,8 +297,7 @@ public:
// construction/destruction
exp_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- template <class Object> static devcb_base &set_ipl_handler(device_t &device, Object &&cb)
- { return downcast<exp_slot_device &>(device).m_ipl_handler.set_callback(std::forward<Object>(cb)); }
+ template <class Object> devcb_base &set_ipl_handler(Object &&cb) { return m_ipl_handler.set_callback(std::forward<Object>(cb)); }
// the expansion slot can only have a single card
virtual void add_card(device_zorro_card_interface *card) override;
@@ -337,14 +333,10 @@ public:
zorro2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
~zorro2_device();
- template <class Object> static devcb_base &set_eint1_handler(device_t &device, Object &&cb)
- { return downcast<zorro2_device &>(device).m_eint1_handler.set_callback(std::forward<Object>(cb)); }
- template <class Object> static devcb_base &set_eint4_handler(device_t &device, Object &&cb)
- { return downcast<zorro2_device &>(device).m_eint4_handler.set_callback(std::forward<Object>(cb)); }
- template <class Object> static devcb_base &set_eint5_handler(device_t &device, Object &&cb)
- { return downcast<zorro2_device &>(device).m_eint5_handler.set_callback(std::forward<Object>(cb)); }
- template <class Object> static devcb_base &set_eint7_handler(device_t &device, Object &&cb)
- { return downcast<zorro2_device &>(device).m_eint7_handler.set_callback(std::forward<Object>(cb)); }
+ template <class Object> devcb_base &set_eint1_handler(Object &&cb) { return m_eint1_handler.set_callback(std::forward<Object>(cb)); }
+ template <class Object> devcb_base &set_eint4_handler(Object &&cb) { return m_eint4_handler.set_callback(std::forward<Object>(cb)); }
+ template <class Object> devcb_base &set_eint5_handler(Object &&cb) { return m_eint5_handler.set_callback(std::forward<Object>(cb)); }
+ template <class Object> devcb_base &set_eint7_handler(Object &&cb) { return m_eint7_handler.set_callback(std::forward<Object>(cb)); }
// the zorro2 bus supports multiple cards
virtual void add_card(device_zorro_card_interface *card) override;