Change Debug Colors setting to be clearer for all languages

ps2homebrew · Aug 17, 2021 · 443b756 · 443b756
1 parent c43f188
commit 443b756
Show file tree

Hide file tree

Showing 13 changed files with 46 additions and 46 deletions.
diff --git a/ee_core/include/ee_core.h b/ee_core/include/ee_core.h
@@ -87,7 +87,7 @@ extern int EnablePadEmuOp;
 extern int PadEmuSettings;
 #endif
 
-extern int DisableDebug;
+extern int EnableDebug;
 #define GS_BGCOLOUR *((volatile unsigned long int *)0x120000E0)
 
 extern int *gCheatList; // Store hooks/codes addr+val pairs

diff --git a/ee_core/src/asm.S b/ee_core/src/asm.S
@@ -55,7 +55,7 @@
 
 /* loader.h */
 .extern g_compat_mask
-.extern DisableDebug
+.extern EnableDebug
 
 /* padhook.c */
 .extern Install_PadOpen_Hook
@@ -210,7 +210,7 @@ Hook_SifSetReg:
     bne     $v0, $zero, 3f
     nop
 
-    lw      $v0, DisableDebug
+    lw      $v0, EnableDebug
     bne     $v0, $zero, 2f
     nop
 

diff --git a/ee_core/src/iopmgr.c b/ee_core/src/iopmgr.c
@@ -145,7 +145,7 @@ static void ResetIopSpecial(const char *args, unsigned int arglen)
 int New_Reset_Iop(const char *arg, int arglen)
 {
     DPRINTF("New_Reset_Iop start!\n");
-    if (!DisableDebug)
+    if (EnableDebug)
         GS_BGCOLOUR = 0xFF00FF; // Purple
 
     SifInitRpc(0);
@@ -166,12 +166,12 @@ int New_Reset_Iop(const char *arg, int arglen)
     sbv_patch_enable_lmb();
 
     ResetIopSpecial(NULL, 0);
-    if (!DisableDebug)
+    if (EnableDebug)
         GS_BGCOLOUR = 0x00A5FF; // Orange
 
     if (arglen > 0) {
         ResetIopSpecial(&arg[10], arglen - 10);
-        if (!DisableDebug)
+        if (EnableDebug)
             GS_BGCOLOUR = 0x00FFFF; // Yellow
     }
 
@@ -199,7 +199,7 @@ int New_Reset_Iop(const char *arg, int arglen)
     if (set_reg_disabled)
         set_reg_hook = 4;
 
-    if (!DisableDebug)
+    if (EnableDebug)
         GS_BGCOLOUR = 0x000000; // Black
 
     return 1;

diff --git a/ee_core/src/main.c b/ee_core/src/main.c
@@ -37,7 +37,7 @@ int EnableCheatOp;
 int EnablePadEmuOp;
 int PadEmuSettings;
 #endif
-int DisableDebug;
+int EnableDebug;
 int *gCheatList; // Store hooks/codes addr+val pairs
 
 static int eecoreInit(int argc, char **argv)
@@ -64,10 +64,10 @@ static int eecoreInit(int argc, char **argv)
     DPRINTF("Game Mode = %d\n", GameMode);
 
     p = _strtok(NULL, " ");
-    DisableDebug = 0;
+    EnableDebug = 0;
     if (!_strncmp(p, "1", 1)) {
-        DisableDebug = 1;
-        DPRINTF("Debug Colors disabled\n");
+        EnableDebug = 1;
+        DPRINTF("Debug Colors enabled\n");
     }
 
     p = _strtok(NULL, " ");
@@ -153,7 +153,7 @@ static int eecoreInit(int argc, char **argv)
     DPRINTF("Installing Kernel Hooks...\n");
     Install_Kernel_Hooks();
 
-    if (!DisableDebug)
+    if (EnableDebug)
         GS_BGCOLOUR = 0xff0000; // Blue
 
     SifExitRpc();

diff --git a/ee_core/src/padhook.c b/ee_core/src/padhook.c
@@ -64,19 +64,19 @@ static void t_loadElf(void)
     char *argv[2];
     t_ExecData elf;
 
-    if (!DisableDebug)
+    if (EnableDebug)
         GS_BGCOLOUR = 0x80FF00; // Blue Green
 
     // Init RPC & CMD
     SifInitRpc(0);
 
-    if (!DisableDebug)
+    if (EnableDebug)
         GS_BGCOLOUR = 0x000080; // Dark Red
 
     // Apply Sbv patches
     sbv_patch_disable_prefix_check();
 
-    if (!DisableDebug)
+    if (EnableDebug)
         GS_BGCOLOUR = 0xFF8000; // Blue sky
 
     // Load basic modules
@@ -115,14 +115,14 @@ static void t_loadElf(void)
         FlushCache(0);
         FlushCache(2);
 
-        if (!DisableDebug)
+        if (EnableDebug)
             GS_BGCOLOUR = 0x0080FF; // Orange
 
         // Execute BOOT.ELF
         ExecPS2((void *)elf.epc, (void *)elf.gp, 1, argv);
     }
 
-    if (!DisableDebug) {
+    if (EnableDebug) {
         GS_BGCOLOUR = 0x0000FF; // Red
         delay(5);
     }
@@ -142,7 +142,7 @@ static void IGR_Thread(void *arg)
 
     DPRINTF("IGR thread woken up!\n");
 
-    if (!DisableDebug)
+    if (EnableDebug)
         GS_BGCOLOUR = 0xFFFFFF; // White
 
     // Re-Init RPC & CMD
@@ -155,12 +155,12 @@ static void IGR_Thread(void *arg)
 #endif
     ) {
 
-        if (!DisableDebug)
+        if (EnableDebug)
             GS_BGCOLOUR = 0xFF8000; // Blue sky
 
         oplIGRShutdown(0);
 
-        if (!DisableDebug)
+        if (EnableDebug)
             GS_BGCOLOUR = 0x0000FF; // Red
 
         // Reset IO Processor
@@ -193,27 +193,27 @@ static void IGR_Thread(void *arg)
         }
 
         if (EnableGSMOp) {
-            if (!DisableDebug)
+            if (EnableDebug)
                 GS_BGCOLOUR = 0x00FF00; // Green
             DPRINTF("Stopping GSM...\n");
             DisableGSM();
         }
 
         if (EnableCheatOp) {
-            if (!DisableDebug)
+            if (EnableDebug)
                 GS_BGCOLOUR = 0xFF0000; // Blue
             DPRINTF("Stopping PS2RD Cheat Engine...\n");
             DisableCheats();
         }
 
-        if (!DisableDebug)
+        if (EnableDebug)
             GS_BGCOLOUR = 0x00FFFF; // Yellow
 
         while (!SifIopSync()) {
             ;
         }
 
-        if (!DisableDebug)
+        if (EnableDebug)
             GS_BGCOLOUR = 0xFF80FF; // Pink
 
         // Init RPC & CMD
@@ -222,7 +222,7 @@ static void IGR_Thread(void *arg)
         LoadFileInit();
         sbv_patch_enable_lmb();
 
-        if (!DisableDebug)
+        if (EnableDebug)
             GS_BGCOLOUR = 0x800000; // Dark Blue
 
         // Reset SPU - do it after the IOP reboot, so nothing will compete with the EE for it.
@@ -233,7 +233,7 @@ static void IGR_Thread(void *arg)
             InGameScreenshot();
 #endif
 
-        if (!DisableDebug)
+        if (EnableDebug)
             GS_BGCOLOUR = 0x008000; // Dark Green
 
         // Exit services
@@ -243,7 +243,7 @@ static void IGR_Thread(void *arg)
 
         IGR_Exit(0);
     } else {
-        if (!DisableDebug)
+        if (EnableDebug)
             GS_BGCOLOUR = 0x0000FF; // Red
 
         // If combo is R3 + L3, Poweroff PS2
@@ -528,7 +528,7 @@ int Install_PadOpen_Hook(u32 mem_start, u32 mem_end, int mode)
         ptr = (u32 *)mem_start;
         while (ptr) {
             // Purple while PadOpen pattern search
-            if (!DisableDebug)
+            if (EnableDebug)
                 GS_BGCOLOUR = 0x800080; // Purple
 
             mem_size = mem_end - (u32)ptr;
@@ -540,7 +540,7 @@ int Install_PadOpen_Hook(u32 mem_start, u32 mem_end, int mode)
                 found = 1;
 
                 // Green while PadOpen patches
-                if (!DisableDebug)
+                if (EnableDebug)
                     GS_BGCOLOUR = 0x008000; // Dark green
 
                 // Save original PadOpen function
@@ -655,7 +655,7 @@ int Install_PadOpen_Hook(u32 mem_start, u32 mem_end, int mode)
     }
 
     // Done
-    if (!DisableDebug)
+    if (EnableDebug)
         GS_BGCOLOUR = 0x000000; // Black
 
     return patched;

diff --git a/ee_core/src/syshook.c b/ee_core/src/syshook.c
@@ -84,7 +84,7 @@ void sysLoadElf(char *filename, int argc, char **argv)
 
     DPRINTF("t_loadElf: elf path = '%s'\n", filename);
 
-    if (!DisableDebug)
+    if (EnableDebug)
         GS_BGCOLOUR = 0x00ff00; // Green
 
     DPRINTF("t_loadElf: cleaning user memory...");

diff --git a/include/opl.h b/include/opl.h
@@ -159,8 +159,8 @@ extern int gPadEmuSettings;
 extern int gScrollSpeed;
 // Exit path
 extern char gExitPath[32];
-// Disable Debug Colors
-extern int gDisableDebug;
+// Enable Debug Colors
+extern int gEnableDebug;
 
 extern int gPS2Logo;
 

diff --git a/lng/lang_English.lng b/lng/lang_English.lng
@@ -73,7 +73,7 @@ Please wait.
 Error while loading the Game ID.
 Automatic Sorting
 Error loading the language file.
-Disable Debug Colors
+Debug Colors
 No controller detected, waiting...
 Enable Cover Art
 Widescreen

diff --git a/src/gui.c b/src/gui.c
@@ -458,7 +458,7 @@ void guiShowConfig()
     diaSetEnum(diaConfig, CFG_ETHMODE, deviceModes);
     diaSetEnum(diaConfig, CFG_APPMODE, deviceModes);
 
-    diaSetInt(diaConfig, CFG_DEBUG, gDisableDebug);
+    diaSetInt(diaConfig, CFG_DEBUG, gEnableDebug);
     diaSetInt(diaConfig, CFG_PS2LOGO, gPS2Logo);
     diaSetInt(diaConfig, CFG_HDDGAMELISTCACHE, gHDDGameListCache);
     diaSetString(diaConfig, CFG_EXITTO, gExitPath);
@@ -480,7 +480,7 @@ void guiShowConfig()
 
     int ret = diaExecuteDialog(diaConfig, -1, 1, &guiUpdater);
     if (ret) {
-        diaGetInt(diaConfig, CFG_DEBUG, &gDisableDebug);
+        diaGetInt(diaConfig, CFG_DEBUG, &gEnableDebug);
         diaGetInt(diaConfig, CFG_PS2LOGO, &gPS2Logo);
         diaGetInt(diaConfig, CFG_HDDGAMELISTCACHE, &gHDDGameListCache);
         diaGetString(diaConfig, CFG_EXITTO, gExitPath, sizeof(gExitPath));
@@ -1364,7 +1364,7 @@ static void guiDrawOverlays()
     }
 
     // BLURT output
-    // if (!gDisableDebug)
+    // if (gEnableDebug)
     //     fntRenderString(gTheme->fonts[0], 0, screenHeight - 24, ALIGN_NONE, 0, 0, blurttext, GS_SETREG_RGBA(255, 255, 0, 128));
 }
 

diff --git a/src/lang.c b/src/lang.c
@@ -60,7 +60,7 @@ static char *internalEnglish[LANG_STR_COUNT] = {
     "Error while loading the Game ID.",
     "Automatic Sorting",
     "Error loading the language file.",
-    "Disable Debug Colors",
+    "Debug Colors",
     "No controller detected, waiting...",
     "Enable Cover Art",
     "Widescreen",

diff --git a/src/opl.c b/src/opl.c
@@ -173,7 +173,7 @@ int gPadEmuSettings;
 #endif
 int gScrollSpeed;
 char gExitPath[32];
-int gDisableDebug;
+int gEnableDebug;
 int gPS2Logo;
 int gDefaultDevice;
 int gEnableWrite;
@@ -837,7 +837,7 @@ static void _loadConfig()
             if (configGetInt(configOPL, CONFIG_OPL_SWAP_SEL_BUTTON, &value))
                 gSelectButton = value == 0 ? KEY_CIRCLE : KEY_CROSS;
 
-            configGetInt(configOPL, CONFIG_OPL_DISABLE_DEBUG, &gDisableDebug);
+            configGetInt(configOPL, CONFIG_OPL_DISABLE_DEBUG, &gEnableDebug);
             configGetInt(configOPL, CONFIG_OPL_PS2LOGO, &gPS2Logo);
             configGetInt(configOPL, CONFIG_OPL_HDD_GAME_LIST_CACHE, &gHDDGameListCache);
             configGetStrCopy(configOPL, CONFIG_OPL_EXIT_PATH, gExitPath, sizeof(gExitPath));
@@ -988,7 +988,7 @@ static void _saveConfig()
         configSetInt(configOPL, CONFIG_OPL_XOFF, gXOff);
         configSetInt(configOPL, CONFIG_OPL_YOFF, gYOff);
         configSetInt(configOPL, CONFIG_OPL_OVERSCAN, gOverscan);
-        configSetInt(configOPL, CONFIG_OPL_DISABLE_DEBUG, gDisableDebug);
+        configSetInt(configOPL, CONFIG_OPL_DISABLE_DEBUG, gEnableDebug);
         configSetInt(configOPL, CONFIG_OPL_PS2LOGO, gPS2Logo);
         configSetInt(configOPL, CONFIG_OPL_HDD_GAME_LIST_CACHE, gHDDGameListCache);
         configSetStr(configOPL, CONFIG_OPL_EXIT_PATH, gExitPath);
@@ -1576,7 +1576,7 @@ static void setDefaults(void)
     gDefaultDevice = APP_MODE;
     gAutosort = 1;
     gAutoRefresh = 0;
-    gDisableDebug = 1;
+    gEnableDebug = 0;
     gPS2Logo = 0;
     gHDDGameListCache = 0;
     gEnableWrite = 0;

diff --git a/src/system.c b/src/system.c
@@ -803,7 +803,7 @@ void sysLaunchLoaderElf(const char *filename, const char *mode_str, int size_cdv
 
     argc = 0;
     sprintf(config_str, "%s %d %s %d %u.%u.%u.%u %u.%u.%u.%u %u.%u.%u.%u %d %u %d" PADEMU_SPECIFIER,
-            mode_str, gDisableDebug, gExitPath, gHDDSpindown,
+            mode_str, gEnableDebug, gExitPath, gHDDSpindown,
             local_ip_address[0], local_ip_address[1], local_ip_address[2], local_ip_address[3],
             local_netmask[0], local_netmask[1], local_netmask[2], local_netmask[3],
             local_gateway[0], local_gateway[1], local_gateway[2], local_gateway[3],

diff --git a/src/util.c b/src/util.c
@@ -538,14 +538,14 @@ int CheckPS2Logo(int fd, u32 lba)
             } else {
                 strcat(text, "don't match!");
             }
-            if (!gDisableDebug)
+            if (gEnableDebug)
                 guiWarning(text, 12);
         } else {
-            if (!gDisableDebug)
+            if (gEnableDebug)
                 guiWarning("Not a valid PS2 Logo first byte!", 12);
         }
     } else {
-        if (!gDisableDebug)
+        if (gEnableDebug)
             guiWarning("Error reading first 12 disc sectors (PS2 Logo)!", 25);
     }
     return ValidPS2Logo;