notaz.gp2x.de
/
pcsx_rearmed.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
996dfb2
)
Add header guards
author
negativeExponent
<negativeExponent@users.noreply.github.com>
Tue, 4 Aug 2020 11:49:04 +0000
(19:49 +0800)
committer
negativeExponent
<negativeExponent@users.noreply.github.com>
Tue, 4 Aug 2020 12:40:58 +0000
(20:40 +0800)
48 files changed:
frontend/blit320.h
patch
|
blob
|
blame
|
history
frontend/cspace.h
patch
|
blob
|
blame
|
history
frontend/in_tsbutton.h
patch
|
blob
|
blame
|
history
frontend/menu.h
patch
|
blob
|
blame
|
history
frontend/nopic.h
patch
|
blob
|
blame
|
history
frontend/pl_gun_ts.h
patch
|
blob
|
blame
|
history
frontend/plat.h
patch
|
blob
|
blame
|
history
frontend/plat_omap.h
patch
|
blob
|
blame
|
history
frontend/plugin.h
patch
|
blob
|
blame
|
history
frontend/plugin_lib.h
patch
|
blob
|
blame
|
history
include/config.h
patch
|
blob
|
blame
|
history
include/pcnt.h
patch
|
blob
|
blame
|
history
libpcsxcore/gpu.h
patch
|
blob
|
blame
|
history
libpcsxcore/gte_arm.h
patch
|
blob
|
blame
|
history
libpcsxcore/gte_divider.h
patch
|
blob
|
blame
|
history
libpcsxcore/gte_neon.h
patch
|
blob
|
blame
|
history
libpcsxcore/new_dynarec/arm/assem_arm.h
patch
|
blob
|
blame
|
history
libpcsxcore/new_dynarec/arm/linkage_offsets.h
patch
|
blob
|
blame
|
history
libpcsxcore/new_dynarec/backends/psx/emu_if.h
patch
|
blob
|
blame
|
history
libpcsxcore/new_dynarec/backends/psx/pcsxmem.h
patch
|
blob
|
blame
|
history
libpcsxcore/new_dynarec/new_dynarec.h
patch
|
blob
|
blame
|
history
libpcsxcore/new_dynarec/new_dynarec_config.h
patch
|
blob
|
blame
|
history
libpcsxcore/sjisfont.h
patch
|
blob
|
blame
|
history
plugins/cdrcimg/cdrcimg.h
patch
|
blob
|
blame
|
history
plugins/dfinput/externals.h
patch
|
blob
|
blame
|
history
plugins/dfinput/main.h
patch
|
blob
|
blame
|
history
plugins/dfsound/adsr.h
patch
|
blob
|
blame
|
history
plugins/dfsound/dma.h
patch
|
blob
|
blame
|
history
plugins/dfsound/externals.h
patch
|
blob
|
blame
|
history
plugins/dfsound/out.h
patch
|
blob
|
blame
|
history
plugins/dfsound/registers.h
patch
|
blob
|
blame
|
history
plugins/dfsound/spu.h
patch
|
blob
|
blame
|
history
plugins/dfsound/spu_c64x.h
patch
|
blob
|
blame
|
history
plugins/dfsound/spu_config.h
patch
|
blob
|
blame
|
history
plugins/dfsound/stdafx.h
patch
|
blob
|
blame
|
history
plugins/dfsound/xa.h
patch
|
blob
|
blame
|
history
plugins/gpu_neon/psx_gpu/psx_gpu_offsets.h
patch
|
blob
|
blame
|
history
plugins/gpu_unai/gpu_arm.h
patch
|
blob
|
blame
|
history
plugins/gpu_unai/gpu_command.h
patch
|
blob
|
blame
|
history
plugins/gpu_unai/gpu_inner.h
patch
|
blob
|
blame
|
history
plugins/gpu_unai/gpu_raster_image.h
patch
|
blob
|
blame
|
history
plugins/gpu_unai/gpu_raster_line.h
patch
|
blob
|
blame
|
history
plugins/gpu_unai/gpu_raster_polygon.h
patch
|
blob
|
blame
|
history
plugins/gpu_unai/gpu_raster_sprite.h
patch
|
blob
|
blame
|
history
plugins/gpu_unai/port.h
patch
|
blob
|
blame
|
history
plugins/gpu_unai/profiler.h
patch
|
blob
|
blame
|
history
plugins/gpulib/gpu.h
patch
|
blob
|
blame
|
history
plugins/spunull/register.h
patch
|
blob
|
blame
|
history
diff --git
a/frontend/blit320.h
b/frontend/blit320.h
index
434b52a
..
ea1d2a5
100644
(file)
--- a/
frontend/blit320.h
+++ b/
frontend/blit320.h
@@
-1,3
+1,8
@@
+#ifndef __BLIT320_H__
+#define __BLIT320_H__
+
void blit320_640(void *dst, const void *src, int unused);
void blit320_512(void *dst, const void *src, int unused);
void blit320_368(void *dst, const void *src, int unused);
void blit320_640(void *dst, const void *src, int unused);
void blit320_512(void *dst, const void *src, int unused);
void blit320_368(void *dst, const void *src, int unused);
+
+#endif /* __BLIT320_H__ */
diff --git
a/frontend/cspace.h
b/frontend/cspace.h
index
8c92d2d
..
6dbd5e0
100644
(file)
--- a/
frontend/cspace.h
+++ b/
frontend/cspace.h
@@
-1,3
+1,6
@@
+#ifndef __CSPACE_H__
+#define __CSPACE_H__
+
#ifdef __cplusplus
extern "C"
{
#ifdef __cplusplus
extern "C"
{
@@
-19,3
+22,5
@@
void bgr888_to_uyvy(void *d, const void *s, int pixels);
#ifdef __cplusplus
}
#endif
#ifdef __cplusplus
}
#endif
+
+#endif /* __CSPACE_H__ */
diff --git
a/frontend/in_tsbutton.h
b/frontend/in_tsbutton.h
index
82fab29
..
65a178f
100644
(file)
--- a/
frontend/in_tsbutton.h
+++ b/
frontend/in_tsbutton.h
@@
-1
+1,6
@@
+#ifndef __IN_TSBUTTON_H__
+#define __IN_TSBUTTON_H__
+
void in_tsbutton_init(void);
void in_tsbutton_init(void);
+
+#endif /* __IN_TSBUTTON_H__ */
diff --git
a/frontend/menu.h
b/frontend/menu.h
index
81cd1ba
..
8f5acda
100644
(file)
--- a/
frontend/menu.h
+++ b/
frontend/menu.h
@@
-1,3
+1,6
@@
+#ifndef __MENU_H__
+#define __MENU_H__
+
void menu_init(void);
void menu_prepare_emu(void);
void menu_loop(void);
void menu_init(void);
void menu_prepare_emu(void);
void menu_loop(void);
@@
-35,3
+38,5
@@
extern int soft_filter;
extern int g_menuscreen_w;
extern int g_menuscreen_h;
extern int g_menuscreen_w;
extern int g_menuscreen_h;
+
+#endif /* __MENU_H__ */
diff --git
a/frontend/nopic.h
b/frontend/nopic.h
index
d664f80
..
1815983
100644
(file)
--- a/
frontend/nopic.h
+++ b/
frontend/nopic.h
@@
-1,3
+1,6
@@
+#ifndef __NOPIC_H__
+#define __NOPIC_H__
+
/* these are just deps, to be removed */
static const struct {
/* these are just deps, to be removed */
static const struct {
@@
-54,4
+57,4
@@
void DrawNumBorPic(unsigned char *pMem, int lSelectedSlot)
}
}
}
}
-
+#endif /* __NOPIC_H__ */
diff --git
a/frontend/pl_gun_ts.h
b/frontend/pl_gun_ts.h
index
4e3d195
..
8a33627
100644
(file)
--- a/
frontend/pl_gun_ts.h
+++ b/
frontend/pl_gun_ts.h
@@
-1,3
+1,6
@@
+#ifndef __PL_GUN_TS_H__
+#define __PL_GUN_TS_H__
+
#ifdef HAVE_TSLIB
struct tsdev;
#ifdef HAVE_TSLIB
struct tsdev;
@@
-16,3
+19,5
@@
int pl_gun_ts_get_fd(struct tsdev *ts);
#define pl_set_gun_rect(...) do {} while (0)
#endif
#define pl_set_gun_rect(...) do {} while (0)
#endif
+
+#endif /* __PL_GUN_TS_H__ */
diff --git
a/frontend/plat.h
b/frontend/plat.h
index
6b0cd65
..
8a296ea
100644
(file)
--- a/
frontend/plat.h
+++ b/
frontend/plat.h
@@
-1,3
+1,6
@@
+#ifndef __PLAT_H__
+#define __PLAT_H__
+
void plat_init(void);
void plat_finish(void);
void plat_minimize(void);
void plat_init(void);
void plat_finish(void);
void plat_minimize(void);
@@
-8,3
+11,5
@@
void plat_gvideo_open(int is_pal);
void *plat_gvideo_set_mode(int *w, int *h, int *bpp);
void *plat_gvideo_flip(void);
void plat_gvideo_close(void);
void *plat_gvideo_set_mode(int *w, int *h, int *bpp);
void *plat_gvideo_flip(void);
void plat_gvideo_close(void);
+
+#endif /* __PLAT_H__ */
diff --git
a/frontend/plat_omap.h
b/frontend/plat_omap.h
index
e47410a
..
151f09c
100644
(file)
--- a/
frontend/plat_omap.h
+++ b/
frontend/plat_omap.h
@@
-1,5
+1,8
@@
+#ifndef __PLAT_OMAP_H__
+#define __PLAT_OMAP_H__
void plat_omap_init(void);
void plat_omap_finish(void);
void plat_omap_gvideo_open(void);
void plat_omap_init(void);
void plat_omap_finish(void);
void plat_omap_gvideo_open(void);
+#endif /* __PLAT_OMAP_H__ */
diff --git
a/frontend/plugin.h
b/frontend/plugin.h
index
e7a5645
..
5e12f90
100644
(file)
--- a/
frontend/plugin.h
+++ b/
frontend/plugin.h
@@
-1,3
+1,6
@@
+#ifndef __PLUGIN_H__
+#define __PLUGIN_H__
+
#define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
#define PLUGIN_DL_BASE 0xfbad0000
#define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
#define PLUGIN_DL_BASE 0xfbad0000
@@
-12,3
+15,5
@@
enum builtint_plugins_e {
void *plugin_link(enum builtint_plugins_e id, const char *sym);
void plugin_call_rearmed_cbs(void);
void *plugin_link(enum builtint_plugins_e id, const char *sym);
void plugin_call_rearmed_cbs(void);
+
+#endif /* __PLUGIN_H__ */
diff --git
a/frontend/plugin_lib.h
b/frontend/plugin_lib.h
index
09cc4c5
..
7570001
100644
(file)
--- a/
frontend/plugin_lib.h
+++ b/
frontend/plugin_lib.h
@@
-1,3
+1,5
@@
+#ifndef __PLUGIN_LIB_H__
+#define __PLUGIN_LIB_H__
enum {
DKEY_SELECT = 0,
enum {
DKEY_SELECT = 0,
@@
-118,3
+120,5
@@
extern void (*pl_plat_hud_print)(int x, int y, const char *str, int bpp);
#ifndef ARRAY_SIZE
#define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
#endif
#ifndef ARRAY_SIZE
#define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
#endif
+
+#endif /* __PLUGIN_LIB_H__ */
diff --git
a/include/config.h
b/include/config.h
index
362e4a4
..
340cc2f
100644
(file)
--- a/
include/config.h
+++ b/
include/config.h
@@
-1,2
+1,7
@@
+#ifndef __CONFIG_H__
+#define __CONFIG_H__
+
#define MAXPATHLEN 256
#define PCSX_VERSION "1.9"
#define MAXPATHLEN 256
#define PCSX_VERSION "1.9"
+
+#endif /* __CONFIG_H__ */
diff --git
a/include/pcnt.h
b/include/pcnt.h
index
9ddd500
..
c956b41
100644
(file)
--- a/
include/pcnt.h
+++ b/
include/pcnt.h
@@
-1,3
+1,5
@@
+#ifndef __PCNT_H__
+#define __PCNT_H__
enum pcounters {
PCNT_ALL,
enum pcounters {
PCNT_ALL,
@@
-130,3
+132,5
@@
void pcnt_gte_end(int op);
#define pcnt_print(fps)
#endif
#define pcnt_print(fps)
#endif
+
+#endif /* __PCNT_H__ */
diff --git
a/libpcsxcore/gpu.h
b/libpcsxcore/gpu.h
index
63a5572
..
98a22a0
100644
(file)
--- a/
libpcsxcore/gpu.h
+++ b/
libpcsxcore/gpu.h
@@
-21,6
+21,9
@@
* that GPU plugin doesn't.
*/
* that GPU plugin doesn't.
*/
+#ifndef __GPU_H__
+#define __GPU_H__
+
#define PSXGPU_LCF (1<<31)
#define PSXGPU_nBUSY (1<<26)
#define PSXGPU_ILACE (1<<22)
#define PSXGPU_LCF (1<<31)
#define PSXGPU_nBUSY (1<<26)
#define PSXGPU_ILACE (1<<22)
@@
-38,3
+41,5
@@
HW_GPU_STATUS &= PSXGPU_TIMING_BITS; \
HW_GPU_STATUS |= GPU_readStatus() & ~PSXGPU_TIMING_BITS; \
}
HW_GPU_STATUS &= PSXGPU_TIMING_BITS; \
HW_GPU_STATUS |= GPU_readStatus() & ~PSXGPU_TIMING_BITS; \
}
+
+#endif /* __GPU_H__ */
diff --git
a/libpcsxcore/gte_arm.h
b/libpcsxcore/gte_arm.h
index
6b240db
..
0288944
100644
(file)
--- a/
libpcsxcore/gte_arm.h
+++ b/
libpcsxcore/gte_arm.h
@@
-15,6
+15,9
@@
* along with this program; if not, see <http://www.gnu.org/licenses>.
*/
* along with this program; if not, see <http://www.gnu.org/licenses>.
*/
+#ifndef __GTE_ARM_H__
+#define __GTE_ARM_H__
+
void gteRTPS_nf_arm(void *cp2_regs, int opcode);
void gteRTPT_nf_arm(void *cp2_regs, int opcode);
void gteNCLIP_arm(void *cp2_regs, int opcode);
void gteRTPS_nf_arm(void *cp2_regs, int opcode);
void gteRTPT_nf_arm(void *cp2_regs, int opcode);
void gteNCLIP_arm(void *cp2_regs, int opcode);
@@
-28,3
+31,5
@@
void gteMACtoIR_lm0(void *cp2_regs);
void gteMACtoIR_lm1(void *cp2_regs);
void gteMACtoIR_lm0_nf(void *cp2_regs);
void gteMACtoIR_lm1_nf(void *cp2_regs);
void gteMACtoIR_lm1(void *cp2_regs);
void gteMACtoIR_lm0_nf(void *cp2_regs);
void gteMACtoIR_lm1_nf(void *cp2_regs);
+
+#endif /* __GTE_ARM_H__ */
diff --git
a/libpcsxcore/gte_divider.h
b/libpcsxcore/gte_divider.h
index
0c98826
..
a407213
100644
(file)
--- a/
libpcsxcore/gte_divider.h
+++ b/
libpcsxcore/gte_divider.h
@@
-15,4
+15,9
@@
* along with this program; if not, see <http://www.gnu.org/licenses>.
*/
* along with this program; if not, see <http://www.gnu.org/licenses>.
*/
+#ifndef __GTE_DIVIDER_H__
+#define __GTE_DIVIDER_H__
+
u32 DIVIDE(s16 n, u16 d);
u32 DIVIDE(s16 n, u16 d);
+
+#endif /* __GTE_DIVIDER_H__ */
diff --git
a/libpcsxcore/gte_neon.h
b/libpcsxcore/gte_neon.h
index
2fd9e4d
..
f371640
100644
(file)
--- a/
libpcsxcore/gte_neon.h
+++ b/
libpcsxcore/gte_neon.h
@@
-15,6
+15,9
@@
* along with this program; if not, see <http://www.gnu.org/licenses>.
*/
* along with this program; if not, see <http://www.gnu.org/licenses>.
*/
+#ifndef __GTE_NEON_H__
+#define __GTE_NEON_H__
+
void gteRTPS_neon(void *cp2_regs, int opcode);
void gteRTPT_neon(void *cp2_regs, int opcode);
void gteRTPS_neon(void *cp2_regs, int opcode);
void gteRTPT_neon(void *cp2_regs, int opcode);
@@
-23,3
+26,5
@@
void gteMVMVA_part_neon(void *cp2_regs, int opcode);
// after NEON call only, does not do gteIR
void gteMACtoIR_flags_neon(void *cp2_regs, int lm);
// after NEON call only, does not do gteIR
void gteMACtoIR_flags_neon(void *cp2_regs, int lm);
+
+#endif /* __GTE_NEON_H__ */
diff --git
a/libpcsxcore/new_dynarec/arm/assem_arm.h
b/libpcsxcore/new_dynarec/arm/assem_arm.h
index
bb6114c
..
1dcc55f
100644
(file)
--- a/
libpcsxcore/new_dynarec/arm/assem_arm.h
+++ b/
libpcsxcore/new_dynarec/arm/assem_arm.h
@@
-1,3
+1,6
@@
+#ifndef __ASSEM_ARM_H__
+#define __ASSEM_ARM_H__
+
#define HOST_REGS 13
#define HOST_CCREG 10
#define HOST_BTREG 8
#define HOST_REGS 13
#define HOST_CCREG 10
#define HOST_BTREG 8
@@
-55,3
+58,5
@@
extern char *invc_ptr;
extern char translation_cache[1 << TARGET_SIZE_2];
#define BASE_ADDR (u_int)translation_cache
#endif
extern char translation_cache[1 << TARGET_SIZE_2];
#define BASE_ADDR (u_int)translation_cache
#endif
+
+#endif /* __ASSEM_ARM_H__ */
diff --git
a/libpcsxcore/new_dynarec/arm/linkage_offsets.h
b/libpcsxcore/new_dynarec/arm/linkage_offsets.h
index
f7e1911
..
c7abff0
100644
(file)
--- a/
libpcsxcore/new_dynarec/arm/linkage_offsets.h
+++ b/
libpcsxcore/new_dynarec/arm/linkage_offsets.h
@@
-1,3
+1,5
@@
+#ifndef __LINKAGE_OFFSETS_H__
+#define __LINKAGE_OFFSETS_H__
#define LO_next_interupt 64
#define LO_cycle_count (LO_next_interupt + 4)
#define LO_next_interupt 64
#define LO_cycle_count (LO_next_interupt + 4)
@@
-39,3
+41,5
@@
#define LO_FCR31 (LO_align0)
#define LO_cop2_to_scratch_buf (LO_scratch_buf_ptr - LO_reg_cop2d)
#define LO_FCR31 (LO_align0)
#define LO_cop2_to_scratch_buf (LO_scratch_buf_ptr - LO_reg_cop2d)
+
+#endif /* __LINKAGE_OFFSETS_H__ */
diff --git
a/libpcsxcore/new_dynarec/backends/psx/emu_if.h
b/libpcsxcore/new_dynarec/backends/psx/emu_if.h
index
d8c7990
..
323764c
100644
(file)
--- a/
libpcsxcore/new_dynarec/backends/psx/emu_if.h
+++ b/
libpcsxcore/new_dynarec/backends/psx/emu_if.h
@@
-1,3
+1,6
@@
+#ifndef __EMU_IF_H__
+#define __EMU_IF_H__
+
#include "../../new_dynarec.h"
#include "../../../r3000a.h"
#include "../../new_dynarec.h"
#include "../../../r3000a.h"
@@
-106,3
+109,5
@@
extern void SysPrintf(const char *fmt, ...);
#else
#define rdram ((u_int)psxM)
#endif
#else
#define rdram ((u_int)psxM)
#endif
+
+#endif /* __EMU_IF_H__ */
diff --git
a/libpcsxcore/new_dynarec/backends/psx/pcsxmem.h
b/libpcsxcore/new_dynarec/backends/psx/pcsxmem.h
index
72892a8
..
9d292a6
100644
(file)
--- a/
libpcsxcore/new_dynarec/backends/psx/pcsxmem.h
+++ b/
libpcsxcore/new_dynarec/backends/psx/pcsxmem.h
@@
-1,3
+1,5
@@
+#ifndef __PCSXMEM_H__
+#define __PCSXMEM_H__
extern u8 zero_mem[0x1000];
extern u8 zero_mem[0x1000];
@@
-7,3
+9,5
@@
void new_dyna_pcsx_mem_load_state(void);
void new_dyna_pcsx_mem_shutdown(void);
int pcsxmem_is_handler_dynamic(unsigned int addr);
void new_dyna_pcsx_mem_shutdown(void);
int pcsxmem_is_handler_dynamic(unsigned int addr);
+
+#endif /* __PCSXMEM_H__ */
diff --git
a/libpcsxcore/new_dynarec/new_dynarec.h
b/libpcsxcore/new_dynarec/new_dynarec.h
index
d196f59
..
8c89051
100644
(file)
--- a/
libpcsxcore/new_dynarec/new_dynarec.h
+++ b/
libpcsxcore/new_dynarec/new_dynarec.h
@@
-1,3
+1,6
@@
+#ifndef __NEW_DYNAREC_H__
+#define __NEW_DYNAREC_H__
+
/* #define NEW_DYNAREC 1 */
extern int pcaddr;
/* #define NEW_DYNAREC 1 */
extern int pcaddr;
@@
-20,3
+23,5
@@
void new_dynarec_load_blocks(const void *save, int size);
void invalidate_all_pages(void);
void invalidate_block(unsigned int block);
void invalidate_all_pages(void);
void invalidate_block(unsigned int block);
+
+#endif /* __NEW_DYNAREC_H__ */
diff --git
a/libpcsxcore/new_dynarec/new_dynarec_config.h
b/libpcsxcore/new_dynarec/new_dynarec_config.h
index
d55f128
..
3b00780
100644
(file)
--- a/
libpcsxcore/new_dynarec/new_dynarec_config.h
+++ b/
libpcsxcore/new_dynarec/new_dynarec_config.h
@@
-1,4
+1,5
@@
-
+#ifndef __NEW_DYNAREC_CONFIG_H__
+#define __NEW_DYNAREC_CONFIG_H__
#define CORTEX_A8_BRANCH_PREDICTION_HACK 1
#define USE_MINI_HT 1
#define CORTEX_A8_BRANCH_PREDICTION_HACK 1
#define USE_MINI_HT 1
@@
-10,3
+11,5
@@
#ifdef VITA
#define BASE_ADDR_DYNAMIC 1
#endif
#ifdef VITA
#define BASE_ADDR_DYNAMIC 1
#endif
+
+#endif /* __NEW_DYNAREC_CONFIG_H__ */
diff --git
a/libpcsxcore/sjisfont.h
b/libpcsxcore/sjisfont.h
index
105d624
..
0692648
100644
(file)
--- a/
libpcsxcore/sjisfont.h
+++ b/
libpcsxcore/sjisfont.h
@@
-21,6
+21,9
@@
// Converted to binary format by Wei Mingzhi <whistler_wmz@users.sf.net>.
//
// Converted to binary format by Wei Mingzhi <whistler_wmz@users.sf.net>.
//
+#ifndef __SJISFONT_H__
+#define __SJISFONT_H__
+
const unsigned char font_8140[] = {
0x78, 0xda, 0xad, 0x3b, 0x3b, 0x90, 0x1b, 0xc9,
0x75, 0x3d, 0x9f, 0x05, 0x1a, 0xcb, 0xe1, 0x4e,
const unsigned char font_8140[] = {
0x78, 0xda, 0xad, 0x3b, 0x3b, 0x90, 0x1b, 0xc9,
0x75, 0x3d, 0x9f, 0x05, 0x1a, 0xcb, 0xe1, 0x4e,
@@
-6954,3
+6957,5
@@
const unsigned char font_889f[] = {
0xeb, 0xe7, 0xa8, 0x89, 0x0a, 0x11, 0xbc, 0xbc,
0x33, 0xf9, 0xff, 0xe8, 0xc4, 0x21, 0xbf
};
0xeb, 0xe7, 0xa8, 0x89, 0x0a, 0x11, 0xbc, 0xbc,
0x33, 0xf9, 0xff, 0xe8, 0xc4, 0x21, 0xbf
};
+
+#endif /* __SJISFONT_H__ */
diff --git
a/plugins/cdrcimg/cdrcimg.h
b/plugins/cdrcimg/cdrcimg.h
index
efeaaf9
..
0c6d001
100644
(file)
--- a/
plugins/cdrcimg/cdrcimg.h
+++ b/
plugins/cdrcimg/cdrcimg.h
@@
-1,3
+1,7
@@
+#ifndef __P_CDRCIMG_H__
+#define __P_CDRCIMG_H__
void cdrcimg_set_fname(const char *fname);
void *cdrcimg_get_sym(const char *sym);
void cdrcimg_set_fname(const char *fname);
void *cdrcimg_get_sym(const char *sym);
+
+#endif /* __P_CDRCIMG_H__ */
diff --git
a/plugins/dfinput/externals.h
b/plugins/dfinput/externals.h
index
a446956
..
2e216fd
100644
(file)
--- a/
plugins/dfinput/externals.h
+++ b/
plugins/dfinput/externals.h
@@
-1,3
+1,5
@@
+#ifndef __P_EXTERNALS_H__
+#define __P_EXTERNALS_H__
void dfinput_activate(void);
void dfinput_activate(void);
@@
-12,3
+14,5
@@
extern void pl_update_gun(int *xn, int *yn, int *xres, int *yres, int *in);
/* vibration trigger to frontend */
extern int in_enable_vibration;
extern void plat_trigger_vibrate(int pad, int low, int high);
/* vibration trigger to frontend */
extern int in_enable_vibration;
extern void plat_trigger_vibrate(int pad, int low, int high);
+
+#endif /* __P_EXTERNALS_H__ */
diff --git
a/plugins/dfinput/main.h
b/plugins/dfinput/main.h
index
e83306a
..
96cebfa
100644
(file)
--- a/
plugins/dfinput/main.h
+++ b/
plugins/dfinput/main.h
@@
-1,3
+1,6
@@
+#ifndef __P_MAIN_H__
+#define __P_MAIN_H__
+
#include "psemu_plugin_defs.h"
#include "externals.h"
#include "psemu_plugin_defs.h"
#include "externals.h"
@@
-16,3
+19,5
@@
void guncon_init(void);
/* get button state and pad type from main emu */
extern long (*PAD1_readPort1)(PadDataS *pad);
extern long (*PAD2_readPort2)(PadDataS *pad);
/* get button state and pad type from main emu */
extern long (*PAD1_readPort1)(PadDataS *pad);
extern long (*PAD2_readPort2)(PadDataS *pad);
+
+#endif /* __P_MAIN_H__ */
diff --git
a/plugins/dfsound/adsr.h
b/plugins/dfsound/adsr.h
index
ff2af1f
..
2374f41
100644
(file)
--- a/
plugins/dfsound/adsr.h
+++ b/
plugins/dfsound/adsr.h
@@
-15,5
+15,10
@@
* *
\r
***************************************************************************/
\r
\r
* *
\r
***************************************************************************/
\r
\r
+#ifndef __P_ADER_H__
\r
+#define __P_ADER_H__
\r
+
\r
INLINE void StartADSR(int ch);
\r
INLINE int MixADSR(int ch);
\r
INLINE void StartADSR(int ch);
\r
INLINE int MixADSR(int ch);
\r
+
\r
+#endif /* __P_ADER_H__ */
\r
diff --git
a/plugins/dfsound/dma.h
b/plugins/dfsound/dma.h
index
440536f
..
4982432
100644
(file)
--- a/
plugins/dfsound/dma.h
+++ b/
plugins/dfsound/dma.h
@@
-24,8
+24,12
@@
//
\r
//*************************************************************************//
\r
\r
//
\r
//*************************************************************************//
\r
\r
+#ifndef __P_DMA_H__
\r
+#define __P_DMA_H__
\r
\r
unsigned short CALLBACK SPUreadDMA(void);
\r
void CALLBACK SPUreadDMAMem(unsigned short * pusPSXMem,int iSize);
\r
void CALLBACK SPUwriteDMA(unsigned short val);
\r
void CALLBACK SPUwriteDMAMem(unsigned short * pusPSXMem,int iSize);
\r
\r
unsigned short CALLBACK SPUreadDMA(void);
\r
void CALLBACK SPUreadDMAMem(unsigned short * pusPSXMem,int iSize);
\r
void CALLBACK SPUwriteDMA(unsigned short val);
\r
void CALLBACK SPUwriteDMAMem(unsigned short * pusPSXMem,int iSize);
\r
+
\r
+#endif /* __P_DMA_H__ */
\r
diff --git
a/plugins/dfsound/externals.h
b/plugins/dfsound/externals.h
index
2db75ac
..
4fb3b93
100644
(file)
--- a/
plugins/dfsound/externals.h
+++ b/
plugins/dfsound/externals.h
@@
-15,6
+15,9
@@
* *
\r
***************************************************************************/
\r
\r
* *
\r
***************************************************************************/
\r
\r
+#ifndef __P_SOUND_EXTERNALS_H__
\r
+#define __P_SOUND_EXTERNALS_H__
\r
+
\r
#include <stdint.h>
\r
\r
/////////////////////////////////////////////////////////
\r
#include <stdint.h>
\r
\r
/////////////////////////////////////////////////////////
\r
@@
-254,3
+257,4
@@
void schedule_next_irq(void);
\r
#endif
\r
\r
\r
#endif
\r
\r
+#endif /* __P_SOUND_EXTERNALS_H__ */
\r
diff --git
a/plugins/dfsound/out.h
b/plugins/dfsound/out.h
index
4607099
..
e4878a8
100644
(file)
--- 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;
struct out_driver {
const char *name;
@@
-10,3
+12,5
@@
struct out_driver {
extern struct out_driver *out_current;
void SetupSound(void);
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
(file)
--- a/
plugins/dfsound/registers.h
+++ b/
plugins/dfsound/registers.h
@@
-15,6
+15,9
@@
* *
\r
***************************************************************************/
\r
\r
* *
\r
***************************************************************************/
\r
\r
+#ifndef __P_REGISTERS_H__
\r
+#define __P_REGISTERS_H__
\r
+
\r
#define H_SPUReverbAddr 0x0da2
\r
#define H_SPUirqAddr 0x0da4
\r
#define H_SPUaddr 0x0da6
\r
#define H_SPUReverbAddr 0x0da2
\r
#define H_SPUirqAddr 0x0da4
\r
#define H_SPUaddr 0x0da6
\r
@@
-154,3
+157,4
@@
\r
void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val, unsigned int cycles);
\r
\r
\r
void CALLBACK SPUwriteRegister(unsigned long reg, unsigned short val, unsigned int cycles);
\r
\r
+#endif /* __P_REGISTERS_H__ */
\r
diff --git
a/plugins/dfsound/spu.h
b/plugins/dfsound/spu.h
index
d42425d
..
23425d9
100644
(file)
--- a/
plugins/dfsound/spu.h
+++ b/
plugins/dfsound/spu.h
@@
-15,6
+15,11
@@
* *
\r
***************************************************************************/
\r
\r
* *
\r
***************************************************************************/
\r
\r
+#ifndef __P_SPU_H__
\r
+#define __P_SPU_H__
\r
+
\r
void ClearWorkingState(void);
\r
void CALLBACK SPUplayADPCMchannel(xa_decode_t *xap);
\r
int CALLBACK SPUplayCDDAchannel(short *pcm, int bytes);
\r
void ClearWorkingState(void);
\r
void CALLBACK SPUplayADPCMchannel(xa_decode_t *xap);
\r
int CALLBACK SPUplayCDDAchannel(short *pcm, int bytes);
\r
+
\r
+#endif /* __P_SPU_H__ */
\r
diff --git
a/plugins/dfsound/spu_c64x.h
b/plugins/dfsound/spu_c64x.h
index
7c4d565
..
56ede38
100644
(file)
--- 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 {
#define COMPONENT_NAME "pcsxr_spu"
enum {
@@
-26,3
+29,5
@@
struct region_mem {
};
#define ACTIVE_CNT 3
};
#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
(file)
--- 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
// user settings
typedef struct
@@
-16,3
+19,5
@@
typedef struct
} SPUConfig;
extern SPUConfig spu_config;
} 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
(file)
--- a/
plugins/dfsound/stdafx.h
+++ b/
plugins/dfsound/stdafx.h
@@
-15,6
+15,9
@@
* *
***************************************************************************/
* *
***************************************************************************/
+#ifndef __P_STDAFX_H__
+#define __P_STDAFX_H__
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@
-35,3
+38,5
@@
#endif
#include "psemuxa.h"
#endif
#include "psemuxa.h"
+
+#endif /* __P_STDAFX_H__ */
diff --git
a/plugins/dfsound/xa.h
b/plugins/dfsound/xa.h
index
cbf2843
..
137fe43
100644
(file)
--- a/
plugins/dfsound/xa.h
+++ b/
plugins/dfsound/xa.h
@@
-15,6
+15,11
@@
* *
\r
***************************************************************************/
\r
\r
* *
\r
***************************************************************************/
\r
\r
+#ifndef __P_XA_H__
\r
+#define __P_XA_H__
\r
+
\r
INLINE void MixXA(void);
\r
INLINE void FeedXA(xa_decode_t *xap);
\r
INLINE void MixXA(void);
\r
INLINE void FeedXA(xa_decode_t *xap);
\r
-INLINE int FeedCDDA(unsigned char *pcm, int nBytes);
+INLINE int FeedCDDA(unsigned char *pcm, int nBytes);
\r
+
\r
+#endif /* __P_XA_H__ */
\r
diff --git
a/plugins/gpu_neon/psx_gpu/psx_gpu_offsets.h
b/plugins/gpu_neon/psx_gpu/psx_gpu_offsets.h
index
5460e40
..
161384e
100644
(file)
--- a/
plugins/gpu_neon/psx_gpu/psx_gpu_offsets.h
+++ b/
plugins/gpu_neon/psx_gpu/psx_gpu_offsets.h
@@
-1,3
+1,6
@@
+#ifndef __P_PSX_GPU_OFFSETS_H__
+#define __P_PSX_GPU_OFFSETS_H__
+
#define psx_gpu_test_mask_offset 0x0
#define psx_gpu_uvrg_offset 0x10
#define psx_gpu_uvrg_dx_offset 0x20
#define psx_gpu_test_mask_offset 0x0
#define psx_gpu_uvrg_offset 0x10
#define psx_gpu_uvrg_dx_offset 0x20
@@
-56,3
+59,5
@@
#define psx_gpu_texture_4bpp_cache_offset 0x5a00
#define psx_gpu_texture_8bpp_even_cache_offset 0x205a00
#define psx_gpu_texture_8bpp_odd_cache_offset 0x305a00
#define psx_gpu_texture_4bpp_cache_offset 0x5a00
#define psx_gpu_texture_8bpp_even_cache_offset 0x205a00
#define psx_gpu_texture_8bpp_odd_cache_offset 0x305a00
+
+#endif /* __P_PSX_GPU_OFFSETS_H__ */
diff --git
a/plugins/gpu_unai/gpu_arm.h
b/plugins/gpu_unai/gpu_arm.h
index
a0b2248
..
b9f8f97
100644
(file)
--- a/
plugins/gpu_unai/gpu_arm.h
+++ b/
plugins/gpu_unai/gpu_arm.h
@@
-1,3
+1,6
@@
+#ifndef __GPU_UNAI_GPU_ARM_H__
+#define __GPU_UNAI_GPU_ARM_H__
+
#ifdef __cplusplus
extern "C" {
#endif
#ifdef __cplusplus
extern "C" {
#endif
@@
-7,3
+10,5
@@
void draw_spr16_full(u16 *d, void *s, u16 *pal, int lines);
#ifdef __cplusplus
}
#endif
#ifdef __cplusplus
}
#endif
+
+#endif /* __GPU_UNAI_GPU_ARM_H__ */
diff --git
a/plugins/gpu_unai/gpu_command.h
b/plugins/gpu_unai/gpu_command.h
index
7096b75
..
c39c81b
100644
(file)
--- a/
plugins/gpu_unai/gpu_command.h
+++ b/
plugins/gpu_unai/gpu_command.h
@@
-19,6
+19,9
@@
* 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
***************************************************************************/
* 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
***************************************************************************/
+#ifndef __GPU_UNAI_GPU_COMMAND_H__
+#define __GPU_UNAI_GPU_COMMAND_H__
+
///////////////////////////////////////////////////////////////////////////////
void gpuSetTexture(u16 tpage)
{
///////////////////////////////////////////////////////////////////////////////
void gpuSetTexture(u16 tpage)
{
@@
-614,3
+617,5
@@
void gpuSendPacketFunction(const int PRIM)
///////////////////////////////////////////////////////////////////////////////
// End of code specific to non-gpulib standalone version of gpu_unai
///////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////
// End of code specific to non-gpulib standalone version of gpu_unai
///////////////////////////////////////////////////////////////////////////////
+
+#endif /* __GPU_UNAI_GPU_COMMAND_H__ */
diff --git
a/plugins/gpu_unai/gpu_inner.h
b/plugins/gpu_unai/gpu_inner.h
index
76479f9
..
4aab604
100644
(file)
--- a/
plugins/gpu_unai/gpu_inner.h
+++ b/
plugins/gpu_unai/gpu_inner.h
@@
-19,6
+19,9
@@
* 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
***************************************************************************/
* 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
***************************************************************************/
+#ifndef __GPU_UNAI_GPU_INNER_H__
+#define __GPU_UNAI_GPU_INNER_H__
+
///////////////////////////////////////////////////////////////////////////////
// Inner loop driver instantiation file
///////////////////////////////////////////////////////////////////////////////
// Inner loop driver instantiation file
@@
-727,3
+730,5
@@
const PP gpuPolySpanDrivers[2048] = {
#undef TI
#undef TN
#undef TIBLOCK
#undef TI
#undef TN
#undef TIBLOCK
+
+#endif /* __GPU_UNAI_GPU_INNER_H__ */
diff --git
a/plugins/gpu_unai/gpu_raster_image.h
b/plugins/gpu_unai/gpu_raster_image.h
index
87d2151
..
2d34b34
100644
(file)
--- a/
plugins/gpu_unai/gpu_raster_image.h
+++ b/
plugins/gpu_unai/gpu_raster_image.h
@@
-18,6
+18,9
@@
* 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
***************************************************************************/
* 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
***************************************************************************/
+#ifndef __GPU_UNAI_GPU_RASTER_IMAGE_H__
+#define __GPU_UNAI_GPU_RASTER_IMAGE_H__
+
///////////////////////////////////////////////////////////////////////////////
#ifndef USE_GPULIB
void gpuLoadImage(PtrUnion packet)
///////////////////////////////////////////////////////////////////////////////
#ifndef USE_GPULIB
void gpuLoadImage(PtrUnion packet)
@@
-213,3
+216,5
@@
void gpuClearImage(PtrUnion packet)
}
}
}
}
}
}
+
+#endif /* __GPU_UNAI_GPU_RASTER_IMAGE_H__ */
diff --git
a/plugins/gpu_unai/gpu_raster_line.h
b/plugins/gpu_unai/gpu_raster_line.h
index
28ea074
..
2a7b422
100644
(file)
--- a/
plugins/gpu_unai/gpu_raster_line.h
+++ b/
plugins/gpu_unai/gpu_raster_line.h
@@
-19,6
+19,9
@@
* 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
***************************************************************************/
* 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
***************************************************************************/
+#ifndef __GPU_UNAI_GPU_RASTER_LINE_H__
+#define __GPU_UNAI_GPU_RASTER_LINE_H__
+
///////////////////////////////////////////////////////////////////////////////
// GPU internal line drawing functions
//
///////////////////////////////////////////////////////////////////////////////
// GPU internal line drawing functions
//
@@
-713,3
+716,5
@@
void gpuDrawLineG(PtrUnion packet, const PSD gpuPixelSpanDriver)
// Final run of pixels
gpuPixelSpanDriver(dst, (uintptr_t)&gcol, incr_major, end_length);
}
// Final run of pixels
gpuPixelSpanDriver(dst, (uintptr_t)&gcol, incr_major, end_length);
}
+
+#endif /* __GPU_UNAI_GPU_RASTER_LINE_H__ */
diff --git
a/plugins/gpu_unai/gpu_raster_polygon.h
b/plugins/gpu_unai/gpu_raster_polygon.h
index
f66a9e2
..
b30286d
100644
(file)
--- a/
plugins/gpu_unai/gpu_raster_polygon.h
+++ b/
plugins/gpu_unai/gpu_raster_polygon.h
@@
-18,6
+18,9
@@
* 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
***************************************************************************/
* 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
***************************************************************************/
+#ifndef __GPU_UNAI_GPU_RASTER_POLYGON_H__
+#define __GPU_UNAI_GPU_RASTER_POLYGON_H__
+
//senquack - NOTE: GPU Unai poly routines have been rewritten/adapted
// from DrHell routines to fix multiple issues. See README_senquack.txt
//senquack - NOTE: GPU Unai poly routines have been rewritten/adapted
// from DrHell routines to fix multiple issues. See README_senquack.txt
@@
-1446,3
+1449,5
@@
void gpuDrawPolyGT(const PtrUnion packet, const PP gpuPolySpanDriver, u32 is_qua
}
} while (++cur_pass < total_passes);
}
}
} while (++cur_pass < total_passes);
}
+
+#endif /* __GPU_UNAI_GPU_RASTER_POLYGON_H__ */
diff --git
a/plugins/gpu_unai/gpu_raster_sprite.h
b/plugins/gpu_unai/gpu_raster_sprite.h
index
0afdbf5
..
91f7bc0
100644
(file)
--- a/
plugins/gpu_unai/gpu_raster_sprite.h
+++ b/
plugins/gpu_unai/gpu_raster_sprite.h
@@
-18,6
+18,9
@@
* 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
***************************************************************************/
* 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307 USA. *
***************************************************************************/
+#ifndef __GPU_UNAI_GPU_RASTER_SPRITE_H__
+#define __GPU_UNAI_GPU_RASTER_SPRITE_H__
+
///////////////////////////////////////////////////////////////////////////////
// GPU internal sprite drawing functions
///////////////////////////////////////////////////////////////////////////////
// GPU internal sprite drawing functions
@@
-163,3
+166,5
@@
void gpuDrawT(PtrUnion packet, const PT gpuTileSpanDriver)
Pixel += FRAME_WIDTH;
}
}
Pixel += FRAME_WIDTH;
}
}
+
+#endif /* __GPU_UNAI_GPU_RASTER_SPRITE_H__ */
diff --git
a/plugins/gpu_unai/port.h
b/plugins/gpu_unai/port.h
index
238b98b
..
0a731f8
100644
(file)
--- a/
plugins/gpu_unai/port.h
+++ b/
plugins/gpu_unai/port.h
@@
-1,3
+1,6
@@
+#ifndef __GPU_UNAI_GPU_PORT_H__
+#define __GPU_UNAI_GPU_PORT_H__
+
#include <stddef.h>
#include <string.h>
#include <stddef.h>
#include <string.h>
@@
-34,3
+37,5
@@
void GPUwriteStatus(u32 data);
#undef s32
}
#undef s32
}
+
+#endif /* __GPU_UNAI_GPU_PORT_H__ */
diff --git
a/plugins/gpu_unai/profiler.h
b/plugins/gpu_unai/profiler.h
index
c09c95f
..
a23ee38
100644
(file)
--- a/
plugins/gpu_unai/profiler.h
+++ b/
plugins/gpu_unai/profiler.h
@@
-1,4
+1,9
@@
+#ifndef __GPU_UNAI_GPU_PROFILER_H__
+#define __GPU_UNAI_GPU_PROFILER_H__
+
#define pcsx4all_prof_pause(...)
#define pcsx4all_prof_start_with_pause(...)
#define pcsx4all_prof_end_with_resume(...)
#define pcsx4all_prof_resume(...)
#define pcsx4all_prof_pause(...)
#define pcsx4all_prof_start_with_pause(...)
#define pcsx4all_prof_end_with_resume(...)
#define pcsx4all_prof_resume(...)
+
+#endif /* __GPU_UNAI_GPU_PROFILER_H__ */
diff --git
a/plugins/gpulib/gpu.h
b/plugins/gpulib/gpu.h
index
7e1d18b
..
36de7ee
100644
(file)
--- a/
plugins/gpulib/gpu.h
+++ b/
plugins/gpulib/gpu.h
@@
-8,6
+8,9
@@
* See the COPYING file in the top-level directory.
*/
* See the COPYING file in the top-level directory.
*/
+#ifndef __GPULIB_GPU_H__
+#define __GPULIB_GPU_H__
+
#include <stdint.h>
#ifdef __cplusplus
#include <stdint.h>
#ifdef __cplusplus
@@
-140,3
+143,5
@@
void GPUrearmedCallbacks(const struct rearmed_cbs *cbs_);
#ifdef __cplusplus
}
#endif
#ifdef __cplusplus
}
#endif
+
+#endif /* __GPULIB_GPU_H__ */
diff --git
a/plugins/spunull/register.h
b/plugins/spunull/register.h
index
52128b7
..
2e0b892
100644
(file)
--- a/
plugins/spunull/register.h
+++ b/
plugins/spunull/register.h
@@
-1,3
+1,6
@@
+#ifndef __SPUNULL_REGISTER_H__
\r
+#define __SPUNULL_REGISTER_H__
\r
+
\r
#define H_SPUirqAddr 0x0da4
\r
#define H_SPUaddr 0x0da6
\r
#define H_SPUdata 0x0da8
\r
#define H_SPUirqAddr 0x0da4
\r
#define H_SPUaddr 0x0da6
\r
#define H_SPUdata 0x0da8
\r
@@
-119,3
+122,4
@@
#define H_SPU_ADSRLevel22 0x0d68
\r
#define H_SPU_ADSRLevel23 0x0d78
\r
\r
#define H_SPU_ADSRLevel22 0x0d68
\r
#define H_SPU_ADSRLevel23 0x0d78
\r
\r
+#endif /* __SPUNULL_REGISTER_H__ */
\r