summaryrefslogtreecommitdiffstatshomepage
path: root/src/devices/cpu/m6809/m6809.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/devices/cpu/m6809/m6809.h')
-rw-r--r--src/devices/cpu/m6809/m6809.h41
1 files changed, 11 insertions, 30 deletions
diff --git a/src/devices/cpu/m6809/m6809.h b/src/devices/cpu/m6809/m6809.h
index 64d28a26316..759e37113a5 100644
--- a/src/devices/cpu/m6809/m6809.h
+++ b/src/devices/cpu/m6809/m6809.h
@@ -19,8 +19,6 @@
//**************************************************************************
// 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)
@@ -294,33 +292,7 @@ private:
const char *inputnum_string(int inputnum);
};
-// ======================> mc6809_device
-
-class mc6809_device : public m6809_base_device
-{
-public:
- // construction/destruction
- mc6809_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
-};
-
-// ======================> mc6809e_device
-
-// 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 mc6809e_device : public m6809_base_device
-{
-public:
- // construction/destruction
- 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<mc6809e_device &>(device).m_lic_func.set_callback(object); }
-};
-
-// ======================> m6809_device (LEGACY)
+// ======================> m6809_device
class m6809_device : public m6809_base_device
{
@@ -329,13 +301,20 @@ public:
m6809_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock);
};
-// ======================> m6809e_device (LEGACY)
+// ======================> m6809e_device
+
+#define MCFG_M6809E_LIC_CB(_devcb) \
+ devcb = &m6809e_device::set_lic_cb(*device, DEVCB_##_devcb);
+
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);
+
+ // 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); }
};
enum
@@ -347,4 +326,6 @@ 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