summaryrefslogtreecommitdiffstatshomepage
path: root/src/mame/machine/decopincpu.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/mame/machine/decopincpu.h')
-rw-r--r--src/mame/machine/decopincpu.h60
1 files changed, 34 insertions, 26 deletions
diff --git a/src/mame/machine/decopincpu.h b/src/mame/machine/decopincpu.h
index 73385b3ea99..cb40d0b26f9 100644
--- a/src/mame/machine/decopincpu.h
+++ b/src/mame/machine/decopincpu.h
@@ -6,8 +6,10 @@
* Created on: 10/07/2013
*/
-#ifndef DECOPINCPU_H_
-#define DECOPINCPU_H_
+#ifndef MAME_MACHINE_DECOPINCPU_H
+#define MAME_MACHINE_DECOPINCPU_H
+
+#pragma once
#include "cpu/m6800/m6800.h"
#include "machine/6821pia.h"
@@ -64,24 +66,16 @@ class decocpu_type1_device : public device_t
{
public:
decocpu_type1_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- decocpu_type1_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
- required_device<cpu_device> m_cpu;
- required_device<pia6821_device> m_pia21;
- required_device<pia6821_device> m_pia24;
- required_device<pia6821_device> m_pia28;
- required_device<pia6821_device> m_pia2c;
- required_device<pia6821_device> m_pia30;
- required_device<pia6821_device> m_pia34;
// callbacks
- template<class _disp_r> void set_display_read_callback(_disp_r disp_r) { m_read_display.set_callback(disp_r); }
- template<class _disp_w> void set_display_write_callback(_disp_w disp_w) { m_write_display.set_callback(disp_w); }
- template<class _dmdstat_r> void set_dmdstatus_read_callback(_dmdstat_r dmdstat_r) { m_read_dmdstatus.set_callback(dmdstat_r); }
- template<class _soundlatch_w> void set_soundlatch_write_callback(_soundlatch_w slatch_w) { m_write_soundlatch.set_callback(slatch_w); }
- template<class _switch_r> void set_switch_read_callback(_switch_r switch_r) { m_read_switch.set_callback(switch_r); }
- template<class _switch_w> void set_switch_write_callback(_switch_w switch_w) { m_write_switch.set_callback(switch_w); }
- template<class _lamp_w> void set_lamp_write_callback(_lamp_w lamp_w) { m_write_lamp.set_callback(lamp_w); }
- template<class _sol_w> void set_solenoid_write_callback(_sol_w sol_w) { m_write_solenoid.set_callback(sol_w); }
+ template <class Object> void set_display_read_callback(Object &&cb) { m_read_display.set_callback(std::forward<Object>(cb)); }
+ template <class Object> void set_display_write_callback(Object &&cb) { m_write_display.set_callback(std::forward<Object>(cb)); }
+ template <class Object> void set_dmdstatus_read_callback(Object &&cb) { m_read_dmdstatus.set_callback(std::forward<Object>(cb)); }
+ template <class Object> void set_soundlatch_write_callback(Object &&cb) { m_write_soundlatch.set_callback(std::forward<Object>(cb)); }
+ template <class Object> void set_switch_read_callback(Object &&cb) { m_read_switch.set_callback(std::forward<Object>(cb)); }
+ template <class Object> void set_switch_write_callback(Object &&cb) { m_write_switch.set_callback(std::forward<Object>(cb)); }
+ template <class Object> void set_lamp_write_callback(Object &&cb) { m_write_lamp.set_callback(std::forward<Object>(cb)); }
+ template <class Object> void set_solenoid_write_callback(Object &&cb) { m_write_solenoid.set_callback(std::forward<Object>(cb)); }
DECLARE_WRITE_LINE_MEMBER(cpu_pia_irq);
DECLARE_WRITE_LINE_MEMBER(pia21_ca2_w);
@@ -106,12 +100,23 @@ public:
static void static_set_cpuregion(device_t &device, const char *tag);
protected:
+ static constexpr device_timer_id TIMER_IRQ = 0;
+
+ decocpu_type1_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
// overrides
virtual machine_config_constructor device_mconfig_additions() const override;
virtual void device_start() override;
virtual ioport_constructor device_input_ports() const override;
virtual void device_timer(emu_timer &timer, device_timer_id id, int param, void *ptr) override;
- static const device_timer_id TIMER_IRQ = 0;
+
+ required_device<cpu_device> m_cpu;
+ required_device<pia6821_device> m_pia21;
+ required_device<pia6821_device> m_pia24;
+ required_device<pia6821_device> m_pia28;
+ required_device<pia6821_device> m_pia2c;
+ required_device<pia6821_device> m_pia30;
+ required_device<pia6821_device> m_pia34;
private:
const char* m_cputag; // region for cpu board code and data
@@ -134,8 +139,10 @@ class decocpu_type2_device : public decocpu_type1_device
{
public:
decocpu_type2_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- decocpu_type2_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
+
protected:
+ decocpu_type2_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
// overrides
virtual machine_config_constructor device_mconfig_additions() const override;
virtual void device_start() override;
@@ -145,9 +152,10 @@ class decocpu_type3_device : public decocpu_type2_device
{
public:
decocpu_type3_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
- decocpu_type3_device(const machine_config &mconfig, device_type type, const char *name, const char *tag, device_t *owner, uint32_t clock, const char *shortname, const char *source);
protected:
+ decocpu_type3_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock);
+
// overrides
virtual void device_start() override;
};
@@ -162,9 +170,9 @@ protected:
virtual void device_start() override;
};
-extern const device_type DECOCPU1;
-extern const device_type DECOCPU2;
-extern const device_type DECOCPU3;
-extern const device_type DECOCPU3B;
+DECLARE_DEVICE_TYPE(DECOCPU1, decocpu_type1_device)
+DECLARE_DEVICE_TYPE(DECOCPU2, decocpu_type2_device)
+DECLARE_DEVICE_TYPE(DECOCPU3, decocpu_type3_device)
+DECLARE_DEVICE_TYPE(DECOCPU3B, decocpu_type3b_device)
-#endif /* DECOPINCPU_H_ */
+#endif // MAME_MACHINE_DECOPINCPU_H