diff options
Diffstat (limited to 'src/devices/bus/a1bus/a1bus.h')
-rw-r--r-- | src/devices/bus/a1bus/a1bus.h | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/src/devices/bus/a1bus/a1bus.h b/src/devices/bus/a1bus/a1bus.h index 38830940525..320a2d9bc80 100644 --- a/src/devices/bus/a1bus/a1bus.h +++ b/src/devices/bus/a1bus/a1bus.h @@ -6,10 +6,10 @@ ***************************************************************************/ -#pragma once +#ifndef MAME_BUS_A1BUS_A1BUS_H +#define MAME_BUS_A1BUS_A1BUS_H -#ifndef __A1BUS_H__ -#define __A1BUS_H__ +#pragma once //************************************************************************** @@ -49,20 +49,22 @@ class a1bus_slot_device : public device_t, public: // construction/destruction a1bus_slot_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - a1bus_slot_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source); - - // device-level overrides - virtual void device_start() override; // inline configuration static void static_set_a1bus_slot(device_t &device, const char *tag, const char *slottag); + protected: + a1bus_slot_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + + // device-level overrides + virtual void device_start() override; + // configuration const char *m_a1bus_tag, *m_a1bus_slottag; }; // device type definition -extern const device_type A1BUS_SLOT; +DECLARE_DEVICE_TYPE(A1BUS_SLOT, a1bus_slot_device) class device_a1bus_card_interface; @@ -72,12 +74,11 @@ class a1bus_device : public device_t public: // construction/destruction a1bus_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - a1bus_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source); // inline configuration static void static_set_cputag(device_t &device, const char *tag); - template<class _Object> static devcb_base &set_out_irq_callback(device_t &device, _Object object) { return downcast<a1bus_device &>(device).m_out_irq_cb.set_callback(object); } - template<class _Object> static devcb_base &set_out_nmi_callback(device_t &device, _Object object) { return downcast<a1bus_device &>(device).m_out_nmi_cb.set_callback(object); } + template <class Object> static devcb_base &set_out_irq_callback(device_t &device, Object &&cb) { return downcast<a1bus_device &>(device).m_out_irq_cb.set_callback(std::forward<Object>(cb)); } + template <class Object> static devcb_base &set_out_nmi_callback(device_t &device, Object &&cb) { return downcast<a1bus_device &>(device).m_out_nmi_cb.set_callback(std::forward<Object>(cb)); } void add_a1bus_card(device_a1bus_card_interface *card); device_a1bus_card_interface *get_a1bus_card(); @@ -92,6 +93,8 @@ public: DECLARE_WRITE_LINE_MEMBER( nmi_w ); protected: + a1bus_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + // device-level overrides virtual void device_start() override; virtual void device_reset() override; @@ -108,7 +111,7 @@ protected: // device type definition -extern const device_type A1BUS; +DECLARE_DEVICE_TYPE(A1BUS, a1bus_device) // ======================> device_a1bus_card_interface @@ -118,7 +121,6 @@ class device_a1bus_card_interface : public device_slot_card_interface friend class a1bus_device; public: // construction/destruction - device_a1bus_card_interface(const machine_config &mconfig, device_t &device); virtual ~device_a1bus_card_interface(); device_a1bus_card_interface *next() const { return m_next; } @@ -135,10 +137,13 @@ public: // inline configuration static void static_set_a1bus_tag(device_t &device, const char *tag, const char *slottag); -public: + +protected: + device_a1bus_card_interface(const machine_config &mconfig, device_t &device); + a1bus_device *m_a1bus; const char *m_a1bus_tag, *m_a1bus_slottag; device_a1bus_card_interface *m_next; }; -#endif /* __A1BUS_H__ */ +#endif // MAME_BUS_A1BUS_A1BUS_H |