diff options
Diffstat (limited to 'src/devices/video/cesblit.h')
-rw-r--r-- | src/devices/video/cesblit.h | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/src/devices/video/cesblit.h b/src/devices/video/cesblit.h index f22f16df260..d535921ef6b 100644 --- a/src/devices/video/cesblit.h +++ b/src/devices/video/cesblit.h @@ -11,21 +11,6 @@ #pragma once -/*************************************************************************** - INTERFACE CONFIGURATION MACROS -***************************************************************************/ - -#define MCFG_CESBLIT_ADD(_tag, _screen, _clock) \ - MCFG_DEVICE_ADD(_tag, CESBLIT, _clock) \ - MCFG_VIDEO_SET_SCREEN(_screen) - -#define MCFG_CESBLIT_MAP MCFG_DEVICE_PROGRAM_MAP - -#define MCFG_CESBLIT_COMPUTE_ADDR(_compute_addr) \ - downcast<cesblit_device &>(*device).set_compute_addr(_compute_addr); - -#define MCFG_CESBLIT_IRQ_CB(_devcb) \ - downcast<cesblit_device &>(*device).set_irq_callback(DEVCB_##_devcb); /*************************************************************************** TYPE DEFINITIONS @@ -41,11 +26,18 @@ public: typedef int (*compute_addr_t) (uint16_t reg_low, uint16_t reg_mid, uint16_t reg_high); // construction/destruction + template <typename T> + cesblit_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock, T &&screen_tag) + : cesblit_device(mconfig, tag, owner, clock) + { + set_screen(std::forward<T>(screen_tag)); + } + cesblit_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // configuration void set_compute_addr(compute_addr_t compute_addr) { m_compute_addr = compute_addr; } - template <class Object> devcb_base &set_irq_callback(Object &&cb) { return m_blit_irq_cb.set_callback(std::forward<Object>(cb)); } + auto irq_callback() { return m_blit_irq_cb.bind(); } DECLARE_WRITE16_MEMBER(color_w); DECLARE_WRITE16_MEMBER(addr_hi_w); |