Merge pull request ps2homebrew#240 from uyjulian/new_clang_format

Clang-format related changes

.github/workflows/check-format.yml

@@ -0,0 +1,24 @@
+name: CI
+
+on:
+  push:
+  pull_request:
+  repository_dispatch:
+    types: [run_build]
+
+jobs:
+  check-format:
+    runs-on: ubuntu-latest
+    container: ps2dev/ps2dev:latest
+    steps:
+    - name: Install dependencies
+      run: |
+        apk add git make clang
+
+    - uses: actions/checkout@v2
+    - run: |
+        git fetch --prune --unshallow
+
+    - name: Check format -> make format-check
+      run: |
+        make format-check

Makefile

@@ -188,7 +188,7 @@ EE_OBJS := $(EE_OBJS:%=$(EE_OBJS_DIR)%)
 
 .SILENT:
 
-.PHONY: all release debug iopcore_debug eesio_debug ingame_debug deci2_debug clean rebuild pc_tools pc_tools_win32 oplversion
+.PHONY: all release debug iopcore_debug eesio_debug ingame_debug deci2_debug clean rebuild pc_tools pc_tools_win32 oplversion format format-check
 
 all:
 	echo "Building Open PS2 Loader $(OPL_VERSION)..."
@@ -312,6 +312,12 @@ pc_tools_win32:
 	echo "Building WIN32 iso2opl, opl2iso and genvmc..."
 	$(MAKE) _WIN32=1 -C pc
 
+format:
+	find . -type f -not -path \*modules/network/SMSTCPIP\* -a \( -iname \*.h -o -iname \*.c \) | xargs clang-format -i
+
+format-check:
+	@! find . -type f -not -path \*modules/network/SMSTCPIP\* -a \( -iname \*.h -o -iname \*.c \) | xargs clang-format -style=file -output-replacements-xml | grep "<replacement " >/dev/null
+
 $(EE_ASM_DIR):
 	@mkdir -p $@
 

ee_core/include/cd_igr_rpc.h

@@ -1,2 +1 @@
 int oplIGRShutdown(int poff);
-

ee_core/include/gsm_api.h

@@ -17,4 +17,3 @@ void Disable_GSBreakpoint(void);
 void EnableGSM(void);
 void DisableGSM(void);
 void setdve_576P(void);
-

ee_core/include/gsm_defines.h

@@ -30,20 +30,20 @@
 .equ GS_BGCOLOUR, 0x00E0
 .equ GS_CSR,      0x1000
 
-# Add-on video modes (made possible by SP193 and reprep)
+#Add - on video modes(made possible by SP193 and reprep)
 GS_MODE_DTV_576P=0x53
 
-# GSMSourceSetGsCrt
+#GSMSourceSetGsCrt
 .equ Source_INT,      0 # HALF
 .equ Source_MODE,     2 # HALF
 .equ Source_FFMD,     4 # HALF
 
-# GSMDestSetGsCrt
+#GSMDestSetGsCrt
 .equ Target_INT,      0 # HALF
 .equ Target_MODE,     2 # HALF
 .equ Target_FFMD,     4 # HALF
 
-# GSMSourceGSRegs
+#GSMSourceGSRegs
 .equ Source_PMODE,     0 # DWORD
 .equ Source_SMODE1,    8 # DWORD
 .equ Source_SMODE2,   16 # DWORD
@@ -56,7 +56,7 @@ GS_MODE_DTV_576P=0x53
 .equ Source_DISPFB2,  72 # DWORD
 .equ Source_DISPLAY2, 80 # DWORD
 
-# GSMDestGSRegs
+#GSMDestGSRegs
 .equ Target_PMODE,     0 # DWORD
 .equ Target_SMODE1,    8 # DWORD
 .equ Target_SMODE2,   16 # DWORD
@@ -69,7 +69,7 @@ GS_MODE_DTV_576P=0x53
 .equ Target_DISPFB2,  72 # DWORD
 .equ Target_DISPLAY2, 80 # DWORD
 
-# GSMFlags
+#GSMFlags
 .equ X_offset,              0 # WORD
 .equ Y_offset,              4 # WORD
 .equ ADAPTATION_fix,        8 # BYTE
@@ -84,9 +84,8 @@ GS_MODE_DTV_576P=0x53
 .equ FIELD_fix,            17 # BYTE
 .equ gs576P_param,         18 # BYTE
 
-# GSMAdapts
+#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 SMODE2_adaptation,           17 # BYTE -> Adapted SMODE2 patch value
-

ee_core/src/cd_igr_rpc.c

@@ -18,10 +18,9 @@ int oplIGRShutdown(int poff)
     if (r < 0)
         return -E_SIF_RPC_BIND;
 
-    *(s32*)UNCACHED_SEG(&poffData) = poff;
+    *(s32 *)UNCACHED_SEG(&poffData) = poff;
     if (SifCallRpc(&_igr_cd, 1, SIF_RPC_M_NOWBDC, &poffData, sizeof(poffData), NULL, 0, NULL, NULL) < 0)
         return -E_SIF_RPC_CALL;
 
     return 0;
 }
-

ee_core/src/gsm_api.c

@@ -27,7 +27,7 @@ extern void (*Old_SetGsCrt)(short int interlace, short int mode, short int ffmd)
 // NTSC
 #define GS_MODE_NTSC 0x02
 // PAL
-#define GS_MODE_PAL  0x03
+#define GS_MODE_PAL 0x03
 
 struct GSMDestSetGsCrt
 {
@@ -205,11 +205,10 @@ void DisableGSM(void)
 /* Set up the DVE for 576P mode               */
 /*--------------------------------------------*/
 void setdve_576P(void)
-{	//The parameters are exactly the same as the 480P mode's. Regardless of the model, GS revision or region.
-	dve_prepare_bus();
+{ //The parameters are exactly the same as the 480P mode's. Regardless of the model, GS revision or region.
+    dve_prepare_bus();
 
-	dve_set_reg(0x77, 0x11);
-	dve_set_reg(0x93, 0x01);
-	dve_set_reg(0x91, 0x02);
+    dve_set_reg(0x77, 0x11);
+    dve_set_reg(0x93, 0x01);
+    dve_set_reg(0x91, 0x02);
 }
-

ee_core/src/igs_api.c

@@ -186,7 +186,10 @@ static void Screenshot(u16 sbp, u8 sbw, u8 spsm, u16 width, u16 height, u32 dime
     GS_BGCOLOUR = 0xCCFFFF; //Light Yellow
 
     static u32 EnableGIFPATH3[4] ALIGNED(16) = {
-        GS_VIF1_MSKPATH3(0), GS_VIF1_NOP, GS_VIF1_NOP, GS_VIF1_NOP,
+        GS_VIF1_MSKPATH3(0),
+        GS_VIF1_NOP,
+        GS_VIF1_NOP,
+        GS_VIF1_NOP,
     };
 
     u32 DMAChain[20 * 2] ALIGNED(16);

ee_core/src/main.c

@@ -140,8 +140,7 @@ int main(int argc, char **argv)
 {
     int argOffset;
 
-    if(isInit)
-    {   //Ignore argv[0], as it contains the name of this module ("EELOAD"), as passed by the LoadExecPS2 syscall itself (2nd invocation and later will be from LoadExecPS2).
+    if (isInit) { //Ignore argv[0], as it contains the name of this module ("EELOAD"), as passed by the LoadExecPS2 syscall itself (2nd invocation and later will be from LoadExecPS2).
         argv++;
         argc--;
 
@@ -155,4 +154,3 @@ int main(int argc, char **argv)
 
     return 0;
 }
-

ee_core/src/modmgr.c

@@ -182,11 +182,11 @@ int LoadElf(const char *path, t_ExecData *data)
 
     if (arg.epc != 0) {
         data->epc = arg.epc;
-        data->gp  = arg.gp;
+        data->gp = arg.gp;
 
         return 0;
     } else
-         return -SCE_ELOADMISS;
+        return -SCE_ELOADMISS;
 }
 
 /*----------------------------------------------------------------------------------------*/

ee_core/src/padhook.c

@@ -142,7 +142,7 @@ static void IGR_Thread(void *arg)
 #ifdef IGS
         || ((Pad_Data.combo_type == IGR_COMBO_UP) && (EnableGSMOp))
 #endif
-            ) {
+    ) {
 
         if (!DisableDebug)
             GS_BGCOLOUR = 0xFF8000; // Blue sky
@@ -286,7 +286,7 @@ static int IGR_Intc_Handler(int cause)
 #ifdef IGS
                     || ((pad_pos_combo2 == IGR_COMBO_UP) && (EnableGSMOp)) // UP combo, so take IGS
 #endif
-                    )
+                )
 
                     Pad_Data.combo_type = pad_pos_combo2;
             }
@@ -349,7 +349,8 @@ static int IGR_Intc_Handler(int cause)
 
         *R_EE_GS_CSR = 0x100; //Reset GS
         asm volatile("sync.l\n");
-	while(*R_EE_GS_CSR & 0x100){};
+        while (*R_EE_GS_CSR & 0x100) {
+        };
 
         //Disable interrupts & reset some peripherals, back to a standard state.
         //Call ResetEE(0x7F) from an interrupt handler.
@@ -420,8 +421,7 @@ void Install_IGR(void)
     Pad_Data.prev_frame = 0x00;
 
     // Do not install the IGR thread or interrupt handler more than once.
-    if (IGR_Thread_ID < 0)
-    {
+    if (IGR_Thread_ID < 0) {
         // Create and start IGR thread
         thread_param.gp_reg = &_gp;
         thread_param.func = IGR_Thread;
@@ -433,8 +433,7 @@ void Install_IGR(void)
         StartThread(IGR_Thread_ID, NULL);
     }
 
-    if (IGR_Intc_ID < 0)
-    {
+    if (IGR_Intc_ID < 0) {
         // Create IGR interrupt handler
         IGR_Intc_ID = AddIntcHandler(kINTC_VBLANK_END, IGR_Intc_Handler, 0);
         EnableIntc(kINTC_VBLANK_END);
@@ -484,8 +483,7 @@ static int Hook_scePad2CreateSocket(pad2socketparam_t *SocketParam, void *addr)
     ret = scePad2CreateSocket(SocketParam, addr);
 
     // Install IGR with libpad2 parameters
-    if ((SocketParam == NULL) || (SocketParam->port == 0 && SocketParam->slot == 0))
-    {
+    if ((SocketParam == NULL) || (SocketParam->port == 0 && SocketParam->slot == 0)) {
         Install_IGR();
         Set_libpad_Params(addr);
     }
@@ -554,7 +552,7 @@ int Install_PadOpen_Hook(u32 mem_start, u32 mem_end, int mode)
                     // Search & patch for calls to PadOpen
                     ptr2 = (u32 *)mem_start;
                     while (ptr2) {
-                        mem_size2 = (u32)((u8*)mem_end - (u8*)ptr2);
+                        mem_size2 = (u32)((u8 *)mem_end - (u8 *)ptr2);
 
                         ptr2 = find_pattern_with_mask(ptr2, mem_size2, pattern, mask, sizeof(pattern));
                         if (ptr2) {
@@ -598,7 +596,7 @@ int Install_PadOpen_Hook(u32 mem_start, u32 mem_end, int mode)
                         // Search & patch for PadOpen function address
                         ptr2 = (u32 *)mem_start;
                         while (ptr2) {
-                            mem_size2 = (u32)((u8*)mem_end - (u8*)ptr2);
+                            mem_size2 = (u32)((u8 *)mem_end - (u8 *)ptr2);
 
                             ptr2 = find_pattern_with_mask(ptr2, mem_size2, pattern, mask, sizeof(pattern));
                             if (ptr2) {