summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/machine/upd1990a.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/machine/upd1990a.h')
-rw-r--r--src/devices/machine/upd1990a.h26
1 files changed, 12 insertions, 14 deletions
diff --git a/src/devices/machine/upd1990a.h b/src/devices/machine/upd1990a.h
index af901ce798c..a9438b836e9 100644
--- a/src/devices/machine/upd1990a.h
+++ b/src/devices/machine/upd1990a.h
@@ -16,10 +16,10 @@
**********************************************************************/
-#pragma once
+#ifndef MAME_MACHINE_UPD1990A_H
+#define MAME_MACHINE_UPD1990A_H
-#ifndef __UPD1990A__
-#define __UPD1990A__
+#pragma once
#include "dirtc.h"
@@ -47,16 +47,14 @@
// ======================> upd1990a_device
-class upd1990a_device : public device_t,
- public device_rtc_interface
+class upd1990a_device : public device_t, public device_rtc_interface
{
public:
// construction/destruction
- upd1990a_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, uint32_t variant, const char *shortname, const char *source);
upd1990a_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- template<class _data> void set_data_callback(_data data) { m_write_data.set_callback(data); }
- template<class _tp> void set_tp_callback(_tp tp) { m_write_tp.set_callback(tp); }
+ template <class Object> void set_data_callback(Object &&data) { m_write_data.set_callback(std::forward<Object>(data)); }
+ template <class Object> void set_tp_callback(Object &&tp) { m_write_tp.set_callback(std::forward<Object>(tp)); }
DECLARE_WRITE_LINE_MEMBER( oe_w );
DECLARE_WRITE_LINE_MEMBER( cs_w );
@@ -71,6 +69,8 @@ public:
protected:
// device-level overrides
+ upd1990a_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, uint32_t variant);
+
virtual void device_start() override;
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
@@ -130,7 +130,7 @@ private:
bool m_testmode; // testmode active
- int m_variant;
+ int const m_variant;
// timers
emu_timer *m_timer_clock;
@@ -153,9 +153,7 @@ public:
// device type definitions
-extern const device_type UPD1990A;
-extern const device_type UPD4990A;
-
-
+DECLARE_DEVICE_TYPE(UPD1990A, upd1990a_device)
+DECLARE_DEVICE_TYPE(UPD4990A, upd4990a_device)
-#endif
+#endif // MAME_MACHINE_UPD1990A_H