diff options
Diffstat (limited to 'src/devices/cpu/psx/psx.h')
-rw-r--r-- | src/devices/cpu/psx/psx.h | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/src/devices/cpu/psx/psx.h b/src/devices/cpu/psx/psx.h index fd210ae3220..417eecaae1a 100644 --- a/src/devices/cpu/psx/psx.h +++ b/src/devices/cpu/psx/psx.h @@ -7,12 +7,11 @@ * */ -#pragma once +#ifndef MAME_DEVICES_CPU_PSX_PSX_H +#define MAME_DEVICES_CPU_PSX_PSX_H -#ifndef __PSXCPU_H__ -#define __PSXCPU_H__ +#pragma once -#include "machine/ram.h" #include "dma.h" #include "gte.h" #include "irq.h" @@ -134,10 +133,12 @@ enum // TYPE DEFINITIONS //************************************************************************** +class ram_device; + class psxcpu_state { public: - virtual ~psxcpu_state() {}; + virtual ~psxcpu_state() { } virtual uint32_t pc() = 0; virtual uint32_t delayr() = 0; @@ -147,13 +148,9 @@ public: // ======================> psxcpu_device -class psxcpu_device : public cpu_device, - psxcpu_state +class psxcpu_device : public cpu_device, psxcpu_state { public: - // construction/destruction - virtual ~psxcpu_device() {}; - // static configuration helpers template<class _Object> static devcb_base &set_gpu_read_handler(device_t &device, _Object object) { return downcast<psxcpu_device &>(device).m_gpu_read_handler.set_callback(object); } template<class _Object> static devcb_base &set_gpu_write_handler(device_t &device, _Object object) { return downcast<psxcpu_device &>(device).m_gpu_write_handler.set_callback(object); } @@ -523,4 +520,4 @@ extern const device_type CXD8606CQ; extern unsigned DasmPSXCPU(psxcpu_state *state, std::ostream &stream, uint32_t pc, const uint8_t *opram); -#endif /* __PSXCPU_H__ */ +#endif // MAME_DEVICES_CPU_PSX_PSX_H |