diff options
Diffstat (limited to 'src/devices/bus/tiki100/exp.h')
-rw-r--r-- | src/devices/bus/tiki100/exp.h | 52 |
1 files changed, 16 insertions, 36 deletions
diff --git a/src/devices/bus/tiki100/exp.h b/src/devices/bus/tiki100/exp.h index fb82a62fdce..a36e0ac3419 100644 --- a/src/devices/bus/tiki100/exp.h +++ b/src/devices/bus/tiki100/exp.h @@ -25,36 +25,6 @@ #define TIKI100_BUS_TAG "tiki100bus" - -//************************************************************************** -// INTERFACE CONFIGURATION MACROS -//************************************************************************** - -#define MCFG_TIKI100_BUS_ADD() \ - MCFG_DEVICE_ADD(TIKI100_BUS_TAG, TIKI100_BUS, 0) - -#define MCFG_TIKI100_BUS_SLOT_ADD(_tag, _def_slot) \ - MCFG_DEVICE_ADD(_tag, TIKI100_BUS_SLOT, 0) \ - MCFG_DEVICE_SLOT_INTERFACE(tiki100_cards, _def_slot, false) - - -#define MCFG_TIKI100_BUS_IRQ_CALLBACK(_write) \ - downcast<tiki100_bus_device &>(*device).set_irq_wr_callback(DEVCB_##_write); - -#define MCFG_TIKI100_BUS_NMI_CALLBACK(_write) \ - downcast<tiki100_bus_device &>(*device).set_nmi_wr_callback(DEVCB_##_write); - -#define MCFG_TIKI100_BUS_BUSRQ_CALLBACK(_write) \ - downcast<tiki100_bus_device &>(*device).set_busrq_wr_callback(DEVCB_##_write); - -#define MCFG_TIKI100_BUS_IN_MREQ_CALLBACK(_read) \ - downcast<tiki100_bus_device &>(*device).set_mrq_rd_callback(DEVCB_##_read); - -#define MCFG_TIKI100_BUS_OUT_MREQ_CALLBACK(_write) \ - downcast<tiki100_bus_device &>(*device).set_mrq_wr_callback(DEVCB_##_write); - - - //************************************************************************** // TYPE DEFINITIONS //************************************************************************** @@ -111,7 +81,17 @@ class tiki100_bus_slot_device : public device_t, { public: // construction/destruction - tiki100_bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + template <typename T> + tiki100_bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, T &&opts, const char *dflt) + : tiki100_bus_slot_device(mconfig, tag, owner, 0) + { + option_reset(); + opts(*this); + set_default_option(dflt); + set_fixed(false); + } + + tiki100_bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock = 0); // device-level overrides virtual void device_start() override; @@ -142,11 +122,11 @@ public: tiki100_bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); ~tiki100_bus_device() { m_device_list.detach_all(); } - template <class Object> devcb_base &set_irq_wr_callback(Object &&cb) { return m_irq_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> devcb_base &set_nmi_wr_callback(Object &&cb) { return m_nmi_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> devcb_base &set_busrq_wr_callback(Object &&cb) { return m_busrq_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> devcb_base &set_mrq_rd_callback(Object &&cb) { return m_in_mrq_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> devcb_base &set_mrq_wr_callback(Object &&cb) { return m_out_mrq_cb.set_callback(std::forward<Object>(cb)); } + auto irq_wr_callback() { return m_irq_cb.bind(); } + auto nmi_wr_callback() { return m_nmi_cb.bind(); } + auto busrq_wr_callback() { return m_busrq_cb.bind(); } + auto mrq_rd_callback() { return m_in_mrq_cb.bind(); } + auto mrq_wr_callback() { return m_out_mrq_cb.bind(); } void add_card(device_tiki100bus_card_interface *card); |