diff options
Diffstat (limited to 'src/devices/cpu/arm7/arm7.h')
-rw-r--r-- | src/devices/cpu/arm7/arm7.h | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/src/devices/cpu/arm7/arm7.h b/src/devices/cpu/arm7/arm7.h index d243c788e00..ca994db6a32 100644 --- a/src/devices/cpu/arm7/arm7.h +++ b/src/devices/cpu/arm7/arm7.h @@ -18,10 +18,10 @@ ******************************************************************************/ -#pragma once +#ifndef MAME_CPU_ARM7_ARM7_H +#define MAME_CPU_ARM7_ARM7_H -#ifndef __ARM7_H__ -#define __ARM7_H__ +#pragma once #include "cpu/drcfe.h" #include "cpu/drcuml.h" @@ -51,9 +51,10 @@ class arm7_cpu_device : public cpu_device public: // construction/destruction arm7_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - arm7_cpu_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, uint8_t archRev, uint8_t archFlags, endianness_t endianness = ENDIANNESS_LITTLE); protected: + arm7_cpu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock, uint8_t archRev, uint8_t archFlags, endianness_t endianness); + // device-level overrides virtual void device_start() override; virtual void device_reset() override; @@ -506,7 +507,6 @@ class arm7_be_cpu_device : public arm7_cpu_device public: // construction/destruction arm7_be_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - }; @@ -515,7 +515,6 @@ class arm7500_cpu_device : public arm7_cpu_device public: // construction/destruction arm7500_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - }; @@ -524,7 +523,6 @@ class arm9_cpu_device : public arm7_cpu_device public: // construction/destruction arm9_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - }; @@ -533,7 +531,6 @@ class arm920t_cpu_device : public arm7_cpu_device public: // construction/destruction arm920t_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - }; @@ -542,7 +539,6 @@ class pxa255_cpu_device : public arm7_cpu_device public: // construction/destruction pxa255_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - }; @@ -551,16 +547,15 @@ class sa1110_cpu_device : public arm7_cpu_device public: // construction/destruction sa1110_cpu_device(const machine_config &mconfig, const char *tag, device_t *owner, uint32_t clock); - }; -extern const device_type ARM7; -extern const device_type ARM7_BE; -extern const device_type ARM7500; -extern const device_type ARM9; -extern const device_type ARM920T; -extern const device_type PXA255; -extern const device_type SA1110; +DECLARE_DEVICE_TYPE(ARM7, arm7_cpu_device) +DECLARE_DEVICE_TYPE(ARM7_BE, arm7_be_cpu_device) +DECLARE_DEVICE_TYPE(ARM7500, arm7500_cpu_device) +DECLARE_DEVICE_TYPE(ARM9, arm9_cpu_device) +DECLARE_DEVICE_TYPE(ARM920T, arm920t_cpu_device) +DECLARE_DEVICE_TYPE(PXA255, pxa255_cpu_device) +DECLARE_DEVICE_TYPE(SA1110, sa1110_cpu_device) -#endif /* __ARM7_H__ */ +#endif // MAME_CPU_ARM7_ARM7_H |