diff options
Diffstat (limited to 'src/devices/bus/a2bus')
-rw-r--r-- | src/devices/bus/a2bus/a2bus.h | 6 | ||||
-rw-r--r-- | src/devices/bus/a2bus/a2eauxslot.h | 4 | ||||
-rw-r--r-- | src/devices/bus/a2bus/a2mcms.cpp | 2 | ||||
-rw-r--r-- | src/devices/bus/a2bus/pc_xporter.cpp | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/devices/bus/a2bus/a2bus.h b/src/devices/bus/a2bus/a2bus.h index 546c2592885..1e1d2b832ee 100644 --- a/src/devices/bus/a2bus/a2bus.h +++ b/src/devices/bus/a2bus/a2bus.h @@ -33,13 +33,13 @@ downcast<a2bus_device &>(*device).set_cputag(_cputag); #define MCFG_A2BUS_OUT_IRQ_CB(_devcb) \ - devcb = &downcast<a2bus_device &>(*device).set_out_irq_callback(DEVCB_##_devcb); + downcast<a2bus_device &>(*device).set_out_irq_callback(DEVCB_##_devcb); #define MCFG_A2BUS_OUT_NMI_CB(_devcb) \ - devcb = &downcast<a2bus_device &>(*device).set_out_nmi_callback(DEVCB_##_devcb); + downcast<a2bus_device &>(*device).set_out_nmi_callback(DEVCB_##_devcb); #define MCFG_A2BUS_OUT_INH_CB(_devcb) \ - devcb = &downcast<a2bus_device &>(*device).set_out_inh_callback(DEVCB_##_devcb); + downcast<a2bus_device &>(*device).set_out_inh_callback(DEVCB_##_devcb); // 7M = XTAL(14'318'181) / 2 or XTAL(28'636'363) / 4 (for IIgs) static constexpr uint32_t A2BUS_7M_CLOCK = 7159090; diff --git a/src/devices/bus/a2bus/a2eauxslot.h b/src/devices/bus/a2bus/a2eauxslot.h index 2101f5cfc6b..1da89b18d7a 100644 --- a/src/devices/bus/a2bus/a2eauxslot.h +++ b/src/devices/bus/a2bus/a2eauxslot.h @@ -23,10 +23,10 @@ downcast<a2eauxslot_device &>(*device).set_cputag(_cputag); #define MCFG_A2EAUXSLOT_OUT_IRQ_CB(_devcb) \ - devcb = &downcast<a2eauxslot_device &>(*device).set_out_irq_callback(DEVCB_##_devcb); + downcast<a2eauxslot_device &>(*device).set_out_irq_callback(DEVCB_##_devcb); #define MCFG_A2EAUXSLOT_OUT_NMI_CB(_devcb) \ - devcb = &downcast<a2eauxslot_device &>(*device).set_out_nmi_callback(DEVCB_##_devcb); + downcast<a2eauxslot_device &>(*device).set_out_nmi_callback(DEVCB_##_devcb); #define MCFG_A2EAUXSLOT_SLOT_ADD(_nbtag, _tag, _slot_intf, _def_slot) \ MCFG_DEVICE_ADD(_tag, A2EAUXSLOT_SLOT, 0) \ diff --git a/src/devices/bus/a2bus/a2mcms.cpp b/src/devices/bus/a2bus/a2mcms.cpp index 6d11cbebf27..1442d7d68bc 100644 --- a/src/devices/bus/a2bus/a2mcms.cpp +++ b/src/devices/bus/a2bus/a2mcms.cpp @@ -39,7 +39,7 @@ DEFINE_DEVICE_TYPE(A2BUS_MCMS2, a2bus_mcms2_device, "a2mcms2", "Mountain Compute #define ENGINE_TAG "engine" #define MCFG_MCMS_IRQ_CALLBACK(_cb) \ - devcb = &downcast<mcms_device &>(*device).set_irq_cb(DEVCB_##_cb); + downcast<mcms_device &>(*device).set_irq_cb(DEVCB_##_cb); /*************************************************************************** FUNCTION PROTOTYPES diff --git a/src/devices/bus/a2bus/pc_xporter.cpp b/src/devices/bus/a2bus/pc_xporter.cpp index 0495fb4fbf6..dd8671b7b87 100644 --- a/src/devices/bus/a2bus/pc_xporter.cpp +++ b/src/devices/bus/a2bus/pc_xporter.cpp @@ -147,8 +147,8 @@ MACHINE_CONFIG_START(a2bus_pcxporter_device::device_add_mconfig) MCFG_I8237_OUT_DACK_2_CB(WRITELINE(*this, a2bus_pcxporter_device, pc_dack2_w)) MCFG_I8237_OUT_DACK_3_CB(WRITELINE(*this, a2bus_pcxporter_device, pc_dack3_w)) - MCFG_DEVICE_ADD(m_pic8259, PIC8259, 0) - MCFG_PIC8259_OUT_INT_CB(INPUTLINE(m_v30, 0)) + PIC8259(config, m_pic8259, 0); + m_pic8259->out_int_callback().set_inputline(m_v30, 0); MCFG_DEVICE_ADD(m_isabus, ISA8, 0) MCFG_ISA8_CPU(m_v30) |