diff options
Diffstat (limited to 'src/devices/sound/qs1000.h')
-rw-r--r-- | src/devices/sound/qs1000.h | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/devices/sound/qs1000.h b/src/devices/sound/qs1000.h index e6e9746f1ed..a571b7a270c 100644 --- a/src/devices/sound/qs1000.h +++ b/src/devices/sound/qs1000.h @@ -21,28 +21,28 @@ //************************************************************************** #define MCFG_QS1000_EXTERNAL_ROM(_bool) \ - qs1000_device::set_external_rom(*device, _bool); + downcast<qs1000_device &>(*device).set_external_rom(_bool); #define MCFG_QS1000_IN_P1_CB(_devcb) \ - devcb = &qs1000_device::set_in_p1_callback(*device, DEVCB_##_devcb); + devcb = &downcast<qs1000_device &>(*device).set_in_p1_callback(DEVCB_##_devcb); #define MCFG_QS1000_IN_P2_CB(_devcb) \ - devcb = &qs1000_device::set_in_p2_callback(*device, DEVCB_##_devcb); + devcb = &downcast<qs1000_device &>(*device).set_in_p2_callback(DEVCB_##_devcb); #define MCFG_QS1000_IN_P3_CB(_devcb) \ - devcb = &qs1000_device::set_in_p3_callback(*device, DEVCB_##_devcb); + devcb = &downcast<qs1000_device &>(*device).set_in_p3_callback(DEVCB_##_devcb); #define MCFG_QS1000_OUT_P1_CB(_devcb) \ - devcb = &qs1000_device::set_out_p1_callback(*device, DEVCB_##_devcb); + devcb = &downcast<qs1000_device &>(*device).set_out_p1_callback(DEVCB_##_devcb); #define MCFG_QS1000_OUT_P2_CB(_devcb) \ - devcb = &qs1000_device::set_out_p2_callback(*device, DEVCB_##_devcb); + devcb = &downcast<qs1000_device &>(*device).set_out_p2_callback(DEVCB_##_devcb); #define MCFG_QS1000_OUT_P3_CB(_devcb) \ - devcb = &qs1000_device::set_out_p3_callback(*device, DEVCB_##_devcb); + devcb = &downcast<qs1000_device &>(*device).set_out_p3_callback(DEVCB_##_devcb); /*#define MCFG_QS1000_SERIAL_W_CB(_devcb) \ - devcb = &qs1000_device::set_serial_w_callback(*device, DEVCB_##_devcb);*/ + devcb = &downcast<qs1000_device &>(*device).set_serial_w_callback(DEVCB_##_devcb);*/ //************************************************************************** // TYPE DEFINITIONS @@ -58,14 +58,14 @@ public: // construction/destruction qs1000_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - static void set_external_rom(device_t &device, bool external_rom) { downcast<qs1000_device &>(device).m_external_rom = external_rom; } - template <class Object> static devcb_base &set_in_p1_callback(device_t &device, Object &&cb) { return downcast<qs1000_device &>(device).m_in_p1_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> static devcb_base &set_in_p2_callback(device_t &device, Object &&cb) { return downcast<qs1000_device &>(device).m_in_p2_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> static devcb_base &set_in_p3_callback(device_t &device, Object &&cb) { return downcast<qs1000_device &>(device).m_in_p3_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> static devcb_base &set_out_p1_callback(device_t &device, Object &&cb) { return downcast<qs1000_device &>(device).m_out_p1_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> static devcb_base &set_out_p2_callback(device_t &device, Object &&cb) { return downcast<qs1000_device &>(device).m_out_p2_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> static devcb_base &set_out_p3_callback(device_t &device, Object &&cb) { return downcast<qs1000_device &>(device).m_out_p3_cb.set_callback(std::forward<Object>(cb)); } - //template <class Object> static devcb_base &set_serial_w_callback(device_t &device, Object &&cb) { return downcast<qs1000_device &>(device).m_serial_w_cb.set_callback(std::forward<Object>(cb)); } + void set_external_rom(bool external_rom) { m_external_rom = external_rom; } + template <class Object> devcb_base &set_in_p1_callback(Object &&cb) { return m_in_p1_cb.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_in_p2_callback(Object &&cb) { return m_in_p2_cb.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_in_p3_callback(Object &&cb) { return m_in_p3_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_p2_callback(Object &&cb) { return m_out_p2_cb.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_out_p3_callback(Object &&cb) { return m_out_p3_cb.set_callback(std::forward<Object>(cb)); } + //template <class Object> devcb_base &set_serial_w_callback(Object &&cb) { return m_serial_w_cb.set_callback(std::forward<Object>(cb)); } // external void serial_in(uint8_t data); |