diff options
Diffstat (limited to 'src/devices/cpu/upd7725/upd7725.h')
-rw-r--r-- | src/devices/cpu/upd7725/upd7725.h | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/src/devices/cpu/upd7725/upd7725.h b/src/devices/cpu/upd7725/upd7725.h index ec00eb1e153..16c196c5a66 100644 --- a/src/devices/cpu/upd7725/upd7725.h +++ b/src/devices/cpu/upd7725/upd7725.h @@ -30,37 +30,37 @@ enum #define MCFG_NECDSP_IN_INT_CB(_devcb) \ - devcb = &necdsp_device::set_in_int_callback(*device, DEVCB_##_devcb); + devcb = &downcast<necdsp_device &>(*device).set_in_int_callback(DEVCB_##_devcb); #define MCFG_NECDSP_IN_SI_CB(_devcb) \ - devcb = &necdsp_device::set_in_si_callback(*device, DEVCB_##_devcb); + devcb = &downcast<necdsp_device &>(*device).set_in_si_callback(DEVCB_##_devcb); #define MCFG_NECDSP_IN_SCK_CB(_devcb) \ - devcb = &necdsp_device::set_in_sck_callback(*device, DEVCB_##_devcb); + devcb = &downcast<necdsp_device &>(*device).set_in_sck_callback(DEVCB_##_devcb); #define MCFG_NECDSP_IN_SIEN_CB(_devcb) \ - devcb = &necdsp_device::set_in_sien_callback(*device, DEVCB_##_devcb); + devcb = &downcast<necdsp_device &>(*device).set_in_sien_callback(DEVCB_##_devcb); #define MCFG_NECDSP_IN_SOEN_CB(_devcb) \ - devcb = &necdsp_device::set_in_soen_callback(*device, DEVCB_##_devcb); + devcb = &downcast<necdsp_device &>(*device).set_in_soen_callback(DEVCB_##_devcb); #define MCFG_NECDSP_IN_DACK_CB(_devcb) \ - devcb = &necdsp_device::set_in_dack_callback(*device, DEVCB_##_devcb); + devcb = &downcast<necdsp_device &>(*device).set_in_dack_callback(DEVCB_##_devcb); #define MCFG_NECDSP_OUT_P0_CB(_devcb) \ - devcb = &necdsp_device::set_out_p0_callback(*device, DEVCB_##_devcb); + devcb = &downcast<necdsp_device &>(*device).set_out_p0_callback(DEVCB_##_devcb); #define MCFG_NECDSP_OUT_P1_CB(_devcb) \ - devcb = &necdsp_device::set_out_p1_callback(*device, DEVCB_##_devcb); + devcb = &downcast<necdsp_device &>(*device).set_out_p1_callback(DEVCB_##_devcb); #define MCFG_NECDSP_OUT_SO_CB(_devcb) \ - devcb = &necdsp_device::set_out_so_callback(*device, DEVCB_##_devcb); + devcb = &downcast<necdsp_device &>(*device).set_out_so_callback(DEVCB_##_devcb); #define MCFG_NECDSP_OUT_SORQ_CB(_devcb) \ - devcb = &necdsp_device::set_out_sorq_callback(*device, DEVCB_##_devcb); + devcb = &downcast<necdsp_device &>(*device).set_out_sorq_callback(DEVCB_##_devcb); #define MCFG_NECDSP_OUT_DRQ_CB(_devcb) \ - devcb = &necdsp_device::set_out_drq_callback(*device, DEVCB_##_devcb); + devcb = &downcast<necdsp_device &>(*device).set_out_drq_callback(DEVCB_##_devcb); // ======================> necdsp_device @@ -68,17 +68,17 @@ enum class necdsp_device : public cpu_device { public: - template <class Object> static devcb_base &set_in_int_callback(device_t &device, Object &&cb) { return downcast<necdsp_device &>(device).m_in_int_cb.set_callback(std::forward<Object>(cb)); } - //template <class Object> static devcb_base &set_in_si_callback(device_t &device, Object &&cb) { return downcast<necdsp_device &>(device).m_in_si_cb.set_callback(std::forward<Object>(cb)); } - //template <class Object> static devcb_base &set_in_sck_callback(device_t &device, Object &&cb) { return downcast<necdsp_device &>(device).m_in_sck_cb.set_callback(std::forward<Object>(cb)); } - //template <class Object> static devcb_base &set_in_sien_callback(device_t &device, Object &&cb) { return downcast<necdsp_device &>(device).m_in_sien_cb.set_callback(std::forward<Object>(cb)); } - //template <class Object> static devcb_base &set_in_soen_callback(device_t &device, Object &&cb) { return downcast<necdsp_device &>(device).m_in_soen_cb.set_callback(std::forward<Object>(cb)); } - //template <class Object> static devcb_base &set_in_dack_callback(device_t &device, Object &&cb) { return downcast<necdsp_device &>(device).m_in_dack_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> static devcb_base &set_out_p0_callback(device_t &device, Object &&cb) { return downcast<necdsp_device &>(device).m_out_p0_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> static devcb_base &set_out_p1_callback(device_t &device, Object &&cb) { return downcast<necdsp_device &>(device).m_out_p1_cb.set_callback(std::forward<Object>(cb)); } - //template <class Object> static devcb_base &set_out_so_callback(device_t &device, Object &&cb) { return downcast<necdsp_device &>(device).m_out_so_cb.set_callback(std::forward<Object>(cb)); } - //template <class Object> static devcb_base &set_out_sorq_callback(device_t &device, Object &&cb) { return downcast<necdsp_device &>(device).m_out_sorq_cb.set_callback(std::forward<Object>(cb)); } - //template <class Object> static devcb_base &set_out_drq_callback(device_t &device, Object &&cb) { return downcast<necdsp_device &>(device).m_out_drq_cb.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_in_int_callback(Object &&cb) { return m_in_int_cb.set_callback(std::forward<Object>(cb)); } + //template <class Object> devcb_base &set_in_si_callback(Object &&cb) { return m_in_si_cb.set_callback(std::forward<Object>(cb)); } + //template <class Object> devcb_base &set_in_sck_callback(Object &&cb) { return m_in_sck_cb.set_callback(std::forward<Object>(cb)); } + //template <class Object> devcb_base &set_in_sien_callback(Object &&cb) { return m_in_sien_cb.set_callback(std::forward<Object>(cb)); } + //template <class Object> devcb_base &set_in_soen_callback(Object &&cb) { return m_in_soen_cb.set_callback(std::forward<Object>(cb)); } + //template <class Object> devcb_base &set_in_dack_callback(Object &&cb) { return m_in_dack_cb.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_out_p0_callback(Object &&cb) { return m_out_p0_cb.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_out_p1_callback(Object &&cb) { return m_out_p1_cb.set_callback(std::forward<Object>(cb)); } + //template <class Object> devcb_base &set_out_so_callback(Object &&cb) { return m_out_so_cb.set_callback(std::forward<Object>(cb)); } + //template <class Object> devcb_base &set_out_sorq_callback(Object &&cb) { return m_out_sorq_cb.set_callback(std::forward<Object>(cb)); } + //template <class Object> devcb_base &set_out_drq_callback(Object &&cb) { return m_out_drq_cb.set_callback(std::forward<Object>(cb)); } uint8_t snesdsp_read(bool mode); void snesdsp_write(bool mode, uint8_t data); |