summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/machine/8364_paula.h
diff options
context:
space:
mode:
author wilbertpol <wilbertpol@users.noreply.github.com>2018-03-03 18:18:08 +0100
committer Vas Crabb <cuavas@users.noreply.github.com>2018-03-04 04:18:08 +1100
commit3b923d59ccb8d2d8e386392518450006f8e644fe (patch)
tree73c48568e76d69edbde9f96a3f57d173dd05a747 /src/devices/machine/8364_paula.h
parent25472091b626bd01ef47f11389a4b2ebe0fc0008 (diff)
destaticify initializations (nw) (#3289)
* destaticify initializations (nw) * fix this->set_screen (nw)
Diffstat (limited to 'src/devices/machine/8364_paula.h')
-rw-r--r--src/devices/machine/8364_paula.h11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/devices/machine/8364_paula.h b/src/devices/machine/8364_paula.h
index 8e20b6f813a..db9ed3727c0 100644
--- a/src/devices/machine/8364_paula.h
+++ b/src/devices/machine/8364_paula.h
@@ -49,10 +49,10 @@
//**************************************************************************
#define MCFG_PAULA_MEM_READ_CB(_devcb) \
- devcb = &paula_8364_device::set_mem_r_callback(*device, DEVCB_##_devcb);
+ devcb = &downcast<paula_8364_device &>(*device).set_mem_r_callback(DEVCB_##_devcb);
#define MCFG_PAULA_INT_CB(_devcb) \
- devcb = &paula_8364_device::set_int_w_callback(*device, DEVCB_##_devcb);
+ devcb = &downcast<paula_8364_device &>(*device).set_int_w_callback(DEVCB_##_devcb);
//**************************************************************************
@@ -67,11 +67,8 @@ public:
paula_8364_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
// configuration
- template <class Object> static devcb_base &set_mem_r_callback(device_t &device, Object &&cb)
- { return downcast<paula_8364_device &>(device).m_mem_r.set_callback(std::forward<Object>(cb)); }
-
- template <class Object> static devcb_base &set_int_w_callback(device_t &device, Object &&cb)
- { return downcast<paula_8364_device &>(device).m_int_w.set_callback(std::forward<Object>(cb)); }
+ template <class Object> devcb_base &set_mem_r_callback(Object &&cb) { return m_mem_r.set_callback(std::forward<Object>(cb)); }
+ template <class Object> devcb_base &set_int_w_callback(Object &&cb) { return m_int_w.set_callback(std::forward<Object>(cb)); }
DECLARE_READ16_MEMBER(reg_r);
DECLARE_WRITE16_MEMBER(reg_w);