diff options
Diffstat (limited to 'src/mame/audio/atarijsa.h')
-rw-r--r-- | src/mame/audio/atarijsa.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/mame/audio/atarijsa.h b/src/mame/audio/atarijsa.h index f8cef0ca4a4..30e543311f3 100644 --- a/src/mame/audio/atarijsa.h +++ b/src/mame/audio/atarijsa.h @@ -38,23 +38,22 @@ DECLARE_DEVICE_TYPE(ATARI_JSA_IIIS, atari_jsa_iiis_device) #define MCFG_ATARI_JSA_I_ADD(_tag, _intcb) \ MCFG_DEVICE_ADD(_tag, ATARI_JSA_I, 0) \ - devcb = &downcast<atari_jsa_base_device &>(*device).set_main_int_cb(DEVCB_##_intcb); + downcast<atari_jsa_base_device &>(*device).set_main_int_cb(DEVCB_##_intcb); #define MCFG_ATARI_JSA_II_ADD(_tag, _intcb) \ MCFG_DEVICE_ADD(_tag, ATARI_JSA_II, 0) \ - devcb = &downcast<atari_jsa_base_device &>(*device).set_main_int_cb(DEVCB_##_intcb); + downcast<atari_jsa_base_device &>(*device).set_main_int_cb(DEVCB_##_intcb); #define MCFG_ATARI_JSA_III_ADD(_tag, _intcb) \ MCFG_DEVICE_ADD(_tag, ATARI_JSA_III, 0) \ - devcb = &downcast<atari_jsa_base_device &>(*device).set_main_int_cb(DEVCB_##_intcb); + downcast<atari_jsa_base_device &>(*device).set_main_int_cb(DEVCB_##_intcb); #define MCFG_ATARI_JSA_IIIS_ADD(_tag, _intcb) \ MCFG_DEVICE_ADD(_tag, ATARI_JSA_IIIS, 0) \ - devcb = &downcast<atari_jsa_base_device &>(*device).set_main_int_cb(DEVCB_##_intcb); + downcast<atari_jsa_base_device &>(*device).set_main_int_cb(DEVCB_##_intcb); #define MCFG_ATARI_JSA_TEST_PORT(_port, _bitnum) \ - devcb = &downcast<atari_jsa_base_device &>(*device).set_test_read_cb(DEVCB_IOPORT(_port)); \ - MCFG_DEVCB_RSHIFT(_bitnum); + downcast<atari_jsa_base_device &>(*device).test_read_cb().set_ioport(_port).bit(_bitnum); //************************************************************************** @@ -84,8 +83,9 @@ protected: public: // configuration - template <class Object> devcb_base &set_test_read_cb(Object &&cb) { return m_test_read_cb.set_callback(std::forward<Object>(cb)); } template <class Object> devcb_base &set_main_int_cb(Object &&cb) { return m_main_int_cb.set_callback(std::forward<Object>(cb)); } + auto test_read_cb() { return m_test_read_cb.bind(); } + auto main_int_cb() { return m_main_int_cb.bind(); } // getters m6502_device &soundcpu() const { return *m_jsacpu; } |