summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/bus/bbc/1mhzbus/1mhzbus.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/bus/bbc/1mhzbus/1mhzbus.h')
-rw-r--r--src/devices/bus/bbc/1mhzbus/1mhzbus.h21
1 files changed, 11 insertions, 10 deletions
diff --git a/src/devices/bus/bbc/1mhzbus/1mhzbus.h b/src/devices/bus/bbc/1mhzbus/1mhzbus.h
index f8b5f4083f9..450e7fd8357 100644
--- a/src/devices/bus/bbc/1mhzbus/1mhzbus.h
+++ b/src/devices/bus/bbc/1mhzbus/1mhzbus.h
@@ -72,10 +72,10 @@
**********************************************************************/
-#pragma once
+#ifndef MAME_BUS_BBC_1MHZBUS_1MHZBUS_H
+#define MAME_BUS_BBC_1MHZBUS_1MHZBUS_H
-#ifndef __BBC_1MHZBUS_SLOT__
-#define __BBC_1MHZBUS_SLOT__
+#pragma once
@@ -122,11 +122,11 @@ public:
virtual ~bbc_1mhzbus_slot_device();
// callbacks
- template<class _Object> static devcb_base &set_irq_handler(device_t &device, _Object object)
- { return downcast<bbc_1mhzbus_slot_device &>(device).m_irq_handler.set_callback(object); }
+ template <class Object> static devcb_base &set_irq_handler(device_t &device, Object &&cb)
+ { return downcast<bbc_1mhzbus_slot_device &>(device).m_irq_handler.set_callback(std::forward<Object>(cb)); }
- template<class _Object> static devcb_base &set_nmi_handler(device_t &device, _Object object)
- { return downcast<bbc_1mhzbus_slot_device &>(device).m_nmi_handler.set_callback(object); }
+ template <class Object> static devcb_base &set_nmi_handler(device_t &device, Object &&cb)
+ { return downcast<bbc_1mhzbus_slot_device &>(device).m_nmi_handler.set_callback(std::forward<Object>(cb)); }
DECLARE_WRITE_LINE_MEMBER( irq_w ) { m_irq_handler(state); }
DECLARE_WRITE_LINE_MEMBER( nmi_w ) { m_nmi_handler(state); }
@@ -150,19 +150,20 @@ class device_bbc_1mhzbus_interface : public device_slot_card_interface
{
public:
// construction/destruction
- device_bbc_1mhzbus_interface(const machine_config &mconfig, device_t &device);
virtual ~device_bbc_1mhzbus_interface();
protected:
+ device_bbc_1mhzbus_interface(const machine_config &mconfig, device_t &device);
+
bbc_1mhzbus_slot_device *m_slot;
};
// device type definition
-extern const device_type BBC_1MHZBUS_SLOT;
+DECLARE_DEVICE_TYPE(BBC_1MHZBUS_SLOT, bbc_1mhzbus_slot_device)
SLOT_INTERFACE_EXTERN( bbcb_1mhzbus_devices );
SLOT_INTERFACE_EXTERN( bbcm_1mhzbus_devices );
-#endif
+#endif // MAME_BUS_BBC_1MHZBUS_1MHZBUS_H