summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/machine/mm74c922.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/machine/mm74c922.h')
-rw-r--r--src/devices/machine/mm74c922.h32
1 files changed, 16 insertions, 16 deletions
diff --git a/src/devices/machine/mm74c922.h b/src/devices/machine/mm74c922.h
index 819731e3710..f3dc274ecc5 100644
--- a/src/devices/machine/mm74c922.h
+++ b/src/devices/machine/mm74c922.h
@@ -43,28 +43,28 @@
//**************************************************************************
#define MCFG_MM74C922_OSC(_value) \
- mm74c922_device::static_set_cap_osc(*device, _value);
+ downcast<mm74c922_device &>(*device).set_cap_osc(_value);
#define MCFG_MM74C922_DEBOUNCE(_value) \
- mm74c922_device::static_set_cap_debounce(*device, _value);
+ downcast<mm74c922_device &>(*device).set_cap_debounce(_value);
#define MCFG_MM74C922_DA_CALLBACK(_write) \
- devcb = &mm74c922_device::set_da_wr_callback(*device, DEVCB_##_write);
+ devcb = &downcast<mm74c922_device &>(*device).set_da_wr_callback(DEVCB_##_write);
#define MCFG_MM74C922_X1_CALLBACK(_read) \
- devcb = &mm74c922_device::set_x1_rd_callback(*device, DEVCB_##_read);
+ devcb = &downcast<mm74c922_device &>(*device).set_x1_rd_callback(DEVCB_##_read);
#define MCFG_MM74C922_X2_CALLBACK(_read) \
- devcb = &mm74c922_device::set_x2_rd_callback(*device, DEVCB_##_read);
+ devcb = &downcast<mm74c922_device &>(*device).set_x2_rd_callback(DEVCB_##_read);
#define MCFG_MM74C922_X3_CALLBACK(_read) \
- devcb = &mm74c922_device::set_x3_rd_callback(*device, DEVCB_##_read);
+ devcb = &downcast<mm74c922_device &>(*device).set_x3_rd_callback(DEVCB_##_read);
#define MCFG_MM74C922_X4_CALLBACK(_read) \
- devcb = &mm74c922_device::set_x4_rd_callback(*device, DEVCB_##_read);
+ devcb = &downcast<mm74c922_device &>(*device).set_x4_rd_callback(DEVCB_##_read);
#define MCFG_MM74C922_X5_CALLBACK(_read) \
- devcb = &mm74c922_device::set_x5_rd_callback(*device, DEVCB_##_read);
+ devcb = &downcast<mm74c922_device &>(*device).set_x5_rd_callback(DEVCB_##_read);
@@ -80,15 +80,15 @@ public:
// construction/destruction
mm74c922_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- static void static_set_cap_osc(device_t &device, double value) { downcast<mm74c922_device &>(device).m_cap_osc = value; }
- static void static_set_cap_debounce(device_t &device, double value) { downcast<mm74c922_device &>(device).m_cap_debounce = value; }
+ void set_cap_osc(double value) { m_cap_osc = value; }
+ void set_cap_debounce(double value) { m_cap_debounce = value; }
- template <class Object> static devcb_base &set_da_wr_callback(device_t &device, Object &&cb) { return downcast<mm74c922_device &>(device).m_write_da.set_callback(std::forward<Object>(cb)); }
- template <class Object> static devcb_base &set_x1_rd_callback(device_t &device, Object &&cb) { return downcast<mm74c922_device &>(device).m_read_x1.set_callback(std::forward<Object>(cb)); }
- template <class Object> static devcb_base &set_x2_rd_callback(device_t &device, Object &&cb) { return downcast<mm74c922_device &>(device).m_read_x2.set_callback(std::forward<Object>(cb)); }
- template <class Object> static devcb_base &set_x3_rd_callback(device_t &device, Object &&cb) { return downcast<mm74c922_device &>(device).m_read_x3.set_callback(std::forward<Object>(cb)); }
- template <class Object> static devcb_base &set_x4_rd_callback(device_t &device, Object &&cb) { return downcast<mm74c922_device &>(device).m_read_x4.set_callback(std::forward<Object>(cb)); }
- template <class Object> static devcb_base &set_x5_rd_callback(device_t &device, Object &&cb) { return downcast<mm74c922_device &>(device).m_read_x5.set_callback(std::forward<Object>(cb)); }
+ template <class Object> devcb_base &set_da_wr_callback(Object &&cb) { return m_write_da.set_callback(std::forward<Object>(cb)); }
+ template <class Object> devcb_base &set_x1_rd_callback(Object &&cb) { return m_read_x1.set_callback(std::forward<Object>(cb)); }
+ template <class Object> devcb_base &set_x2_rd_callback(Object &&cb) { return m_read_x2.set_callback(std::forward<Object>(cb)); }
+ template <class Object> devcb_base &set_x3_rd_callback(Object &&cb) { return m_read_x3.set_callback(std::forward<Object>(cb)); }
+ template <class Object> devcb_base &set_x4_rd_callback(Object &&cb) { return m_read_x4.set_callback(std::forward<Object>(cb)); }
+ template <class Object> devcb_base &set_x5_rd_callback(Object &&cb) { return m_read_x5.set_callback(std::forward<Object>(cb)); }
uint8_t read();