refactor

PSP-Archive · Sep 7, 2024 · de7100f · de7100f
1 parent c312b04
commit de7100f
Show file tree

Hide file tree

Showing 89 changed files with 90 additions and 88 deletions.
diff --git a/Makefile b/Makefile
@@ -158,6 +158,8 @@ copy-bin:
 	$(Q)cp common/include/kubridge.h dist/PC/sdk/include/
 	$(Q)cp common/include/systemctrl.h dist/PC/sdk/include/
 	$(Q)cp common/include/systemctrl_se.h dist/PC/sdk/include/
+	$(Q)cp common/include/module2.h dist/PC/sdk/include/
+	$(Q)cp common/include/ark.h dist/PC/sdk/include/
 	$(Q)cp -r contrib/PC/ciso dist/PC/
 
 encrypt-prx: \

diff --git a/common/include/globals.h → common/include/ark.h b/common/include/globals.h → common/include/ark.h
diff --git a/common/include/functions.h b/common/include/functions.h
@@ -21,7 +21,7 @@
 #include <sdk.h>
 #include <psploadexec_kernel.h>
 #include "module2.h"
-#include "globals.h"
+#include "ark.h"
 
 struct minZipHeader {
     char pk[2];

diff --git a/common/include/rebootconfig.h b/common/include/rebootconfig.h
@@ -23,7 +23,7 @@
 #include <systemctrl_se.h>
 #include <functions.h>
 #include "ansi_c_functions.h"
-#include "globals.h"
+#include "ark.h"
 
 #define REBOOTEX_MAX_SIZE 0x5000
 #define BTCNF_MAGIC 0x0F803001

diff --git a/common/include/systemctrl.h b/common/include/systemctrl.h
@@ -27,7 +27,7 @@ extern "C"{
 #include <pspiofilemgr_kernel.h>
 #include <pspthreadman_kernel.h>
 #include <psploadcore.h>
-#include <globals.h>
+#include <ark.h>
 #include <pspkernel.h>
 #include <pspinit.h>
 #include "module2.h"
@@ -38,7 +38,7 @@ extern "C"{
 //#define sctrlKernelQuerySystemCall sceKernelQuerySystemCall
 
 // Prologue Module Start Handler
-typedef void (* STMOD_HANDLER)(SceModule2 *);
+typedef int (* STMOD_HANDLER)(SceModule2 *);
 
 // Thread Context
 typedef struct SceThreadContext SceThreadContext;

diff --git a/common/include/systemctrl_private.h b/common/include/systemctrl_private.h
@@ -23,7 +23,7 @@ extern "C"{
 #endif
 
 #include "module2.h"
-#include "globals.h"
+#include "ark.h"
 
 /*
  * This File contains the required headers for exported, but internally used

diff --git a/core/compat/pentazemin/impose_patch.c b/core/compat/pentazemin/impose_patch.c
@@ -5,7 +5,7 @@
 #include <systemctrl.h>
 #include <systemctrl_se.h>
 #include <systemctrl_private.h>
-#include <globals.h> 
+#include <ark.h> 
 #include "functions.h"
 #include "macros.h"
 #include "exitgame.h"

diff --git a/core/compat/pentazemin/init_patch.c b/core/compat/pentazemin/init_patch.c
@@ -5,7 +5,7 @@
 #include <systemctrl.h>
 #include <systemctrl_se.h>
 #include <systemctrl_private.h>
-#include <globals.h> 
+#include <ark.h> 
 #include "functions.h"
 #include "macros.h"
 #include "exitgame.h"

diff --git a/core/compat/pentazemin/loadexec.c b/core/compat/pentazemin/loadexec.c
@@ -5,7 +5,7 @@
 #include <systemctrl.h>
 #include <systemctrl_se.h>
 #include <systemctrl_private.h>
-#include <globals.h> 
+#include <ark.h> 
 #include "functions.h"
 #include "macros.h"
 

diff --git a/core/compat/pentazemin/main.c b/core/compat/pentazemin/main.c
@@ -20,7 +20,7 @@
 #include <systemctrl.h>
 #include <systemctrl_se.h>
 #include <systemctrl_private.h>
-#include <globals.h>
+#include <ark.h>
 #include "functions.h"
 #include "macros.h"
 #include "exitgame.h"

diff --git a/core/compat/pentazemin/syspatch.c b/core/compat/pentazemin/syspatch.c
@@ -5,7 +5,7 @@
 #include <systemctrl.h>
 #include <systemctrl_se.h>
 #include <systemctrl_private.h>
-#include <globals.h> 
+#include <ark.h> 
 #include "functions.h"
 #include "macros.h"
 #include "exitgame.h"

diff --git a/core/compat/pentazemin/vitamem.c b/core/compat/pentazemin/vitamem.c
@@ -6,7 +6,7 @@
 #include <pspiofilemgr.h>
 #include <stdio.h>
 #include <string.h>
-#include "globals.h"
+#include "ark.h"
 #include <systemctrl.h>
 #include "sysmem.h"
 

diff --git a/core/compat/psp/high_mem.c b/core/compat/psp/high_mem.c
@@ -23,7 +23,7 @@
 #include <pspiofilemgr.h>
 #include <stdio.h>
 #include <string.h>
-#include "globals.h"
+#include "ark.h"
 #include <systemctrl.h>
 #include "sysmem.h"
 

diff --git a/core/compat/psp/libertas.c b/core/compat/psp/libertas.c
@@ -18,7 +18,7 @@
 #include <string.h>
 #include <pspiofilemgr.h>
 #include "libertas.h"
-#include "globals.h"
+#include "ark.h"
 #include "macros.h"
 #include "systemctrl_se.h"
 

diff --git a/core/compat/psp/main.c b/core/compat/psp/main.c
@@ -1,6 +1,6 @@
 #include <pspsdk.h>
 #include <pspinit.h>
-#include <globals.h>
+#include <ark.h>
 #include <graphics.h>
 #include <macros.h>
 #include <module2.h>

diff --git a/core/compat/psp/pops4tool.c b/core/compat/psp/pops4tool.c
@@ -1,7 +1,7 @@
 #include <pspsdk.h>
 #include <pspsysmem_kernel.h>
 #include <pspinit.h>
-#include <globals.h>
+#include <ark.h>
 #include <graphics.h>
 #include <macros.h>
 #include <module2.h>

diff --git a/core/compat/psp/region_free.c b/core/compat/psp/region_free.c
@@ -24,7 +24,7 @@
 #include <systemctrl_se.h>
 #include <stdio.h>
 #include <string.h>
-#include "globals.h"
+#include "ark.h"
 #include "macros.h"
 #include "module2.h"
 #include "region_free.h"

diff --git a/core/compat/psp/syspatch.c b/core/compat/psp/syspatch.c
@@ -1,7 +1,7 @@
 #include <pspsdk.h>
 #include <pspsysmem_kernel.h>
 #include <pspinit.h>
-#include <globals.h>
+#include <ark.h>
 #include <graphics.h>
 #include <macros.h>
 #include <module2.h>

diff --git a/core/compat/vita/filesystem.c b/core/compat/vita/filesystem.c
@@ -21,7 +21,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <module2.h>
-#include <globals.h>
+#include <ark.h>
 #include <systemctrl.h>
 #include <systemctrl_private.h>
 #include <macros.h>

diff --git a/core/compat/vita/gameinfo.c b/core/compat/vita/gameinfo.c
@@ -5,7 +5,7 @@
 #include <rebootconfig.h>
 #include <systemctrl.h>
 
-#include "globals.h"
+#include "ark.h"
 #include "macros.h"
 #include "module2.h"
 

diff --git a/core/compat/vita/main.c b/core/compat/vita/main.c
@@ -20,7 +20,7 @@
 #include <systemctrl.h>
 #include <systemctrl_se.h>
 #include <systemctrl_private.h>
-#include <globals.h>
+#include <ark.h>
 #include "functions.h"
 #include "macros.h"
 #include "exitgame.h"

diff --git a/core/compat/vita/syspatch.c b/core/compat/vita/syspatch.c
@@ -7,7 +7,7 @@
 #include <systemctrl.h>
 #include <systemctrl_se.h>
 #include <systemctrl_private.h>
-#include <globals.h> 
+#include <ark.h> 
 #include "functions.h"
 #include "macros.h"
 #include "exitgame.h"

diff --git a/core/compat/vitapops/main.c b/core/compat/vitapops/main.c
@@ -1,5 +1,5 @@
 #include <pspsdk.h>
-#include <globals.h>
+#include <ark.h>
 #include <graphics.h>
 #include <macros.h>
 #include <module2.h>

diff --git a/core/compat/vitapops/popsdisplay.c b/core/compat/vitapops/popsdisplay.c
@@ -1,5 +1,5 @@
 #include <pspsdk.h>
-#include <globals.h>
+#include <ark.h>
 #include <macros.h>
 #include <module2.h>
 #include <pspdisplay_kernel.h>

diff --git a/core/compat/vitapops/syspatch.c b/core/compat/vitapops/syspatch.c
@@ -1,5 +1,5 @@
 #include <pspsdk.h>
-#include <globals.h>
+#include <ark.h>
 #include <macros.h>
 #include <module2.h>
 #include <pspdisplay_kernel.h>

diff --git a/core/inferno/iodrv_funcs.c b/core/inferno/iodrv_funcs.c
@@ -28,7 +28,7 @@
 #include <pspthreadman_kernel.h>
 #include "systemctrl_private.h"
 #include "inferno.h"
-#include "globals.h"
+#include "ark.h"
 #include "macros.h"
 
 /*

diff --git a/core/inferno/isocache.c b/core/inferno/isocache.c
@@ -10,7 +10,7 @@
 #include <systemctrl.h>
 #include <systemctrl_se.h>
 #include "systemctrl_private.h"
-#include "globals.h"
+#include "ark.h"
 #include "macros.h"
 
 static u32 read_call = 0;

diff --git a/core/inferno/isoread.c b/core/inferno/isoread.c
@@ -28,7 +28,7 @@
 #include "systemctrl_private.h"
 #include "inferno.h"
 #include "lz4.h"
-#include "globals.h"
+#include "ark.h"
 #include "macros.h"
 
 #define CSO_MAGIC 0x4F534943 // CISO

diff --git a/core/inferno/main.c b/core/inferno/main.c
@@ -28,7 +28,7 @@
 #include <pspinit.h>
 #include "systemctrl_private.h"
 #include "inferno.h"
-#include "globals.h"
+#include "ark.h"
 #include "macros.h"
 
 PSP_MODULE_INFO("PRO_Inferno_Driver", 0x1000, 2, 1);

diff --git a/core/inferno/umd.c b/core/inferno/umd.c
@@ -27,7 +27,7 @@
 #include <psprtc.h>
 #include "systemctrl_private.h"
 #include "inferno.h"
-#include "globals.h"
+#include "ark.h"
 #include "macros.h"
 
 extern int sceKernelGetCompiledSdkVersion(void);

diff --git a/core/popcorn/main.c b/core/popcorn/main.c
@@ -24,7 +24,7 @@
 #include <systemctrl.h>
 #include <systemctrl_private.h>
 #include <macros.h>
-#include <globals.h>
+#include <ark.h>
 #include <functions.h>
 
 extern unsigned char g_icon_png[6108];

diff --git a/core/stargate/chn_iso.c b/core/stargate/chn_iso.c
@@ -29,7 +29,7 @@
 #include "systemctrl_private.h"
 #include "kubridge.h"
 #include "strsafe.h"
-#include "globals.h"
+#include "ark.h"
 #include "macros.h"
 
 typedef struct _pspMsPrivateDirent {

diff --git a/core/stargate/gamefix.c b/core/stargate/gamefix.c
@@ -9,7 +9,7 @@
 #include <systemctrl.h>
 #include <systemctrl_private.h>
 #include <macros.h>
-#include <globals.h>
+#include <ark.h>
 #include <functions.h>
 
 

diff --git a/core/stargate/io_patch.c b/core/stargate/io_patch.c
@@ -9,7 +9,7 @@
 #include <systemctrl.h>
 #include <systemctrl_private.h>
 #include <macros.h>
-#include <globals.h>
+#include <ark.h>
 #include <functions.h>
 
 struct DeviceSize {

diff --git a/core/stargate/main.c b/core/stargate/main.c
@@ -26,7 +26,7 @@
 #include <systemctrl.h>
 #include <systemctrl_private.h>
 #include <macros.h>
-#include <globals.h>
+#include <ark.h>
 #include <functions.h>
 #include "loadmodule_patch.h"
 #include "nodrm_patch.h"

diff --git a/core/systemctrl/debug/dummy.c b/core/systemctrl/debug/dummy.c
@@ -1,7 +1,7 @@
 #include <pspsdk.h>
 #include <systemctrl.h>
 #include <systemctrl_private.h>
-#include <globals.h> 
+#include <ark.h> 
 #include "rebootex.h"
 #include "modulemanager.h"
 #include "loadercore.h"

diff --git a/core/systemctrl/debug/printk.c b/core/systemctrl/debug/printk.c
@@ -38,7 +38,7 @@
 #include <systemctrl_private.h>
 #include <stdarg.h>
 #include <string.h>
-#include <globals.h>
+#include <ark.h>
 
 #if DEBUG >= 3
 

diff --git a/core/systemctrl/include/loadexec_patch.h b/core/systemctrl/include/loadexec_patch.h
@@ -4,7 +4,7 @@
 #include <sdk.h>
 #include <module2.h>
 #include <macros.h>
-#include <globals.h>
+#include <ark.h>
 
 extern void patchLoadExec(SceModule2* loadexec, u32 LoadReboot, u32 GetUserLevel, int k1_checks);
 

diff --git a/core/systemctrl/main.c b/core/systemctrl/main.c
@@ -18,7 +18,7 @@
 #include <pspsdk.h>
 #include <systemctrl.h>
 #include <systemctrl_private.h>
-#include <globals.h> 
+#include <ark.h> 
 #include "rebootex.h"
 #include "modulemanager.h"
 #include "loadercore.h"

diff --git a/core/systemctrl/src/cryptography.c b/core/systemctrl/src/cryptography.c
@@ -23,7 +23,7 @@
 #include <string.h>
 #include <macros.h>
 #include <module2.h>
-#include <globals.h>
+#include <ark.h>
 #include <functions.h>
 #include "imports.h"
 #include "elf.h"

diff --git a/core/systemctrl/src/exitgame.c b/core/systemctrl/src/exitgame.c
@@ -23,7 +23,7 @@
 #include <systemctrl_se.h>
 #include <macros.h>
 #include <string.h>
-#include <globals.h>
+#include <ark.h>
 #include <functions.h>
 #include <graphics.h>
 

diff --git a/core/systemctrl/src/gameinfo.c b/core/systemctrl/src/gameinfo.c
@@ -5,7 +5,7 @@
 #include <rebootconfig.h>
 #include <systemctrl.h>
 
-#include "globals.h"
+#include "ark.h"
 #include "macros.h"
 #include "module2.h"
 

diff --git a/core/systemctrl/src/hooknids.c b/core/systemctrl/src/hooknids.c
@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <macros.h>
-#include <globals.h>
+#include <ark.h>
 #include <systemctrl.h>
 #include "nidresolver.h"
 #include "imports.h"

diff --git a/core/systemctrl/src/interruptman.c b/core/systemctrl/src/interruptman.c
@@ -19,7 +19,7 @@
 #include <pspkernel.h>
 #include <stdio.h>
 #include <string.h>
-#include <globals.h>
+#include <ark.h>
 #include <macros.h>
 #include "module2.h"
 

diff --git a/core/systemctrl/src/leda.c b/core/systemctrl/src/leda.c
@@ -7,7 +7,7 @@
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "globals.h"
+#include "ark.h"
 #include "macros.h"
 #include <systemctrl.h>