summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/machine/rp5c15.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/machine/rp5c15.h')
-rw-r--r--src/devices/machine/rp5c15.h16
1 files changed, 7 insertions, 9 deletions
diff --git a/src/devices/machine/rp5c15.h b/src/devices/machine/rp5c15.h
index 32c7a7a74ed..128d2da6d2c 100644
--- a/src/devices/machine/rp5c15.h
+++ b/src/devices/machine/rp5c15.h
@@ -18,10 +18,10 @@
**********************************************************************/
-#pragma once
+#ifndef MAME_MACHINE_RP5C15_H
+#define MAME_MACHINE_RP5C15_H
-#ifndef __RP5C15__
-#define __RP5C15__
+#pragma once
#include "dirtc.h"
@@ -50,8 +50,8 @@ public:
// construction/destruction
rp5c15_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- template<class _Object> static devcb_base &set_out_alarm_callback(device_t &device, _Object object) { return downcast<rp5c15_device &>(device).m_out_alarm_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_out_clkout_callback(device_t &device, _Object object) { return downcast<rp5c15_device &>(device).m_out_clkout_cb.set_callback(object); }
+ template <class Object> static devcb_base &set_out_alarm_callback(device_t &device, Object &&cb) { return downcast<rp5c15_device &>(device).m_out_alarm_cb.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_out_clkout_callback(device_t &device, Object &&cb) { return downcast<rp5c15_device &>(device).m_out_clkout_cb.set_callback(std::forward<Object>(cb)); }
DECLARE_READ8_MEMBER( read );
DECLARE_WRITE8_MEMBER( write );
@@ -97,8 +97,6 @@ private:
// device type definition
-extern const device_type RP5C15;
-
-
+DECLARE_DEVICE_TYPE(RP5C15, rp5c15_device)
-#endif
+#endif // MAME_MACHINE_RP5C15_H