Skip to content

Commit

Permalink
Merge pull request #452 from AKuHAK/clean_code
Browse files Browse the repository at this point in the history
Tab characters replaced with spaces
  • Loading branch information
uyjulian authored Jun 29, 2021
2 parents 6845d94 + a3703bf commit e41fac7
Show file tree
Hide file tree
Showing 184 changed files with 3,049 additions and 3,025 deletions.
12 changes: 6 additions & 6 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
* text=auto

# Custom for Visual Studio
*.cs diff=csharp
*.cs diff=csharp

# Standard to msysgit
*.doc diff=astextplain
*.DOC diff=astextplain
*.doc diff=astextplain
*.DOC diff=astextplain
*.docx diff=astextplain
*.DOCX diff=astextplain
*.dot diff=astextplain
*.DOT diff=astextplain
*.pdf diff=astextplain
*.PDF diff=astextplain
*.rtf diff=astextplain
*.RTF diff=astextplain
*.PDF diff=astextplain
*.rtf diff=astextplain
*.RTF diff=astextplain
8 changes: 4 additions & 4 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -109,10 +109,10 @@ GUI:

COMPATIBILITY:

* Kingdom Hearts 2 Final Mix (Gummi Fix)
* Baldar's Gate Series (HDD)
* Champions of Norrath (HDD)
* New Mode 7 fixes stuttering with games such as DDR and Pop'N Music (HDD ONLY!)
* Kingdom Hearts 2 Final Mix (Gummi Fix)
* Baldar's Gate Series (HDD)
* Champions of Norrath (HDD)
* New Mode 7 fixes stuttering with games such as DDR and Pop'N Music (HDD ONLY!)

==== Version 0.9 ====

Expand Down
2 changes: 1 addition & 1 deletion ee_core/include/asm.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Copyright 2006-2008 Polo
Licenced under Academic Free License version 3.0
Review Open-Ps2-Loader README & LICENSE files for further details.
Some parts of the code are taken from HD Project by Polo
*/

Expand Down
2 changes: 1 addition & 1 deletion ee_core/include/ee_core.h
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,6 @@ extern int PadEmuSettings;
extern int DisableDebug;
#define GS_BGCOLOUR *((volatile unsigned long int *)0x120000E0)

extern int *gCheatList; //Store hooks/codes addr+val pairs
extern int *gCheatList; // Store hooks/codes addr+val pairs

#endif
8 changes: 4 additions & 4 deletions ee_core/include/gsm_defines.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
#
*/

.equ TRAP_BASE, 0x12000000
.equ TRAP_MASK, 0x1FFFEF0F
.equ GS_BASE, 0x12000000
.equ TRAP_BASE, 0x12000000
.equ TRAP_MASK, 0x1FFFEF0F
.equ GS_BASE, 0x12000000
.equ GS_PMODE, 0x0000
.equ GS_SMODE1, 0x0010
.equ GS_SMODE2, 0x0020
Expand Down Expand Up @@ -87,5 +87,5 @@ GS_MODE_DTV_576P=0x53
#GSMAdapts
.equ Adapted_DISPLAY1, 0 # DWORD
.equ Adapted_DISPLAY2, 8 # DWORD
.equ Interlace_FRAME_Mode_Flag, 16 # BYTE -> Double Height for SMODE2's INT=1 (Interlace Mode) and FFMD=1 (FRAME Mode. Read every line)
.equ Interlace_FRAME_Mode_Flag, 16 # BYTE -> Double Height for SMODE2's INT=1 (Interlace Mode) and FFMD=1 (FRAME Mode. Read every line)
.equ SMODE2_adaptation, 17 # BYTE -> Adapted SMODE2 patch value
22 changes: 11 additions & 11 deletions ee_core/include/igs_api.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@
#define GS_TRXDIR 0x53
#define GS_FINISH 0x61

//Pixel storage format
#define GS_PSM_CT32 0x00 //32 bits = 4 bytes Example: SLUS_202.73 (Namco Museum 50th Anniversary)
#define GS_PSM_CT24 0x01 //24 bits = 3 bytes Example: SLPS_250.88 (Final Fantasy X International)
#define GS_PSM_CT16 0x02 //16 bits = 2 bytes Example: SLUS_215.56 (Konami Kids Playground: Dinosaurs Shapes & Colors)
#define GS_PSM_CT16S 0x0A //16 bits = 2 bytes Example: SLUS_215.41 (Ratatouille)
// Pixel storage format
#define GS_PSM_CT32 0x00 // 32 bits = 4 bytes Example: SLUS_202.73 (Namco Museum 50th Anniversary)
#define GS_PSM_CT24 0x01 // 24 bits = 3 bytes Example: SLPS_250.88 (Final Fantasy X International)
#define GS_PSM_CT16 0x02 // 16 bits = 2 bytes Example: SLUS_215.56 (Konami Kids Playground: Dinosaurs Shapes & Colors)
#define GS_PSM_CT16S 0x0A // 16 bits = 2 bytes Example: SLUS_215.41 (Ratatouille)

//Channel #1 (VIF1)
// Channel #1 (VIF1)
#define GS_VIF1_STAT ((volatile u32 *)(0x10003c00)) // VIF Status Register
#define GS_VIF1_STAT_FDR (1 << 23) // VIF1-FIFO transfer direction: VIF1 -> Main memory/SPRAM"
#define GS_VIF1_MSKPATH3(mask) ((u32)(mask) | ((u32)0x06 << 24))
Expand All @@ -53,15 +53,15 @@
#define GS_VIF1_DIRECT(count) ((u32)(count) | ((u32)(0x50) << 24))
#define GS_VIF1_FIFO ((volatile u128 *)(0x10005000))

//DMA CH1 REGISTERS (Linked to VIF1)
// DMA CH1 REGISTERS (Linked to VIF1)
#define GS_D1_CHCR ((volatile u32 *)(0x10009000))
#define GS_D1_MADR ((volatile u32 *)(0x10009010))
#define GS_D1_QWC ((volatile u32 *)(0x10009020))
#define GS_D1_TADR ((volatile u32 *)(0x10009030))
#define GS_D1_ASR0 ((volatile u32 *)(0x10009040))
#define GS_D1_ASR1 ((volatile u32 *)(0x10009050))

//Channel #2 (GIF)
// Channel #2 (GIF)
#define GS_GIF_AD 0x0e

#define GS_GIFTAG(NLOOP, EOP, PRE, PRIM, FLG, NREG) \
Expand All @@ -72,7 +72,7 @@
((u64)(FLG) << 58) | \
((u64)(NREG) << 60)

//GS Registers
// GS Registers
#define GS_GSBITBLTBUF_SET(sbp, sbw, spsm, dbp, dbw, dpsm) \
((u64)(sbp) | ((u64)(sbw) << 16) | \
((u64)(spsm) << 24) | ((u64)(dbp) << 32) | \
Expand All @@ -94,7 +94,7 @@
#define GS_GSTRXREG 0x52
#define GS_GSTRXDIR 0x53

//GS Priviledge Registers
// GS Priviledge Registers
#define GS_CSR_FINISH (1 << 1)
#define GS_CSR (volatile u64 *)0x12001000 // GS CSR (GS System Status) Register
#define GS_IMR (volatile u64 *)0x12001010 // GS IMR (GS Interrupt Mask) Register
Expand All @@ -115,7 +115,7 @@

#define GS_WRITEBACK_DCACHE 0

//GSM Stuff
// GSM Stuff
struct GSMSourceSetGsCrt
{
s16 interlace;
Expand Down
2 changes: 1 addition & 1 deletion ee_core/include/iopmgr.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Copyright 2006-2008 Polo
Licenced under Academic Free License version 3.0
Review OpenUsbLd README & LICENSE files for further details.
Some parts of the code are taken from HD Project by Polo
*/

Expand Down
2 changes: 1 addition & 1 deletion ee_core/include/modmgr.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Copyright 2006-2008 Polo
Licenced under Academic Free License version 3.0
Review OpenUsbLd README & LICENSE files for further details.
Some parts of the code are taken from HD Project by Polo
*/

Expand Down
18 changes: 9 additions & 9 deletions ee_core/include/modules.h
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
enum OPL_MODULE_ID {
//Basic modules
// Basic modules
OPL_MODULE_ID_UDNL = 1,
OPL_MODULE_ID_IOPRP,
OPL_MODULE_ID_IMGDRV,
OPL_MODULE_ID_RESETSPU,

//USB mode modules
// USB mode modules
OPL_MODULE_ID_USBD,
OPL_MODULE_ID_USBMASSBD,

//iLink mode modules
// iLink mode modules
OPL_MODULE_ID_ILINK,
OPL_MODULE_ID_ILINKBD,

//SMB mode modules
// SMB mode modules
OPL_MODULE_ID_SMSTCPIP,
OPL_MODULE_ID_SMAP,
OPL_MODULE_ID_SMBINIT,

//VMC module
// VMC module
OPL_MODULE_ID_MCEMU,

OPL_MODULE_ID_PADEMU,

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

//Special patches
// Special patches
OPL_MODULE_ID_IOP_PATCH,

OPL_MODULE_ID_COUNT
Expand All @@ -38,7 +38,7 @@ enum OPL_MODULE_ID {
typedef struct
{
void *ptr;
unsigned int info; //Upper 8 bits = module ID
unsigned int info; // Upper 8 bits = module ID
} irxptr_t;

typedef struct
Expand All @@ -47,7 +47,7 @@ typedef struct
int count;
} irxtab_t;

//Macros for working with module information.
// 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)
6 changes: 3 additions & 3 deletions ee_core/include/padhook.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
padhook.h Open PS2 Loader In Game Reset
Copyright 2009-2010, Ifcaro, jimmikaelkael & Polo
Copyright 2006-2008 Polo
Licenced under Academic Free License version 3.0
Expand Down Expand Up @@ -75,11 +75,11 @@ typedef struct
u32 *pattern;
u32 *mask;
int size;
u16 type; //Whether it's libpad or libpad2
u16 type; // Whether it's libpad or libpad2
u16 version;
} pattern_t;

#define IGR_LIBPAD_NONE 0 //libpad not found
#define IGR_LIBPAD_NONE 0 // libpad not found
#define IGR_LIBPAD 1
#define IGR_LIBPAD2 2

Expand Down
Loading

0 comments on commit e41fac7

Please sign in to comment.