From 908e426cc1ef2187357ed8fb59edd99b8a8060c9 Mon Sep 17 00:00:00 2001 From: negativeExponent Date: Tue, 4 Aug 2020 19:49:04 +0800 Subject: Add header guards --- plugins/dfsound/adsr.h | 5 +++++ plugins/dfsound/dma.h | 4 ++++ plugins/dfsound/externals.h | 4 ++++ plugins/dfsound/out.h | 4 ++++ plugins/dfsound/registers.h | 4 ++++ plugins/dfsound/spu.h | 5 +++++ plugins/dfsound/spu_c64x.h | 5 +++++ plugins/dfsound/spu_config.h | 5 +++++ plugins/dfsound/stdafx.h | 5 +++++ plugins/dfsound/xa.h | 7 ++++++- 10 files changed, 47 insertions(+), 1 deletion(-) (limited to 'plugins/dfsound') diff --git a/plugins/dfsound/adsr.h b/plugins/dfsound/adsr.h index ff2af1f..2374f41 100644 --- a/plugins/dfsound/adsr.h +++ b/plugins/dfsound/adsr.h @@ -15,5 +15,10 @@ * * ***************************************************************************/ +#ifndef __P_ADER_H__ +#define __P_ADER_H__ + INLINE void StartADSR(int ch); INLINE int MixADSR(int ch); + +#endif /* __P_ADER_H__ */ diff --git a/plugins/dfsound/dma.h b/plugins/dfsound/dma.h index 440536f..4982432 100644 --- a/plugins/dfsound/dma.h +++ b/plugins/dfsound/dma.h @@ -24,8 +24,12 @@ // //*************************************************************************// +#ifndef __P_DMA_H__ +#define __P_DMA_H__ unsigned short CALLBACK SPUreadDMA(void); void CALLBACK SPUreadDMAMem(unsigned short * pusPSXMem,int iSize); void CALLBACK SPUwriteDMA(unsigned short val); void CALLBACK SPUwriteDMAMem(unsigned short * pusPSXMem,int iSize); + +#endif /* __P_DMA_H__ */ diff --git a/plugins/dfsound/externals.h b/plugins/dfsound/externals.h index 2db75ac..4fb3b93 100644 --- a/plugins/dfsound/externals.h +++ b/plugins/dfsound/externals.h @@ -15,6 +15,9 @@ * * ***************************************************************************/ +#ifndef __P_SOUND_EXTERNALS_H__ +#define __P_SOUND_EXTERNALS_H__ + #include ///////////////////////////////////////////////////////// @@ -254,3 +257,4 @@ void schedule_next_irq(void); #endif +#endif /* __P_SOUND_EXTERNALS_H__ */ diff --git a/plugins/dfsound/out.h b/plugins/dfsound/out.h index 4607099..e4878a8 100644 --- a/plugins/dfsound/out.h +++ b/plugins/dfsound/out.h @@ -1,3 +1,5 @@ +#ifndef __P_OUT_H__ +#define __P_OUT_H__ struct out_driver { const char *name; @@ -10,3 +12,5 @@ struct out_driver { extern struct out_driver *out_current; void SetupSound(void); + +#endif /* __P_OUT_H__ */ diff --git a/plugins/dfsound/registers.h b/plugins/dfsound/registers.h index 3bca518..28641b8 100644 --- a/plugins/dfsound/registers.h +++ b/plugins/dfsound/registers.h @@ -15,6 +15,9 @@ * * ***************************************************************************/ +#ifndef __P_REGISTERS_H__ +#define __P_REGISTERS_H__ + #define H_SPUReverbAddr 0x0da2 #define H_SPUirqAddr 0x0da4 #define H_SPUaddr 0x0da6 @@ -154,3 +157,4 @@ void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val, unsigned int cycles); +#endif /* __P_REGISTERS_H__ */ diff --git a/plugins/dfsound/spu.h b/plugins/dfsound/spu.h index d42425d..23425d9 100644 --- a/plugins/dfsound/spu.h +++ b/plugins/dfsound/spu.h @@ -15,6 +15,11 @@ * * ***************************************************************************/ +#ifndef __P_SPU_H__ +#define __P_SPU_H__ + void ClearWorkingState(void); void CALLBACK SPUplayADPCMchannel(xa_decode_t *xap); int CALLBACK SPUplayCDDAchannel(short *pcm, int bytes); + +#endif /* __P_SPU_H__ */ diff --git a/plugins/dfsound/spu_c64x.h b/plugins/dfsound/spu_c64x.h index 7c4d565..56ede38 100644 --- a/plugins/dfsound/spu_c64x.h +++ b/plugins/dfsound/spu_c64x.h @@ -1,3 +1,6 @@ +#ifndef __P_SPU_C64X_H__ +#define __P_SPU_C64X_H__ + #define COMPONENT_NAME "pcsxr_spu" enum { @@ -26,3 +29,5 @@ struct region_mem { }; #define ACTIVE_CNT 3 + +#endif /* __P_SPU_C64X_H__ */ diff --git a/plugins/dfsound/spu_config.h b/plugins/dfsound/spu_config.h index 6b46bf3..28965ab 100644 --- a/plugins/dfsound/spu_config.h +++ b/plugins/dfsound/spu_config.h @@ -1,3 +1,6 @@ +#ifndef __P_SPU_CONFIG_H__ +#define __P_SPU_CONFIG_H__ + // user settings typedef struct @@ -16,3 +19,5 @@ typedef struct } SPUConfig; extern SPUConfig spu_config; + +#endif /* __P_SPU_CONFIG_H__ */ diff --git a/plugins/dfsound/stdafx.h b/plugins/dfsound/stdafx.h index 7e22029..04aa233 100644 --- a/plugins/dfsound/stdafx.h +++ b/plugins/dfsound/stdafx.h @@ -15,6 +15,9 @@ * * ***************************************************************************/ +#ifndef __P_STDAFX_H__ +#define __P_STDAFX_H__ + #include #include #include @@ -35,3 +38,5 @@ #endif #include "psemuxa.h" + +#endif /* __P_STDAFX_H__ */ diff --git a/plugins/dfsound/xa.h b/plugins/dfsound/xa.h index cbf2843..137fe43 100644 --- a/plugins/dfsound/xa.h +++ b/plugins/dfsound/xa.h @@ -15,6 +15,11 @@ * * ***************************************************************************/ +#ifndef __P_XA_H__ +#define __P_XA_H__ + INLINE void MixXA(void); INLINE void FeedXA(xa_decode_t *xap); -INLINE int FeedCDDA(unsigned char *pcm, int nBytes); +INLINE int FeedCDDA(unsigned char *pcm, int nBytes); + +#endif /* __P_XA_H__ */ -- cgit v1.2.3