utils: Minor consistency changes and clean up

Author: joel16

app/include/gui.h

@@ -30,7 +30,7 @@ typedef struct {
     g2dTexture *texture = nullptr;
 } MenuItem;
 
-extern bool g_running;
+extern bool running;
 
 namespace GUI {
     void ResetCheckbox(MenuItem &item);

app/include/utils.h

@@ -18,10 +18,10 @@ enum BROWSE_STATE {
     BROWSE_STATE_UMD
 };
 
-extern bool psp_usb_cable_connection, is_ms_inserted, is_psp_go;
+extern bool isMSInserted, isPSPGo;
 extern enum PspCtrlButtons PSP_CTRL_ENTER, PSP_CTRL_CANCEL;
 extern BROWSE_STATE device;
-extern int g_psp_language;
+extern int language;
 
 namespace Utils {
     void SetBounds(int &set, int min, int max);
@@ -32,7 +32,7 @@ namespace Utils {
     void TermKernelDrivers(void);
     void HandleUSB(void);
     bool IsModelPSPGo(void);
-    int IsMemCardInserted(bool &is_inserted);
+    int IsMemCardInserted(bool &isInserted);
     bool IsInternalStorage(void);
     int LaunchEboot(const char *path);
     u64 GetTotalStorage(void);

app/source/config.cpp

@@ -27,12 +27,12 @@ namespace Config {
         int ret = 0;
 
         // Set root path and current working directory based on model.
-        cfg.cwd = is_psp_go? "ef0:" : "ms0:";
-        device = is_psp_go ? BROWSE_STATE_INTERNAL : BROWSE_STATE_EXTERNAL;
+        cfg.cwd = isPSPGo? "ef0:" : "ms0:";
+        device = isPSPGo ? BROWSE_STATE_INTERNAL : BROWSE_STATE_EXTERNAL;
 
         if (!FS::FileExists("config.json")) {
             cfg = config_t();
-            cfg.cwd = is_psp_go? "ef0:" : "ms0:";
+            cfg.cwd = isPSPGo? "ef0:" : "ms0:";
             return Config::Save(cfg);
         }
 
@@ -53,7 +53,7 @@ namespace Config {
             (!document.HasMember("dark_theme")) || (!document.HasMember("dev_options"))) {
             Log::Error("%s failed: Malformed config file, resetting\n", __func__);
             cfg = config_t();
-            cfg.cwd = is_psp_go? "ef0:" : "ms0:";
+            cfg.cwd = isPSPGo? "ef0:" : "ms0:";
             return Config::Save(cfg);
         }
 
@@ -68,7 +68,7 @@ namespace Config {
         if (config_version_holder < config_version) {
             sceIoRemove("config.json");
             cfg = config_t();
-            cfg.cwd = is_psp_go? "ef0:" : "ms0:";
+            cfg.cwd = isPSPGo? "ef0:" : "ms0:";
             return Config::Save(cfg);
         }
 

app/source/g2d.cpp

@@ -60,7 +60,7 @@ namespace G2D {
         std::memset(&params, 0, sizeof(SceUtilityOskParams));
 
         params.base.size = sizeof(SceUtilityOskParams);
-        params.base.language = g_psp_language;
+        params.base.language = language;
         params.base.buttonSwap = (PSP_CTRL_ENTER == PSP_CTRL_CROSS)? PSP_UTILITY_ACCEPT_CROSS : PSP_UTILITY_ACCEPT_CIRCLE;
         params.base.graphicsThread = 17;
         params.base.accessThread = 19;

app/source/gui.cpp

@@ -96,7 +96,7 @@ namespace GUI {
         float resolution = sceRtcGetTickResolution() / 1000.f;
         sceRtcGetCurrentTick(&last_tick);
 
-        while(g_running) {
+        while(running) {
             u64 current_tick = 0;
             sceRtcGetCurrentTick(&current_tick);
             float delta = (current_tick - last_tick) / resolution;

app/source/gui/menubar.cpp

@@ -29,11 +29,11 @@ namespace GUI {
 
         G2D::FontSetStyle(1.f, cfg.dark_theme? WHITE : BLACK, INTRAFONT_ALIGN_LEFT);
 
-        if (is_psp_go) {
+        if (isPSPGo) {
             G2D::DrawImage(icon_sd[cfg.dark_theme], pos_x + 10, 92);
-            G2D::DrawText(pos_x + 50, 90 + ((30 - (font->glyph->height - 6)) / 2), !is_ms_inserted? "ef0:/" : "ms0:/");
+            G2D::DrawText(pos_x + 50, 90 + ((30 - (font->glyph->height - 6)) / 2), !isMSInserted? "ef0:/" : "ms0:/");
 
-            if (is_ms_inserted) {
+            if (isMSInserted) {
                 G2D::DrawImage(icon_secure[cfg.dark_theme], pos_x + 10, 122);
                 G2D::DrawText(pos_x + 50, 90 + ((30 - (font->glyph->height - 6)) / 2) + 30, "ef0:/");
 
@@ -96,14 +96,14 @@ namespace GUI {
         else if (ctrl & PSP_CTRL_DOWN)
             selection++;
 
-        if (is_psp_go) {
+        if (isPSPGo) {
             if (cfg.dev_options) {
-                Utils::SetMax(selection, 0, is_ms_inserted? 5 : 4);
-                Utils::SetMin(selection, is_ms_inserted? 5 : 4, 0);
+                Utils::SetMax(selection, 0, isMSInserted? 5 : 4);
+                Utils::SetMin(selection, isMSInserted? 5 : 4, 0);
             }
             else {
-                Utils::SetMax(selection, 0, is_ms_inserted? 1 : 0);
-                Utils::SetMin(selection, is_ms_inserted? 1 : 0, 0);
+                Utils::SetMax(selection, 0, isMSInserted? 1 : 0);
+                Utils::SetMin(selection, isMSInserted? 1 : 0, 0);
             }
         }
         else {
@@ -116,31 +116,31 @@ namespace GUI {
 
             switch (selection) {
                 case 0:
-                    if ((is_psp_go && is_ms_inserted) || (!is_psp_go)) {
+                    if ((isPSPGo && isMSInserted) || (!isPSPGo)) {
                         cfg.cwd = "ms0:";
                         device = BROWSE_STATE_EXTERNAL;
                     }
-                    else if (is_psp_go && !is_ms_inserted) {
+                    else if (isPSPGo && !isMSInserted) {
                         cfg.cwd = "ef0:";
                         device = BROWSE_STATE_INTERNAL;
                     }
                     break;
 
                 case 1:
-                    if (!(is_psp_go && is_ms_inserted)) {
+                    if (!(isPSPGo && isMSInserted)) {
                         if ((R_FAILED(ret = sceIoUnassign("flash0:"))) && (ret != 0x80020321))
                             Log::Error("sceIoUnassign(flash0) failed: 0x%x\n", ret);
 
                         if (R_FAILED(ret = sceIoAssign("flash0:", "lflash0:0,0", "flashfat0:", IOASSIGN_RDWR, nullptr, 0)))
                             Log::Error("sceIoAssign(flash0) failed: 0x%x\n", ret);
                     }
 
-                    cfg.cwd = (is_psp_go && is_ms_inserted)? "ef0:" : "flash0:/";
-                    device = (is_psp_go && is_ms_inserted)? BROWSE_STATE_INTERNAL : BROWSE_STATE_FLASH0;
+                    cfg.cwd = (isPSPGo && isMSInserted)? "ef0:" : "flash0:/";
+                    device = (isPSPGo && isMSInserted)? BROWSE_STATE_INTERNAL : BROWSE_STATE_FLASH0;
                     break;
 
                 case 2:
-                    if (is_psp_go && is_ms_inserted) {
+                    if (isPSPGo && isMSInserted) {
                         if ((R_FAILED(ret = sceIoUnassign("flash0:"))) && (ret != 0x80020321))
                             Log::Error("sceIoUnassign(flash0) failed: 0x%x\n", ret);
 
@@ -155,12 +155,12 @@ namespace GUI {
                             Log::Error("sceIoAssign(flash1) failed: 0x%x\n", ret);
                     }
 
-                    cfg.cwd = (is_psp_go && is_ms_inserted)? "flash0:/" : "flash1:/";
-                    device = (is_psp_go && is_ms_inserted)? BROWSE_STATE_FLASH0 : BROWSE_STATE_FLASH1;
+                    cfg.cwd = (isPSPGo && isMSInserted)? "flash0:/" : "flash1:/";
+                    device = (isPSPGo && isMSInserted)? BROWSE_STATE_FLASH0 : BROWSE_STATE_FLASH1;
                     break;
 
                 case 3:
-                    if (is_psp_go && is_ms_inserted) {
+                    if (isPSPGo && isMSInserted) {
                         if ((R_FAILED(ret = sceIoUnassign("flash1:"))) && (ret != 0x80020321))
                             Log::Error("sceIoUnassign(flash1) failed: 0x%x\n", ret);
 
@@ -175,12 +175,12 @@ namespace GUI {
                             Log::Error("sceIoAssign(flash2) failed: 0x%x\n", ret);
                     }
 
-                    cfg.cwd = (is_psp_go && is_ms_inserted)? "flash1:/" : "flash2:/";
-                    device = (is_psp_go && is_ms_inserted)? BROWSE_STATE_FLASH1 : BROWSE_STATE_FLASH2;
+                    cfg.cwd = (isPSPGo && isMSInserted)? "flash1:/" : "flash2:/";
+                    device = (isPSPGo && isMSInserted)? BROWSE_STATE_FLASH1 : BROWSE_STATE_FLASH2;
                     break;
 
                 case 4:
-                    if (is_psp_go && is_ms_inserted) {
+                    if (isPSPGo && isMSInserted) {
                         if ((R_FAILED(ret = sceIoUnassign("flash2:"))) && (ret != 0x80020321))
                             Log::Error("sceIoUnassign(flash2) failed: 0x%x\n", ret);
 
@@ -195,12 +195,12 @@ namespace GUI {
                             Log::Error("sceIoAssign(flash3) failed: 0x%x\n", ret);
                     }
 
-                    cfg.cwd = (is_psp_go && is_ms_inserted)? "flash2:/" : "flash3:/";
-                    device = (is_psp_go && is_ms_inserted)? BROWSE_STATE_FLASH2 : BROWSE_STATE_FLASH3;
+                    cfg.cwd = (isPSPGo && isMSInserted)? "flash2:/" : "flash3:/";
+                    device = (isPSPGo && isMSInserted)? BROWSE_STATE_FLASH2 : BROWSE_STATE_FLASH3;
                     break;
 
                 case 5:
-                    if (is_psp_go && is_ms_inserted) {
+                    if (isPSPGo && isMSInserted) {
                         if ((R_FAILED(ret = sceIoUnassign("flash3:"))) && (ret != 0x80020321))
                             Log::Error("sceIoUnassign(flash3) failed: 0x%x\n", ret);
 
@@ -210,7 +210,7 @@ namespace GUI {
                         cfg.cwd = "flash3:/";
                         device = BROWSE_STATE_FLASH3;
                     }
-                    else if (!is_psp_go) {
+                    else if (!isPSPGo) {
                         if (sceUmdCheckMedium() != 0) {
                             if (R_FAILED(ret = sceUmdActivate(1, "disc0:")))
                                 Log::Error("sceUmdActivate(disc0) failed: 0x%x\n", ret);

app/source/main.cpp

@@ -14,7 +14,7 @@ PSP_MAIN_THREAD_ATTR(THREAD_ATTR_USER | THREAD_ATTR_VFPU);
 PSP_HEAP_THRESHOLD_SIZE_KB(1024);
 PSP_HEAP_SIZE_KB(-2048);
 
-bool g_running = true;
+bool running = true;
 
 namespace Services {
     int Init(void) {
@@ -24,6 +24,9 @@ namespace Services {
         sceCtrlSetSamplingMode(PSP_CTRL_MODE_ANALOG);
         Utils::InitKernelDrivers();
         Textures::Load();
+
+        Utils::IsMemCardInserted(isMSInserted);
+        isPSPGo = Utils::IsModelPSPGo();
 
         if (R_FAILED(ret = Config::Load())) {
             Log::Error("Config::Load failed: 0x%08x\n", ret);
@@ -46,12 +49,9 @@ namespace Services {
             font_size_cache[i] = intraFontMeasureText(font, character);
         }
 
-        Utils::IsMemCardInserted(is_ms_inserted);
-        is_psp_go = Utils::IsModelPSPGo();
-        
         PSP_CTRL_ENTER = Utils::GetEnterButton();
         PSP_CTRL_CANCEL = Utils::GetCancelButton();
-        g_psp_language = Utils::GetLanguage();
+        language = Utils::GetLanguage();
         return 0;
     }
 
@@ -70,7 +70,7 @@ namespace Services {
     }
 
     static int ExitCallback(int arg1, int arg2, void *common) {
-        g_running = false;
+        running = false;
         return 0;
     }
 

app/source/net.cpp

@@ -98,7 +98,7 @@ namespace Net {
         std::memset(&data, 0, sizeof(pspUtilityNetconfData));
 
         data.base.size = sizeof(pspUtilityNetconfData);
-        data.base.language = g_psp_language;
+        data.base.language = language;
         data.base.buttonSwap = (PSP_CTRL_ENTER == PSP_CTRL_CROSS)? PSP_UTILITY_ACCEPT_CROSS : PSP_UTILITY_ACCEPT_CIRCLE;
         data.base.graphicsThread = 17;
         data.base.accessThread = 19;
@@ -213,8 +213,8 @@ namespace Net {
             std::snprintf(string, 27, "FTP initialization Failed.");
             return false;
         }
-        if (is_psp_go) {
-            if (is_ms_inserted) {
+        if (isPSPGo) {
+            if (isMSInserted) {
                 ftppsp_add_device("ms0:");
                 ftppsp_add_device("ef0:");
             }
@@ -257,8 +257,8 @@ namespace Net {
     }
 
     void ExitFTP(void) {
-        if (is_psp_go) {
-            if (is_ms_inserted) {
+        if (isPSPGo) {
+            if (isMSInserted) {
                 ftppsp_del_device("ms0:");
                 ftppsp_del_device("ef0:");
             }