summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/machine/40105.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/machine/40105.h')
-rw-r--r--src/devices/machine/40105.h17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/devices/machine/40105.h b/src/devices/machine/40105.h
index e65fb31f381..2197fddbf8b 100644
--- a/src/devices/machine/40105.h
+++ b/src/devices/machine/40105.h
@@ -17,10 +17,10 @@
**********************************************************************/
-#pragma once
+#ifndef MAME_MACHINE_40105_H
+#define MAME_MACHINE_40105_H
-#ifndef __CMOS_40105__
-#define __CMOS_40105__
+#pragma once
#include <queue>
@@ -53,9 +53,9 @@ public:
// construction/destruction
cmos_40105_device(const machine_config &mconfig, const char *tag, device_t *owner, u32 clock);
- template<class _dir> devcb_base &set_dir_callback(_dir dir) { return m_write_dir.set_callback(dir); }
- template<class _dor> devcb_base &set_dor_callback(_dor dor) { return m_write_dor.set_callback(dor); }
- template<class _out> devcb_base &set_data_out_callback(_out out) { return m_write_q.set_callback(out); }
+ template <class Object> devcb_base &set_dir_callback(Object &&dir) { return m_write_dir.set_callback(std::forward<Object>(dir)); }
+ template <class Object> devcb_base &set_dor_callback(Object &&dor) { return m_write_dor.set_callback(std::forward<Object>(dor)); }
+ template <class Object> devcb_base &set_data_out_callback(Object &&out) { return m_write_q.set_callback(std::forward<Object>(out)); }
u8 read();
void write(u8 data);
@@ -95,8 +95,7 @@ private:
// device type definition
-extern const device_type CD40105;
+DECLARE_DEVICE_TYPE(CD40105, cmos_40105_device)
extern const device_type HC40105;
-
-#endif
+#endif // MAME_MACHINE_40105_H