diff options
Diffstat (limited to 'src/mame/machine/cammu.h')
-rw-r--r-- | src/mame/machine/cammu.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/mame/machine/cammu.h b/src/mame/machine/cammu.h index 15d0d7a4c66..23265109486 100644 --- a/src/mame/machine/cammu.h +++ b/src/mame/machine/cammu.h @@ -1,10 +1,10 @@ // license:BSD-3-Clause // copyright-holders:Patrick Mackinlay -#pragma once +#ifndef MAME_MACHINE_CAMMU_H +#define MAME_MACHINE_CAMMU_H -#ifndef CAMMU_H_ -#define CAMMU_H_ +#pragma once // the following enables a very crude instruction cache - it has known (future) @@ -18,9 +18,7 @@ class cammu_device : public device_t, public device_memory_interface { public: - cammu_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); - - template<class _Object> static devcb_base &static_set_ssw_callback(device_t &device, _Object object) { return downcast<cammu_device &>(device).m_ssw_func.set_callback(object); } + template <class Object> static devcb_base &static_set_ssw_callback(device_t &device, Object &&cb) { return downcast<cammu_device &>(device).m_ssw_func.set_callback(std::forward<Object>(cb)); } virtual DECLARE_ADDRESS_MAP(map, 32) = 0; @@ -31,6 +29,8 @@ public: DECLARE_WRITE32_MEMBER(cammu_w) { m_cammu[offset] = data; } protected: + cammu_device(const machine_config &mconfig, device_type type, const char *tag, device_t *owner, uint32_t clock); + // device-level overrides virtual void device_start() override; virtual void device_reset() override; @@ -83,8 +83,8 @@ public: }; // device type definitions -extern const device_type CAMMU_C4T; -extern const device_type CAMMU_C4I; -extern const device_type CAMMU_C3; +DECLARE_DEVICE_TYPE(CAMMU_C4T, cammu_c4t_device) +DECLARE_DEVICE_TYPE(CAMMU_C4I, cammu_c4i_device) +DECLARE_DEVICE_TYPE(CAMMU_C3, cammu_c3_device) -#endif +#endif // MAME_MACHINE_CAMMU_H |