diff options
Diffstat (limited to 'src/devices/sound/tms5220.h')
-rw-r--r-- | src/devices/sound/tms5220.h | 42 |
1 files changed, 4 insertions, 38 deletions
diff --git a/src/devices/sound/tms5220.h b/src/devices/sound/tms5220.h index a14d1ef86ce..712500058ca 100644 --- a/src/devices/sound/tms5220.h +++ b/src/devices/sound/tms5220.h @@ -14,34 +14,6 @@ /* usually 640000 for 8000 Hz sample rate or */ /* usually 800000 for 10000 Hz sample rate. */ -/* IRQ callback function, active low, i.e. state=0 */ -#define MCFG_TMS52XX_IRQ_HANDLER(_devcb) \ - downcast<tms5220_device &>(*device).set_irq_handler(DEVCB_##_devcb); - -/* Ready callback function, active low, i.e. state=0 */ -#define MCFG_TMS52XX_READYQ_HANDLER(_devcb) \ - downcast<tms5220_device &>(*device).set_readyq_handler(DEVCB_##_devcb); - -/* old VSM handler, remove me! */ -#define MCFG_TMS52XX_SPEECHROM(_tag) \ - downcast<tms5220_device &>(*device).set_speechrom_tag(_tag); - -/* new VSM handler */ -#define MCFG_TMS52XX_M0_CB(_devcb) \ - downcast<tms5220_device &>(*device).set_m0_callback(DEVCB_##_devcb); - -#define MCFG_TMS52XX_M1_CB(_devcb) \ - downcast<tms5220_device &>(*device).set_m1_callback(DEVCB_##_devcb); - -#define MCFG_TMS52XX_ADDR_CB(_devcb) \ - downcast<tms5220_device &>(*device).set_addr_callback(DEVCB_##_devcb); - -#define MCFG_TMS52XX_DATA_CB(_devcb) \ - downcast<tms5220_device &>(*device).set_data_callback(DEVCB_##_devcb); - -#define MCFG_TMS52XX_ROMCLK_CB(_devcb) \ - downcast<tms5220_device &>(device).set_romclk_callback(DEVCB_##_devcb); - class tms5220_device : public device_t, public device_sound_interface { public: @@ -53,22 +25,16 @@ public: tms5220_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - // configuration helpers - template <class Object> devcb_base &set_irq_handler(Object &&cb) { return m_irq_handler.set_callback(std::forward<Object>(cb)); } - template <class Object> devcb_base &set_readyq_handler(Object &&cb) { return m_readyq_handler.set_callback(std::forward<Object>(cb)); } - + // IRQ callback function, active low, i.e. state=0 auto irq_cb() { return m_irq_handler.bind(); } + + // Ready callback function, active low, i.e. state=0 auto ready_cb() { return m_readyq_handler.bind(); } // old VSM support, remove me! void set_speechrom_tag(const char *_tag) { m_speechrom_tag = _tag; } - // new VSM support - template <class Object> devcb_base &set_m0_callback(Object &&cb) { return m_m0_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> devcb_base &set_m1_callback(Object &&cb) { return m_m1_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> devcb_base &set_addr_callback(Object &&cb) { return m_addr_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> devcb_base &set_data_callback(Object &&cb) { return m_data_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> devcb_base &set_romclk_callback(Object &&cb) { return m_romclk_cb.set_callback(std::forward<Object>(cb)); } + // new VSM support auto m0_cb() { return m_m0_cb.bind(); } auto m1_cb() { return m_m1_cb.bind(); } auto addr_cb() { return m_addr_cb.bind(); } |