summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/machine/midwayic.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/machine/midwayic.h')
-rw-r--r--src/mame/machine/midwayic.h32
1 files changed, 16 insertions, 16 deletions
diff --git a/src/mame/machine/midwayic.h b/src/mame/machine/midwayic.h
index 1a55043cd65..e682f9d451c 100644
--- a/src/mame/machine/midwayic.h
+++ b/src/mame/machine/midwayic.h
@@ -23,7 +23,7 @@ public:
// construction/destruction
midway_serial_pic_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- static void static_set_upper(device_t &device, int upper) { downcast<midway_serial_pic_device &>(device).m_upper = upper; }
+ void set_upper(int upper) { m_upper = upper; }
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
@@ -54,7 +54,7 @@ private:
DECLARE_DEVICE_TYPE(MIDWAY_SERIAL_PIC, midway_serial_pic_device)
#define MCFG_MIDWAY_SERIAL_PIC_UPPER(_upper) \
- midway_serial_pic_device::static_set_upper(*device, _upper);
+ downcast<midway_serial_pic_device &>(*device).set_upper(_upper);
/* 1st generation Midway serial PIC - emulation */
@@ -96,7 +96,7 @@ public:
// construction/destruction
midway_serial_pic2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- static void static_set_yearoffs(device_t &device, int yearoffs) { downcast<midway_serial_pic2_device &>(device).m_yearoffs = yearoffs; }
+ void set_yearoffs(int yearoffs) { m_yearoffs = yearoffs; }
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
@@ -143,7 +143,7 @@ DECLARE_DEVICE_TYPE(MIDWAY_SERIAL_PIC2, midway_serial_pic2_device)
#define MCFG_MIDWAY_SERIAL_PIC2_UPPER MCFG_MIDWAY_SERIAL_PIC_UPPER
#define MCFG_MIDWAY_SERIAL_PIC2_YEAR_OFFS(_yearoffs) \
- midway_serial_pic2_device::static_set_yearoffs(*device, _yearoffs);
+ downcast<midway_serial_pic2_device &>(*device).set_yearoffs(_yearoffs);
/* I/O ASIC connected to 2nd generation PIC */
@@ -155,12 +155,12 @@ public:
// construction/destruction
midway_ioasic_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- static void static_set_shuffle(device_t &device, uint8_t shuffle) { downcast<midway_ioasic_device &>(device).m_shuffle_type = shuffle; }
- static void static_set_shuffle_default(device_t &device, uint8_t shuffle) { downcast<midway_ioasic_device &>(device).m_shuffle_default = shuffle; }
- static void static_set_auto_ack(device_t &device, uint8_t auto_ack) { downcast<midway_ioasic_device &>(device).m_auto_ack = auto_ack; }
- template<class _Object> static devcb_base &set_irqhandler_callback(device_t &device, _Object object) { return downcast<midway_ioasic_device &>(device).m_irq_callback.set_callback(object); }
- template<class _Object> static devcb_base &set_serial_tx_callback(device_t &device, _Object object) { return downcast<midway_ioasic_device &>(device).m_serial_tx_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_aux_output_callback(device_t &device, _Object object) { return downcast<midway_ioasic_device &>(device).m_aux_output_cb.set_callback(object); }
+ void set_shuffle(uint8_t shuffle) { m_shuffle_type = shuffle; }
+ void set_shuffle_default(uint8_t shuffle) { m_shuffle_default = shuffle; }
+ void set_auto_ack(uint8_t auto_ack) { m_auto_ack = auto_ack; }
+ template<class _Object> devcb_base &set_irqhandler_callback(_Object object) { return m_irq_callback.set_callback(object); }
+ template<class _Object> devcb_base &set_serial_tx_callback(_Object object) { return m_serial_tx_cb.set_callback(object); }
+ template<class _Object> devcb_base &set_aux_output_callback(_Object object) { return m_aux_output_cb.set_callback(object); }
void set_shuffle_state(int state);
void fifo_w(uint16_t data);
@@ -228,22 +228,22 @@ DECLARE_DEVICE_TYPE(MIDWAY_IOASIC, midway_ioasic_device)
#define MCFG_MIDWAY_IOASIC_YEAR_OFFS MCFG_MIDWAY_SERIAL_PIC2_YEAR_OFFS
#define MCFG_MIDWAY_IOASIC_SHUFFLE(_shuffle) \
- midway_ioasic_device::static_set_shuffle(*device, _shuffle);
+ downcast<midway_ioasic_device &>(*device).set_shuffle(_shuffle);
#define MCFG_MIDWAY_IOASIC_SHUFFLE_DEFAULT(_shuffle) \
- midway_ioasic_device::static_set_shuffle_default(*device, _shuffle);
+ downcast<midway_ioasic_device &>(*device).set_shuffle_default(_shuffle);
#define MCFG_MIDWAY_IOASIC_IRQ_CALLBACK(_write) \
- devcb = &midway_ioasic_device::set_irqhandler_callback(*device, DEVCB_##_write);
+ devcb = &downcast<midway_ioasic_device &>(*device).set_irqhandler_callback(DEVCB_##_write);
#define MCFG_MIDWAY_IOASIC_AUTO_ACK(_ack) \
- midway_ioasic_device::static_set_auto_ack(*device, _ack);
+ downcast<midway_ioasic_device &>(*device).set_auto_ack(_ack);
#define MCFG_MIDWAY_IOASIC_OUT_TX_CB(_devcb) \
- devcb = &midway_ioasic_device::set_serial_tx_callback(*device, DEVCB_##_devcb);
+ devcb = &downcast<midway_ioasic_device &>(*device).set_serial_tx_callback(DEVCB_##_devcb);
#define MCFG_MIDWAY_IOASIC_AUX_OUT_CB(_devcb) \
- devcb = &midway_ioasic_device::set_aux_output_callback(*device, DEVCB_##_devcb);
+ devcb = &downcast<midway_ioasic_device &>(*device).set_aux_output_callback(DEVCB_##_devcb);
enum