ee_core: fix patch system, leave only device independent patches

Author: rickgaiser

ee/ee_core/include/interface.h

@@ -36,26 +36,15 @@ typedef struct
 #define EECORE_FLAG_GSM_C_2     (1<<15) // GSM: Enable FIELD flip type 2
 #define EECORE_FLAG_GSM_C_3     (1<<16) // GSM: Enable FIELD flip type 3
 
-// Backing stores, only used by patches!
-#define BDM_ILK_MODE (1<< 0)
-#define BDM_M4S_MODE (1<< 1)
-#define BDM_USB_MODE (1<< 2)
-#define BDM_UDP_MODE (1<< 3)
-#define BDM_ATA_MODE (1<< 4)
-#define BDM_NOP_MODE (1<<31)
-
 // Interface to loader
 #define EEC_MOD_CHECKSUM_COUNT 32
 struct ee_core_data
 {
     // Magic number to find
     uint32_t magic;
 
-    uint32_t ee_core_flags;
+    uint32_t flags;
     char GameID[16];
-    int GameMode;
-
-    void *initUserMemory;
 
     int *CheatList;
 

ee/ee_core/src/gsm_api.c

@@ -496,7 +496,7 @@ void EnableGSM(void)
 {
     vu32 *v_debug = (vu32 *)0x80000100;
 
-    state.flags = eec.ee_core_flags;
+    state.flags = eec.flags;
 
     // Hook SetGsCrt
     state.org_SetGsCrt = GetSyscallHandler(__NR_SetGsCrt);
@@ -523,7 +523,7 @@ void EnableGSM(void)
     //   0x1fffff5f = mask
     //   0x1fffef5f = mask + CSR
     _ee_mtdab(0x12000000);
-    if (eec.ee_core_flags & (EECORE_FLAG_GSM_C_1 | EECORE_FLAG_GSM_C_2 | EECORE_FLAG_GSM_C_3)) {
+    if (eec.flags & (EECORE_FLAG_GSM_C_1 | EECORE_FLAG_GSM_C_2 | EECORE_FLAG_GSM_C_3)) {
         // For FIELD flipping we need to also set a breakpoint for CSR register
         _ee_mtdabm(0x1fffef5f);
     } else {

ee/ee_core/src/iopmgr.c

@@ -50,7 +50,7 @@ void services_exit()
 
 //---------------------------------------------------------------------------
 // Simple module storage checksum
-void module_checksum()
+static void module_checksum()
 {
     int i, j;
     u32 *pms = (u32 *)eec.ModStorageStart;
@@ -284,7 +284,7 @@ u32 New_SifSetDma(SifDmaTransfer_t *sdd, s32 len)
     module_checksum();
 
     // Start services, some games hang here becouse the IOP is not responding
-    if (eec.ee_core_flags & EECORE_FLAG_DBC)
+    if (eec.flags & EECORE_FLAG_DBC)
         *GS_REG_BGCOLOR = COLOR_LBLUE;
 
     // Reboot the IOP
@@ -295,12 +295,12 @@ u32 New_SifSetDma(SifDmaTransfer_t *sdd, s32 len)
     sbv_patch_enable_lmb();
 
     // Reboot the IOP with neutrino modules
-    if (eec.ee_core_flags & EECORE_FLAG_DBC)
+    if (eec.flags & EECORE_FLAG_DBC)
         *GS_REG_BGCOLOR = COLOR_MAGENTA;
     New_Reset_Iop(NULL, 0);
 
     // Reboot the IOP with neutrino modules and IOPRP
-    if (eec.ee_core_flags & EECORE_FLAG_DBC)
+    if (eec.flags & EECORE_FLAG_DBC)
         *GS_REG_BGCOLOR = COLOR_YELLOW;
     New_Reset_Iop(reset_pkt->arg, reset_pkt->arglen);
 
@@ -311,7 +311,7 @@ u32 New_SifSetDma(SifDmaTransfer_t *sdd, s32 len)
     set_reg_hook = 4;
     get_reg_hook = 1;
 
-    if (eec.ee_core_flags & EECORE_FLAG_DBC)
+    if (eec.flags & EECORE_FLAG_DBC)
         *GS_REG_BGCOLOR = COLOR_BLACK;
 
     return 1;
@@ -333,7 +333,7 @@ static int Hook_SifSetReg(u32 register_num, int register_value)
         return 0;
     } else if (set_reg_hook == 1 && register_num == SIF_SYSREG_SUBADDR && register_value == (int)NULL) {
         set_reg_hook--;
-        if (eec.ee_core_flags & EECORE_FLAG_UNHOOK) {
+        if (eec.flags & EECORE_FLAG_UNHOOK) {
             //
             // Call kernel functions directly, becouse we are already in kernel mode
             //

ee/ee_core/src/main.c

@@ -54,14 +54,14 @@ int main(int argc, char **argv)
 
         // DINIT(); // In PCSX2 I see double messages after this call, why?
         DPRINTF("EE core start!\n");
-        g_ee_core_flags = eec.ee_core_flags;
+        g_ee_core_flags = eec.flags;
 
         // Enable cheat engine
         if (eec.CheatList != NULL)
             EnableCheats();
 
         // Enable GSM, only possible when kernel hooks are allowed
-        if (((eec.ee_core_flags & (EECORE_FLAG_GSM_FLD_FP | EECORE_FLAG_GSM_FRM_FP1 | EECORE_FLAG_GSM_FRM_FP2)) != 0) && ((eec.ee_core_flags & EECORE_FLAG_UNHOOK) == 0))
+        if (((eec.flags & (EECORE_FLAG_GSM_FLD_FP | EECORE_FLAG_GSM_FRM_FP1 | EECORE_FLAG_GSM_FRM_FP2)) != 0) && ((eec.flags & EECORE_FLAG_UNHOOK) == 0))
             EnableGSM();
 
         /* installing kernel hooks */