diff options
author | 2018-02-25 14:18:39 +0100 | |
---|---|---|
committer | 2018-02-25 14:18:39 +0100 | |
commit | 9cc815af31f4d8a406349d35b0871328a1471e08 (patch) | |
tree | 6ade99610cf8234826cf6cd2c80ea8d4a1646439 /src/devices/video/cdp1861.h | |
parent | f07b93b0532d379eb542ca507b103e71196e9147 (diff) |
de-staticify initializations for src/devices/video (#3270)
Diffstat (limited to 'src/devices/video/cdp1861.h')
-rw-r--r-- | src/devices/video/cdp1861.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/devices/video/cdp1861.h b/src/devices/video/cdp1861.h index 41a9609b651..765be92de8b 100644 --- a/src/devices/video/cdp1861.h +++ b/src/devices/video/cdp1861.h @@ -34,13 +34,13 @@ //************************************************************************** #define MCFG_CDP1861_IRQ_CALLBACK(_write) \ - devcb = &cdp1861_device::set_irq_wr_callback(*device, DEVCB_##_write); + devcb = &downcast<cdp1861_device &>(*device).set_irq_wr_callback(DEVCB_##_write); #define MCFG_CDP1861_DMA_OUT_CALLBACK(_write) \ - devcb = &cdp1861_device::set_dma_out_wr_callback(*device, DEVCB_##_write); + devcb = &downcast<cdp1861_device &>(*device).set_dma_out_wr_callback(DEVCB_##_write); #define MCFG_CDP1861_EFX_CALLBACK(_write) \ - devcb = &cdp1861_device::set_efx_wr_callback(*device, DEVCB_##_write); + devcb = &downcast<cdp1861_device &>(*device).set_efx_wr_callback(DEVCB_##_write); #define MCFG_CDP1861_SCREEN_ADD(_cdptag, _tag, _clock) \ @@ -88,9 +88,9 @@ public: // construction/destruction cdp1861_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - template <class Object> static devcb_base &set_irq_wr_callback(device_t &device, Object &&cb) { return downcast<cdp1861_device &>(device).m_write_irq.set_callback(std::forward<Object>(cb)); } - template <class Object> static devcb_base &set_dma_out_wr_callback(device_t &device, Object &&cb) { return downcast<cdp1861_device &>(device).m_write_dma_out.set_callback(std::forward<Object>(cb)); } - template <class Object> static devcb_base &set_efx_wr_callback(device_t &device, Object &&cb) { return downcast<cdp1861_device &>(device).m_write_efx.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_irq_wr_callback(Object &&cb) { return m_write_irq.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_dma_out_wr_callback(Object &&cb) { return m_write_dma_out.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_efx_wr_callback(Object &&cb) { return m_write_efx.set_callback(std::forward<Object>(cb)); } DECLARE_WRITE8_MEMBER( dma_w ); DECLARE_WRITE_LINE_MEMBER( disp_on_w ); |