diff options
author | 2018-08-28 16:01:05 +0200 | |
---|---|---|
committer | 2018-08-29 19:07:51 +0200 | |
commit | 8ac98fea56b7c409f5917d78ceafa6bb7a97b653 (patch) | |
tree | fdbb7c373b0d0d437b8d906b997134a381e8620e /src/devices/machine/i82371sb.h | |
parent | 5d0aef3b01784fc567b2deb2457abd322d8c0a56 (diff) |
i2cmem,i7220,i80130,i8087,i8212,i8214,i82371sb,i8243: Removed MCFG, nw
Diffstat (limited to 'src/devices/machine/i82371sb.h')
-rw-r--r-- | src/devices/machine/i82371sb.h | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/src/devices/machine/i82371sb.h b/src/devices/machine/i82371sb.h index 5f39b9ed07f..ea7976ad845 100644 --- a/src/devices/machine/i82371sb.h +++ b/src/devices/machine/i82371sb.h @@ -24,18 +24,12 @@ #include "machine/am9517a.h" -#define MCFG_I82371SB_SMI_CB(_devcb) \ - downcast<i82371sb_isa_device &>(*device).set_smi_callback(DEVCB_##_devcb); - -#define MCFG_I82371SB_BOOT_STATE_HOOK(_devcb) \ - downcast<i82371sb_isa_device &>(*device).set_boot_state_hook(DEVCB_##_devcb); - class i82371sb_isa_device : public pci_device { public: i82371sb_isa_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - template <class Object> devcb_base &set_smi_callback(Object &&cb) { return m_smi_callback.set_callback(std::forward<Object>(cb)); } - template <class Object> devcb_base &set_boot_state_hook(Object &&cb) { return m_boot_state_hook.set_callback(std::forward<Object>(cb)); } + auto smi() { return m_smi_callback.bind(); } + auto boot_state_hook() { return m_boot_state_hook.bind(); } DECLARE_WRITE_LINE_MEMBER(pc_pirqa_w); DECLARE_WRITE_LINE_MEMBER(pc_pirqb_w); @@ -207,22 +201,13 @@ private: DECLARE_DEVICE_TYPE(I82371SB_ISA, i82371sb_isa_device) -#define MCFG_I82371SB_IDE_IRQ_PRI_CB(_devcb) \ - downcast<i82371sb_ide_device &>(*device).set_irq_pri_callback(DEVCB_##_devcb); - -#define MCFG_I82371SB_IDE_IRQ_SEC_CB(_devcb) \ - downcast<i82371sb_ide_device &>(*device).set_irq_sec_callback(DEVCB_##_devcb); - -#define MCFG_I82371SB_IDE_INTERRUPTS(_tag, _dev, _irq_pri, _irq_sec) \ - MCFG_I82371SB_IDE_IRQ_PRI_CB(WRITELINE(_tag, _dev, _irq_pri)) \ - MCFG_I82371SB_IDE_IRQ_SEC_CB(WRITELINE(_tag, _dev, _irq_sec)) class i82371sb_ide_device : public pci_device { public: i82371sb_ide_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - template <class Object> devcb_base &set_irq_pri_callback(Object &&cb) { return m_irq_pri_callback.set_callback(std::forward<Object>(cb)); } - template <class Object> devcb_base &set_irq_sec_callback(Object &&cb) { return m_irq_sec_callback.set_callback(std::forward<Object>(cb)); } + auto irq_pri() { return m_irq_pri_callback.bind(); } + auto irq_sec() { return m_irq_sec_callback.bind(); } protected: virtual void device_start() override; |