diff options
Diffstat (limited to 'src/devices/machine/wd2010.h')
-rw-r--r-- | src/devices/machine/wd2010.h | 45 |
1 files changed, 30 insertions, 15 deletions
diff --git a/src/devices/machine/wd2010.h b/src/devices/machine/wd2010.h index 47e928d20cf..5cba995b3da 100644 --- a/src/devices/machine/wd2010.h +++ b/src/devices/machine/wd2010.h @@ -19,49 +19,49 @@ //************************************************************************** #define MCFG_WD2010_OUT_INTRQ_CB(_devcb) \ - devcb = &downcast<wd2010_device &>(*device).set_out_intrq_callback(DEVCB_##_devcb); + downcast<wd2010_device &>(*device).set_out_intrq_callback(DEVCB_##_devcb); #define MCFG_WD2010_OUT_BDRQ_CB(_devcb) \ - devcb = &downcast<wd2010_device &>(*device).set_out_bdrq_callback(DEVCB_##_devcb); + downcast<wd2010_device &>(*device).set_out_bdrq_callback(DEVCB_##_devcb); #define MCFG_WD2010_OUT_BCR_CB(_devcb) \ - devcb = &downcast<wd2010_device &>(*device).set_out_bcr_callback(DEVCB_##_devcb); + downcast<wd2010_device &>(*device).set_out_bcr_callback(DEVCB_##_devcb); #define MCFG_WD2010_IN_BRDY_CB(_devcb) \ - devcb = &downcast<wd2010_device &>(*device).set_in_brdy_callback(DEVCB_##_devcb); + downcast<wd2010_device &>(*device).set_in_brdy_callback(DEVCB_##_devcb); #define MCFG_WD2010_IN_BCS_CB(_devcb) \ - devcb = &downcast<wd2010_device &>(*device).set_in_bcs_callback(DEVCB_##_devcb); + downcast<wd2010_device &>(*device).set_in_bcs_callback(DEVCB_##_devcb); #define MCFG_WD2010_OUT_BCS_CB(_devcb) \ - devcb = &downcast<wd2010_device &>(*device).set_out_bcs_callback(DEVCB_##_devcb); + downcast<wd2010_device &>(*device).set_out_bcs_callback(DEVCB_##_devcb); #define MCFG_WD2010_OUT_DIRIN_CB(_devcb) \ - devcb = &downcast<wd2010_device &>(*device).set_out_dirin_callback(DEVCB_##_devcb); + downcast<wd2010_device &>(*device).set_out_dirin_callback(DEVCB_##_devcb); #define MCFG_WD2010_OUT_STEP_CB(_devcb) \ - devcb = &downcast<wd2010_device &>(*device).set_out_step_callback(DEVCB_##_devcb); + downcast<wd2010_device &>(*device).set_out_step_callback(DEVCB_##_devcb); #define MCFG_WD2010_OUT_RWC_CB(_devcb) \ - devcb = &downcast<wd2010_device &>(*device).set_out_rwc_callback(DEVCB_##_devcb); + downcast<wd2010_device &>(*device).set_out_rwc_callback(DEVCB_##_devcb); #define MCFG_WD2010_OUT_WG_CB(_devcb) \ - devcb = &downcast<wd2010_device &>(*device).set_out_wg_callback(DEVCB_##_devcb); + downcast<wd2010_device &>(*device).set_out_wg_callback(DEVCB_##_devcb); #define MCFG_WD2010_IN_DRDY_CB(_devcb) \ - devcb = &downcast<wd2010_device &>(*device).set_in_drdy_callback(DEVCB_##_devcb); + downcast<wd2010_device &>(*device).set_in_drdy_callback(DEVCB_##_devcb); #define MCFG_WD2010_IN_INDEX_CB(_devcb) \ - devcb = &downcast<wd2010_device &>(*device).set_in_index_callback(DEVCB_##_devcb); + downcast<wd2010_device &>(*device).set_in_index_callback(DEVCB_##_devcb); #define MCFG_WD2010_IN_WF_CB(_devcb) \ - devcb = &downcast<wd2010_device &>(*device).set_in_wf_callback(DEVCB_##_devcb); + downcast<wd2010_device &>(*device).set_in_wf_callback(DEVCB_##_devcb); #define MCFG_WD2010_IN_TK000_CB(_devcb) \ - devcb = &downcast<wd2010_device &>(*device).set_in_tk000_callback(DEVCB_##_devcb); + downcast<wd2010_device &>(*device).set_in_tk000_callback(DEVCB_##_devcb); #define MCFG_WD2010_IN_SC_CB(_devcb) \ - devcb = &downcast<wd2010_device &>(*device).set_in_sc_callback(DEVCB_##_devcb); + downcast<wd2010_device &>(*device).set_in_sc_callback(DEVCB_##_devcb); //************************************************************************** // TYPE DEFINITIONS @@ -90,6 +90,21 @@ public: template <class Object> devcb_base &set_in_wf_callback(Object &&cb) { return m_in_wf_cb.set_callback(std::forward<Object>(cb)); } template <class Object> devcb_base &set_in_tk000_callback(Object &&cb) { return m_in_tk000_cb.set_callback(std::forward<Object>(cb)); } template <class Object> devcb_base &set_in_sc_callback(Object &&cb) { return m_in_sc_cb.set_callback(std::forward<Object>(cb)); } + auto out_intrq_callback() { return m_out_intrq_cb.bind(); } + auto out_bdrq_callback() { return m_out_bdrq_cb.bind(); } + auto out_bcr_callback() { return m_out_bcr_cb.bind(); } + auto in_brdy_callback() { return m_in_brdy_cb.bind(); } + auto in_bcs_callback() { return m_in_bcs_cb.bind(); } + auto out_bcs_callback() { return m_out_bcs_cb.bind(); } + auto out_dirin_callback() { return m_out_dirin_cb.bind(); } + auto out_step_callback() { return m_out_step_cb.bind(); } + auto out_rwc_callback() { return m_out_rwc_cb.bind(); } + auto out_wg_callback() { return m_out_wg_cb.bind(); } + auto in_drdy_callback() { return m_in_drdy_cb.bind(); } + auto in_index_callback() { return m_in_index_cb.bind(); } + auto in_wf_callback() { return m_in_wf_cb.bind(); } + auto in_tk000_callback() { return m_in_tk000_cb.bind(); } + auto in_sc_callback() { return m_in_sc_cb.bind(); } DECLARE_READ8_MEMBER( read ); DECLARE_WRITE8_MEMBER( write ); |