diff options
Diffstat (limited to 'src/devices/machine/upd71071.h')
-rw-r--r-- | src/devices/machine/upd71071.h | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/src/devices/machine/upd71071.h b/src/devices/machine/upd71071.h index 21720d295d6..813a5bea3fe 100644 --- a/src/devices/machine/upd71071.h +++ b/src/devices/machine/upd71071.h @@ -11,15 +11,15 @@ class upd71071_device : public device_t public: upd71071_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - static void static_set_cpu_tag(device_t &device, const char *tag) { downcast<upd71071_device &>(device).m_cpu.set_tag(tag); } - static void set_clock(device_t &device, int clock) { downcast<upd71071_device &>(device).m_upd_clock = clock; } + void set_cpu_tag(const char *tag) { m_cpu.set_tag(tag); } + void set_clock(int clock) { m_upd_clock = clock; } - template <class Object> static devcb_base &set_out_hreq_callback(device_t &device, Object &&cb) { return downcast<upd71071_device &>(device).m_out_hreq_cb.set_callback(std::forward<Object>(cb)); } - template <class Object> static devcb_base &set_out_eop_callback(device_t &device, Object &&cb) { return downcast<upd71071_device &>(device).m_out_eop_cb.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_out_hreq_callback(Object &&cb) { return m_out_hreq_cb.set_callback(std::forward<Object>(cb)); } + template <class Object> devcb_base &set_out_eop_callback(Object &&cb) { return m_out_eop_cb.set_callback(std::forward<Object>(cb)); } - template <unsigned N, class Object> static devcb_base &set_dma_read_callback(device_t &device, Object &&cb) { return downcast<upd71071_device &>(device).m_dma_read_cb[N].set_callback(std::forward<Object>(cb)); } - template <unsigned N, class Object> static devcb_base &set_dma_write_callback(device_t &device, Object &&cb) { return downcast<upd71071_device &>(device).m_dma_write_cb[N].set_callback(std::forward<Object>(cb)); } - template <unsigned N, class Object> static devcb_base &set_out_dack_callback(device_t &device, Object &&cb) { return downcast<upd71071_device &>(device).m_out_dack_cb[N].set_callback(std::forward<Object>(cb)); } + template <unsigned N, class Object> devcb_base &set_dma_read_callback(Object &&cb) { return m_dma_read_cb[N].set_callback(std::forward<Object>(cb)); } + template <unsigned N, class Object> devcb_base &set_dma_write_callback(Object &&cb) { return m_dma_write_cb[N].set_callback(std::forward<Object>(cb)); } + template <unsigned N, class Object> devcb_base &set_out_dack_callback(Object &&cb) { return m_out_dack_cb[N].set_callback(std::forward<Object>(cb)); } DECLARE_READ8_MEMBER(read); DECLARE_WRITE8_MEMBER(write); @@ -76,51 +76,51 @@ private: DECLARE_DEVICE_TYPE(UPD71071, upd71071_device) #define MCFG_UPD71071_CPU(tag) \ - upd71071_device::static_set_cpu_tag(*device, ("^" tag)); + downcast<upd71071_device &>(*device).set_cpu_tag(("^" tag)); #define MCFG_UPD71071_CLOCK(clk) \ - upd71071_device::set_clock(*device, (clk)); + downcast<upd71071_device &>(*device).set_clock((clk)); #define MCFG_UPD71071_OUT_HREQ_CB(cb) \ - devcb = &upd71071_device::set_out_hreq_callback(*device, (DEVCB_##cb)); + devcb = &downcast<upd71071_device &>(*device).set_out_hreq_callback((DEVCB_##cb)); #define MCFG_UPD71071_OUT_EOP_CB(cb) \ - devcb = &upd71071_device::set_out_eop_callback(*device, (DEVCB_##cb)); + devcb = &downcast<upd71071_device &>(*device).set_out_eop_callback((DEVCB_##cb)); #define MCFG_UPD71071_DMA_READ_0_CB(cb) \ - devcb = &upd71071_device::set_dma_read_callback<0>(*device, (DEVCB_##cb)); + devcb = &downcast<upd71071_device &>(*device).set_dma_read_callback<0>((DEVCB_##cb)); #define MCFG_UPD71071_DMA_READ_1_CB(cb) \ - devcb = &upd71071_device::set_dma_read_callback<1>(*device, (DEVCB_##cb)); + devcb = &downcast<upd71071_device &>(*device).set_dma_read_callback<1>((DEVCB_##cb)); #define MCFG_UPD71071_DMA_READ_2_CB(cb) \ - devcb = &upd71071_device::set_dma_read_callback<2>(*device, (DEVCB_##cb)); + devcb = &downcast<upd71071_device &>(*device).set_dma_read_callback<2>((DEVCB_##cb)); #define MCFG_UPD71071_DMA_READ_3_CB(cb) \ - devcb = &upd71071_device::set_dma_read_callback<3>(*device, (DEVCB_##cb)); + devcb = &downcast<upd71071_device &>(*device).set_dma_read_callback<3>((DEVCB_##cb)); #define MCFG_UPD71071_DMA_WRITE_0_CB(cb) \ - devcb = &upd71071_device::set_dma_write_callback<0>(*device, (DEVCB_##cb)); + devcb = &downcast<upd71071_device &>(*device).set_dma_write_callback<0>((DEVCB_##cb)); #define MCFG_UPD71071_DMA_WRITE_1_CB(cb) \ - devcb = &upd71071_device::set_dma_write_callback<1>(*device, (DEVCB_##cb)); + devcb = &downcast<upd71071_device &>(*device).set_dma_write_callback<1>((DEVCB_##cb)); #define MCFG_UPD71071_DMA_WRITE_2_CB(cb) \ - devcb = &upd71071_device::set_dma_write_callback<2>(*device, (DEVCB_##cb)); + devcb = &downcast<upd71071_device &>(*device).set_dma_write_callback<2>((DEVCB_##cb)); #define MCFG_UPD71071_DMA_WRITE_3_CB(cb) \ - devcb = &upd71071_device::set_dma_write_callback<3>(*device, (DEVCB_##cb)); + devcb = &downcast<upd71071_device &>(*device).set_dma_write_callback<3>((DEVCB_##cb)); #define MCFG_UPD71071_OUT_DACK_0_CB(cb) \ - devcb = &upd71071_device::set_out_dack_callback<0>(*device, (DEVCB_##cb)); + devcb = &downcast<upd71071_device &>(*device).set_out_dack_callback<0>((DEVCB_##cb)); #define MCFG_UPD71071_OUT_DACK_1_CB(cb) \ - devcb = &upd71071_device::set_out_dack_callback<1>(*device, (DEVCB_##cb)); + devcb = &downcast<upd71071_device &>(*device).set_out_dack_callback<1>((DEVCB_##cb)); #define MCFG_UPD71071_OUT_DACK_2_CB(cb) \ - devcb = &upd71071_device::set_out_dack_callback<2>(*device, (DEVCB_##cb)); + devcb = &downcast<upd71071_device &>(*device).set_out_dack_callback<2>((DEVCB_##cb)); #define MCFG_UPD71071_OUT_DACK_3_CB(cb) \ - devcb = &upd71071_device::set_out_dack_callback<3>(*device, (DEVCB_##cb)); + devcb = &downcast<upd71071_device &>(*device).set_out_dack_callback<3>((DEVCB_##cb)); #endif // MAME_MACHINE_UPD71071_H |