summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/machine/lh5810.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/machine/lh5810.h')
-rw-r--r--src/devices/machine/lh5810.h45
1 files changed, 12 insertions, 33 deletions
diff --git a/src/devices/machine/lh5810.h b/src/devices/machine/lh5810.h
index ffb4fd4ccbe..8e105a01f2e 100644
--- a/src/devices/machine/lh5810.h
+++ b/src/devices/machine/lh5810.h
@@ -6,31 +6,10 @@
**********************************************************************/
-#pragma once
-
-#ifndef __LH5810__
-#define __LH5810__
-
+#ifndef MAME_MACHINE_LH5810_H
+#define MAME_MACHINE_LH5810_H
-//*************************************************************************
-// MACROS / CONSTANTS
-//*************************************************************************
-
-enum
-{
- LH5810_RESET = 4,
- LH5810_U,
- LH5810_L,
- LH5820_F,
- LH5810_OPC,
- LH5810_G,
- LH5810_MSK,
- LH5810_IF,
- LH5810_DDA,
- LH5810_DDB,
- LH5810_OPA,
- LH5810_OPB
-};
+#pragma once
//*************************************************************************
@@ -63,18 +42,18 @@ enum
// ======================> lh5810_device
-class lh5810_device : public device_t
+class lh5810_device : public device_t
{
public:
// construction/destruction
lh5810_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- template<class _Object> static devcb_base &set_porta_r_callback(device_t &device, _Object object) { return downcast<lh5810_device &>(device).m_porta_r_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_porta_w_callback(device_t &device, _Object object) { return downcast<lh5810_device &>(device).m_porta_w_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_portb_r_callback(device_t &device, _Object object) { return downcast<lh5810_device &>(device).m_portb_r_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_portb_w_callback(device_t &device, _Object object) { return downcast<lh5810_device &>(device).m_portb_w_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_portc_w_callback(device_t &device, _Object object) { return downcast<lh5810_device &>(device).m_portc_w_cb.set_callback(object); }
- template<class _Object> static devcb_base &set_out_int_callback(device_t &device, _Object object) { return downcast<lh5810_device &>(device).m_out_int_cb.set_callback(object); }
+ template <class Object> static devcb_base &set_porta_r_callback(device_t &device, Object &&cb) { return downcast<lh5810_device &>(device).m_porta_r_cb.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_porta_w_callback(device_t &device, Object &&cb) { return downcast<lh5810_device &>(device).m_porta_w_cb.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_portb_r_callback(device_t &device, Object &&cb) { return downcast<lh5810_device &>(device).m_portb_r_cb.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_portb_w_callback(device_t &device, Object &&cb) { return downcast<lh5810_device &>(device).m_portb_w_cb.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_portc_w_callback(device_t &device, Object &&cb) { return downcast<lh5810_device &>(device).m_portc_w_cb.set_callback(std::forward<Object>(cb)); }
+ template <class Object> static devcb_base &set_out_int_callback(device_t &device, Object &&cb) { return downcast<lh5810_device &>(device).m_out_int_cb.set_callback(std::forward<Object>(cb)); }
DECLARE_READ8_MEMBER( data_r );
DECLARE_WRITE8_MEMBER( data_w );
@@ -100,6 +79,6 @@ private:
// device type definition
-extern const device_type LH5810;
+DECLARE_DEVICE_TYPE(LH5810, lh5810_device)
-#endif
+#endif // MAME_MACHINE_LH5810_H