Skip to content

Commit

Permalink
run clang-format on all .c and .h files
Browse files Browse the repository at this point in the history
  • Loading branch information
@uyjulian @doctorxyz
uyjulian authored and doctorxyz committed Oct 19, 2016
1 parent 5b16790 commit fce8f32
Show file tree
Hide file tree
Showing 288 changed files with 53,758 additions and 52,947 deletions.
7 changes: 4 additions & 3 deletions ee_core/include/cheat_api.h
100755 → 100644
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@ void DisableCheats(void);
* @addr: code address
* @val: code value
*/
typedef struct {
u32 addr;
u32 val;
typedef struct
{
u32 addr;
u32 val;
} code_t;

#endif /* _CHEATAPI_H_ */
6 changes: 3 additions & 3 deletions ee_core/include/cheat_engine.h
100755 → 100644
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
#ifndef _CHEATENGINE_H_
#define _CHEATENGINE_H_

#define MAX_HOOKS 5
#define MAX_CODES 250
#define MAX_CHEATLIST (MAX_HOOKS*2+MAX_CODES*2)
#define MAX_HOOKS 5
#define MAX_CODES 250
#define MAX_CHEATLIST (MAX_HOOKS * 2 + MAX_CODES * 2)

extern void (*Old_SetupThread)(void *gp, void *stack, s32 stack_size, void *args, void *root_func);
extern void HookSetupThread(void *gp, void *stack, s32 stack_size, void *args, void *root_func);
Expand Down
54 changes: 29 additions & 25 deletions ee_core/include/ee_core.h
100755 → 100644
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,15 @@

#ifdef __EESIO_DEBUG
#include <sio.h>
#define DPRINTF(args...) sio_printf(args)
#define DINIT() sio_init(38400, 0, 0, 0, 0)
#define DPRINTF(args...) sio_printf(args)
#define DINIT() sio_init(38400, 0, 0, 0, 0)
#else
#define DPRINTF(args...) do { } while(0)
#define DINIT() do { } while(0)
#define DPRINTF(args...) \
do { \
} while (0)
#define DINIT() \
do { \
} while (0)
#endif

extern int set_reg_hook;
Expand All @@ -35,17 +39,17 @@ extern int iop_reboot_count;

extern int padOpen_hooked;

enum ETH_OP_MODES{
ETH_OP_MODE_AUTO = 0,
ETH_OP_MODE_100M_FDX,
ETH_OP_MODE_100M_HDX,
ETH_OP_MODE_10M_FDX,
ETH_OP_MODE_10M_HDX,
enum ETH_OP_MODES {
ETH_OP_MODE_AUTO = 0,
ETH_OP_MODE_100M_FDX,
ETH_OP_MODE_100M_HDX,
ETH_OP_MODE_10M_FDX,
ETH_OP_MODE_10M_HDX,

ETH_OP_MODE_COUNT
ETH_OP_MODE_COUNT
};

#define IPCONFIG_MAX_LEN 64
#define IPCONFIG_MAX_LEN 64
char g_ipconfig[IPCONFIG_MAX_LEN];
int g_ipconfig_len;
char g_ps2_ip[16];
Expand All @@ -54,20 +58,20 @@ char g_ps2_gateway[16];
unsigned char g_ps2_ETHOpMode;
u32 g_compat_mask;

#define COMPAT_MODE_1 0x01
#define COMPAT_MODE_2 0x02
#define COMPAT_MODE_3 0x04
#define COMPAT_MODE_4 0x08
#define COMPAT_MODE_5 0x10
#define COMPAT_MODE_6 0x20
#define COMPAT_MODE_7 0x40
#define COMPAT_MODE_8 0x80
#define COMPAT_MODE_1 0x01
#define COMPAT_MODE_2 0x02
#define COMPAT_MODE_3 0x04
#define COMPAT_MODE_4 0x08
#define COMPAT_MODE_5 0x10
#define COMPAT_MODE_6 0x20
#define COMPAT_MODE_7 0x40
#define COMPAT_MODE_8 0x80

char GameID[16];
int GameMode;
#define USB_MODE 0
#define ETH_MODE 1
#define HDD_MODE 2
#define USB_MODE 0
#define ETH_MODE 1
#define HDD_MODE 2

char ExitPath[32];
int HDDSpindown;
Expand All @@ -76,10 +80,10 @@ int EnableCheatOp;

int DisableDebug;
int PS2Logo;
#define GS_BGCOLOUR *((volatile unsigned long int*)0x120000E0)
#define GS_BGCOLOUR *((volatile unsigned long int *)0x120000E0)

#ifdef CHEAT
int *gCheatList; //Store hooks/codes addr+val pairs
int *gCheatList; //Store hooks/codes addr+val pairs
#endif

#endif
209 changes: 106 additions & 103 deletions ee_core/include/igs_api.h
View file

Large diffs are not rendered by default.

17 changes: 9 additions & 8 deletions ee_core/include/iopmgr.h
100755 → 100644
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,19 @@
#ifndef IOPMGR_H
#define IOPMGR_H

#define RESET_ARG_MAX 79
#define RESET_ARG_MAX 79

struct _iop_reset_pkt {
struct t_SifCmdHeader header;
int arglen;
int mode;
char arg[RESET_ARG_MAX + 1];
struct _iop_reset_pkt
{
struct t_SifCmdHeader header;
int arglen;
int mode;
char arg[RESET_ARG_MAX + 1];
} ALIGNED(16);

void InitSIF0(void);
void SyncSIF0(void);
int New_Reset_Iop(const char *arg, int arglen);
int Reset_Iop(const char *arg, int flag);
int New_Reset_Iop(const char *arg, int arglen);
int Reset_Iop(const char *arg, int flag);

#endif /* IOPMGR */
111 changes: 57 additions & 54 deletions ee_core/include/modmgr.h
100755 → 100644
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,80 +10,83 @@
#ifndef MODMGR_H
#define MODMGR_H

#define LF_PATH_MAX 252
#define LF_ARG_MAX 252
#define LF_PATH_MAX 252
#define LF_ARG_MAX 252

enum _lf_functions {
LF_F_MOD_LOAD = 0,
LF_F_ELF_LOAD,
LF_F_MOD_LOAD = 0,
LF_F_ELF_LOAD,

LF_F_SET_ADDR,
LF_F_GET_ADDR,
LF_F_SET_ADDR,
LF_F_GET_ADDR,

LF_F_MG_MOD_LOAD,
LF_F_MG_ELF_LOAD,
LF_F_MG_MOD_LOAD,
LF_F_MG_ELF_LOAD,

LF_F_MOD_BUF_LOAD,
LF_F_MOD_BUF_LOAD,

LF_F_MOD_STOP,
LF_F_MOD_UNLOAD,
LF_F_MOD_STOP,
LF_F_MOD_UNLOAD,

LF_F_SEARCH_MOD_BY_NAME,
LF_F_SEARCH_MOD_BY_ADDRESS,
LF_F_SEARCH_MOD_BY_NAME,
LF_F_SEARCH_MOD_BY_ADDRESS,
};

struct _lf_module_load_arg {
union
{
int arg_len;
int result;
} p;
int modres;
char path[LF_PATH_MAX];
char args[LF_ARG_MAX];
} __attribute__((aligned (16)));
struct _lf_module_load_arg
{
union
{
int arg_len;
int result;
} p;
int modres;
char path[LF_PATH_MAX];
char args[LF_ARG_MAX];
} __attribute__((aligned(16)));

struct _lf_module_buffer_load_arg {
union
{
void *ptr;
int result;
} p;
union
{
int arg_len;
int modres;
} q;
char unused[LF_PATH_MAX];
char args[LF_ARG_MAX];
} __attribute__((aligned (16)));
struct _lf_module_buffer_load_arg
{
union
{
void *ptr;
int result;
} p;
union
{
int arg_len;
int modres;
} q;
char unused[LF_PATH_MAX];
char args[LF_ARG_MAX];
} __attribute__((aligned(16)));

struct _lf_elf_load_arg {
union
{
u32 epc;
int result;
} p;
u32 gp;
char path[LF_PATH_MAX];
char secname[LF_ARG_MAX];
} __attribute__((aligned (16)));
struct _lf_elf_load_arg
{
union
{
u32 epc;
int result;
} p;
u32 gp;
char path[LF_PATH_MAX];
char secname[LF_ARG_MAX];
} __attribute__((aligned(16)));

typedef struct
typedef struct
{
u32 epc;
u32 gp;
u32 sp;
u32 dummy;
u32 epc;
u32 gp;
u32 sp;
u32 dummy;
} t_ExecData;

int LoadFileInit();
int LoadFileInit();
void LoadFileExit();
int LoadModule(const char *path, int arg_len, const char *args);
int LoadMemModule(int mode, void *modptr, unsigned int modsize, int arg_len, const char *args);
int GetOPLModInfo(int id, void **pointer, unsigned int *size);
int LoadOPLModule(int id, int mode, int arg_len, const char *args);
int LoadElf(const char *path, t_ExecData *data);
int LoadElf(const char *path, t_ExecData *data);
void ChangeModuleName(const char *name, const char *newname);
#ifdef __EESIO_DEBUG
void ListModules(void);
Expand Down
64 changes: 33 additions & 31 deletions ee_core/include/modules.h
View file
Original file line number Diff line number Diff line change
@@ -1,40 +1,42 @@
enum OPL_MODULE_ID{
//Basic modules
OPL_MODULE_ID_UDNL = 1,
OPL_MODULE_ID_IOPRP,
OPL_MODULE_ID_IMGDRV,

//USB mode modules
OPL_MODULE_ID_USBD,

//SMB mode modules
OPL_MODULE_ID_SMSTCPIP,
OPL_MODULE_ID_SMAP,
OPL_MODULE_ID_SMBINIT,

//VMC module
OPL_MODULE_ID_MCEMU,

//Debugging modules
OPL_MODULE_ID_UDPTTY,
OPL_MODULE_ID_IOPTRAP,
OPL_MODULE_ID_DRVTIF,
OPL_MODULE_ID_TIFINET,

OPL_MODULE_ID_COUNT
enum OPL_MODULE_ID {
//Basic modules
OPL_MODULE_ID_UDNL = 1,
OPL_MODULE_ID_IOPRP,
OPL_MODULE_ID_IMGDRV,

//USB mode modules
OPL_MODULE_ID_USBD,

//SMB mode modules
OPL_MODULE_ID_SMSTCPIP,
OPL_MODULE_ID_SMAP,
OPL_MODULE_ID_SMBINIT,

//VMC module
OPL_MODULE_ID_MCEMU,

//Debugging modules
OPL_MODULE_ID_UDPTTY,
OPL_MODULE_ID_IOPTRAP,
OPL_MODULE_ID_DRVTIF,
OPL_MODULE_ID_TIFINET,

OPL_MODULE_ID_COUNT
};

typedef struct {
void *ptr;
unsigned int info; //Upper 8 bits = module ID
typedef struct
{
void *ptr;
unsigned int info; //Upper 8 bits = module ID
} irxptr_t;

typedef struct {
irxptr_t *modules;
int count;
typedef struct
{
irxptr_t *modules;
int count;
} irxtab_t;

//Macros for working with module information.
#define GET_OPL_MOD_ID(x) ((x) >> 24)
#define SET_OPL_MOD_ID(x) ((x) << 24)
#define GET_OPL_MOD_SIZE(x) ((x) & 0x00FFFFFF)
#define GET_OPL_MOD_SIZE(x) ((x)&0x00FFFFFF)
Loading

0 comments on commit fce8f32

Please sign in to comment.