diff options
Diffstat (limited to 'src/devices/machine/latch.h')
-rw-r--r-- | src/devices/machine/latch.h | 59 |
1 files changed, 21 insertions, 38 deletions
diff --git a/src/devices/machine/latch.h b/src/devices/machine/latch.h index d4e49ed838b..8c93a40f8b0 100644 --- a/src/devices/machine/latch.h +++ b/src/devices/machine/latch.h @@ -1,45 +1,42 @@ // license:BSD-3-Clause // copyright-holders:smf -#ifndef __LATCH_H__ -#define __LATCH_H__ +#ifndef MAME_MACHINE_LATCH_H +#define MAME_MACHINE_LATCH_H + +#pragma once + #define MCFG_OUTPUT_LATCH_BIT0_HANDLER(_devcb) \ - devcb = &output_latch_device::set_bit0_handler(*device, DEVCB_##_devcb); + devcb = &output_latch_device::set_bit_handler<0>(*device, DEVCB_##_devcb); #define MCFG_OUTPUT_LATCH_BIT1_HANDLER(_devcb) \ - devcb = &output_latch_device::set_bit1_handler(*device, DEVCB_##_devcb); + devcb = &output_latch_device::set_bit_handler<1>(*device, DEVCB_##_devcb); #define MCFG_OUTPUT_LATCH_BIT2_HANDLER(_devcb) \ - devcb = &output_latch_device::set_bit2_handler(*device, DEVCB_##_devcb); + devcb = &output_latch_device::set_bit_handler<2>(*device, DEVCB_##_devcb); #define MCFG_OUTPUT_LATCH_BIT3_HANDLER(_devcb) \ - devcb = &output_latch_device::set_bit3_handler(*device, DEVCB_##_devcb); + devcb = &output_latch_device::set_bit_handler<3>(*device, DEVCB_##_devcb); #define MCFG_OUTPUT_LATCH_BIT4_HANDLER(_devcb) \ - devcb = &output_latch_device::set_bit4_handler(*device, DEVCB_##_devcb); + devcb = &output_latch_device::set_bit_handler<4>(*device, DEVCB_##_devcb); #define MCFG_OUTPUT_LATCH_BIT5_HANDLER(_devcb) \ - devcb = &output_latch_device::set_bit5_handler(*device, DEVCB_##_devcb); + devcb = &output_latch_device::set_bit_handler<5>(*device, DEVCB_##_devcb); #define MCFG_OUTPUT_LATCH_BIT6_HANDLER(_devcb) \ - devcb = &output_latch_device::set_bit6_handler(*device, DEVCB_##_devcb); + devcb = &output_latch_device::set_bit_handler<6>(*device, DEVCB_##_devcb); #define MCFG_OUTPUT_LATCH_BIT7_HANDLER(_devcb) \ - devcb = &output_latch_device::set_bit7_handler(*device, DEVCB_##_devcb); + devcb = &output_latch_device::set_bit_handler<7>(*device, DEVCB_##_devcb); class output_latch_device : public device_t { public: output_latch_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - template<class _Object> static devcb_base &set_bit0_handler(device_t &device, _Object object) { return downcast<output_latch_device &>(device).m_bit0_handler.set_callback(object); } - template<class _Object> static devcb_base &set_bit1_handler(device_t &device, _Object object) { return downcast<output_latch_device &>(device).m_bit1_handler.set_callback(object); } - template<class _Object> static devcb_base &set_bit2_handler(device_t &device, _Object object) { return downcast<output_latch_device &>(device).m_bit2_handler.set_callback(object); } - template<class _Object> static devcb_base &set_bit3_handler(device_t &device, _Object object) { return downcast<output_latch_device &>(device).m_bit3_handler.set_callback(object); } - template<class _Object> static devcb_base &set_bit4_handler(device_t &device, _Object object) { return downcast<output_latch_device &>(device).m_bit4_handler.set_callback(object); } - template<class _Object> static devcb_base &set_bit5_handler(device_t &device, _Object object) { return downcast<output_latch_device &>(device).m_bit5_handler.set_callback(object); } - template<class _Object> static devcb_base &set_bit6_handler(device_t &device, _Object object) { return downcast<output_latch_device &>(device).m_bit6_handler.set_callback(object); } - template<class _Object> static devcb_base &set_bit7_handler(device_t &device, _Object object) { return downcast<output_latch_device &>(device).m_bit7_handler.set_callback(object); } + template <unsigned Bit, class Object> static devcb_base &set_bit_handler(device_t &device, Object &&cb) + { return downcast<output_latch_device &>(device).m_bit_handlers[Bit].set_callback(std::forward<Object>(cb)); } void write(uint8_t data); DECLARE_WRITE8_MEMBER(write) { write(data); } @@ -48,27 +45,13 @@ protected: virtual void device_start() override; private: - bool m_resolved; + devcb_write_line m_bit_handlers[8]; - int m_bit0; - int m_bit1; - int m_bit2; - int m_bit3; - int m_bit4; - int m_bit5; - int m_bit6; - int m_bit7; - - devcb_write_line m_bit0_handler; - devcb_write_line m_bit1_handler; - devcb_write_line m_bit2_handler; - devcb_write_line m_bit3_handler; - devcb_write_line m_bit4_handler; - devcb_write_line m_bit5_handler; - devcb_write_line m_bit6_handler; - devcb_write_line m_bit7_handler; + int m_bits[8]; + + bool m_resolved; }; -extern const device_type OUTPUT_LATCH; +DECLARE_DEVICE_TYPE(OUTPUT_LATCH, output_latch_device) -#endif +#endif // MAME_MACHINE_LATCH_H |