diff options
Diffstat (limited to 'src/devices/bus/iq151/iq151.h')
-rw-r--r-- | src/devices/bus/iq151/iq151.h | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/src/devices/bus/iq151/iq151.h b/src/devices/bus/iq151/iq151.h index 22288e2ccb5..649f397d2b9 100644 --- a/src/devices/bus/iq151/iq151.h +++ b/src/devices/bus/iq151/iq151.h @@ -42,8 +42,10 @@ *********************************************************************/ -#ifndef __IQ151CART_H__ -#define __IQ151CART_H__ +#ifndef MAME_BUS_IQ151_IQ151_H +#define MAME_BUS_IQ151_IQ151_H + +#pragma once #include "softlist_dev.h" @@ -57,7 +59,6 @@ class device_iq151cart_interface : public device_slot_card_interface { public: // construction/destruction - device_iq151cart_interface(const machine_config &mconfig, device_t &device); virtual ~device_iq151cart_interface(); // reading and writing @@ -69,6 +70,9 @@ public: // video update virtual void video_update(bitmap_ind16 &bitmap, const rectangle &cliprect) { } + +protected: + device_iq151cart_interface(const machine_config &mconfig, device_t &device); }; // ======================> iq151cart_slot_device @@ -82,12 +86,12 @@ public: iq151cart_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); virtual ~iq151cart_slot_device(); - template<class _Object> static devcb_base &set_out_irq0_callback(device_t &device, _Object object) { return downcast<iq151cart_slot_device &>(device).m_out_irq0_cb.set_callback(object); } - template<class _Object> static devcb_base &set_out_irq1_callback(device_t &device, _Object object) { return downcast<iq151cart_slot_device &>(device).m_out_irq1_cb.set_callback(object); } - template<class _Object> static devcb_base &set_out_irq2_callback(device_t &device, _Object object) { return downcast<iq151cart_slot_device &>(device).m_out_irq2_cb.set_callback(object); } - template<class _Object> static devcb_base &set_out_irq3_callback(device_t &device, _Object object) { return downcast<iq151cart_slot_device &>(device).m_out_irq3_cb.set_callback(object); } - template<class _Object> static devcb_base &set_out_irq4_callback(device_t &device, _Object object) { return downcast<iq151cart_slot_device &>(device).m_out_irq4_cb.set_callback(object); } - template<class _Object> static devcb_base &set_out_drq_callback(device_t &device, _Object object) { return downcast<iq151cart_slot_device &>(device).m_out_drq_cb.set_callback(object); } + template <class Object> static devcb_base &set_out_irq0_callback(device_t &device, Object &&cb) { return downcast<iq151cart_slot_device &>(device).m_out_irq0_cb.set_callback(std::forward<Object>(cb)); } + template <class Object> static devcb_base &set_out_irq1_callback(device_t &device, Object &&cb) { return downcast<iq151cart_slot_device &>(device).m_out_irq1_cb.set_callback(std::forward<Object>(cb)); } + template <class Object> static devcb_base &set_out_irq2_callback(device_t &device, Object &&cb) { return downcast<iq151cart_slot_device &>(device).m_out_irq2_cb.set_callback(std::forward<Object>(cb)); } + template <class Object> static devcb_base &set_out_irq3_callback(device_t &device, Object &&cb) { return downcast<iq151cart_slot_device &>(device).m_out_irq3_cb.set_callback(std::forward<Object>(cb)); } + template <class Object> static devcb_base &set_out_irq4_callback(device_t &device, Object &&cb) { return downcast<iq151cart_slot_device &>(device).m_out_irq4_cb.set_callback(std::forward<Object>(cb)); } + template <class Object> static devcb_base &set_out_drq_callback(device_t &device, Object &&cb) { return downcast<iq151cart_slot_device &>(device).m_out_drq_cb.set_callback(std::forward<Object>(cb)); } // device-level overrides virtual void device_start() override; @@ -127,7 +131,7 @@ public: // device type definition -extern const device_type IQ151CART_SLOT; +DECLARE_DEVICE_TYPE(IQ151CART_SLOT, iq151cart_slot_device) /*************************************************************************** @@ -152,4 +156,4 @@ extern const device_type IQ151CART_SLOT; #define MCFG_IQ151CART_SLOT_OUT_DRQ_CB(_devcb) \ devcb = &iq151cart_slot_device::set_out_drq_callback(*device, DEVCB_##_devcb); -#endif /* __IQ151CART_H__ */ +#endif // MAME_BUS_IQ151_IQ151_H |