diff options
author | 2017-12-13 21:31:27 -0700 | |
---|---|---|
committer | 2017-12-13 21:31:27 -0700 | |
commit | 9ece34eb218c5c1960468294c733fd00ac7fa696 (patch) | |
tree | 7160ed8d2cbe2127aaaef0a21f8736403b0f8a7c /src/devices/cpu/m6809/m6809.h | |
parent | 54155441e9ba9941e85d80c4834a66376a11e791 (diff) |
Revert "Revert "Merge branch 'master' of https://github.com/mamedev/mame""
This reverts commit 54155441e9ba9941e85d80c4834a66376a11e791.
Diffstat (limited to 'src/devices/cpu/m6809/m6809.h')
-rw-r--r-- | src/devices/cpu/m6809/m6809.h | 41 |
1 files changed, 30 insertions, 11 deletions
diff --git a/src/devices/cpu/m6809/m6809.h b/src/devices/cpu/m6809/m6809.h index 759e37113a5..64d28a26316 100644 --- a/src/devices/cpu/m6809/m6809.h +++ b/src/devices/cpu/m6809/m6809.h @@ -19,6 +19,8 @@ //************************************************************************** // device type definition +DECLARE_DEVICE_TYPE(MC6809, mc6809_device) +DECLARE_DEVICE_TYPE(MC6809E, mc6809e_device) DECLARE_DEVICE_TYPE(M6809, m6809_device) DECLARE_DEVICE_TYPE(M6809E, m6809e_device) @@ -292,29 +294,48 @@ private: const char *inputnum_string(int inputnum); }; -// ======================> m6809_device +// ======================> mc6809_device -class m6809_device : public m6809_base_device +class mc6809_device : public m6809_base_device { public: // construction/destruction - m6809_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + mc6809_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); }; -// ======================> m6809e_device +// ======================> mc6809e_device -#define MCFG_M6809E_LIC_CB(_devcb) \ - devcb = &m6809e_device::set_lic_cb(*device, DEVCB_##_devcb); +// MC6809E has LIC line to indicate opcode/data fetch +#define MCFG_MC6809E_LIC_CB(_devcb) \ + devcb = &mc6809e_device::set_lic_cb(*device, DEVCB_##_devcb); -class m6809e_device : public m6809_base_device +class mc6809e_device : public m6809_base_device { public: // construction/destruction - m6809e_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); + mc6809e_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); // static configuration helpers - template<class _Object> static devcb_base &set_lic_cb(device_t &device, _Object object) { return downcast<m6809e_device &>(device).m_lic_func.set_callback(object); } + template<class _Object> static devcb_base &set_lic_cb(device_t &device, _Object object) { return downcast<mc6809e_device &>(device).m_lic_func.set_callback(object); } +}; + +// ======================> m6809_device (LEGACY) + +class m6809_device : public m6809_base_device +{ +public: + // construction/destruction + m6809_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); +}; + +// ======================> m6809e_device (LEGACY) + +class m6809e_device : public m6809_base_device +{ +public: + // construction/destruction + m6809e_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); }; enum @@ -326,6 +347,4 @@ enum #define M6809_IRQ_LINE 0 /* IRQ line number */ #define M6809_FIRQ_LINE 1 /* FIRQ line number */ -/* M6809e has LIC line to indicate opcode/data fetch */ - #endif // MAME_CPU_M6809_M6809_H |