remove retro remake dispay support and more ui cohesion

Source/hoc-clk/common/include/hocclk/clock_manager.h

@@ -70,7 +70,6 @@ typedef struct {
     GpuSchedulingMode gpuSchedulingMode;
     bool isSysDockInstalled;
     bool isSaltyNXInstalled;
-    bool isUsingRetroSuper;
     u8 maxDisplayFreq;
     u8 dramID;
     bool isDram8GB;
@@ -84,7 +83,7 @@ typedef struct {
     bool isKipLoaded;
     bool rebootRequired;
     bool isFirstLoad;
-    
+
     // Reserved for future use
     u8 reserved[0x358];
 } HocClkContext;

Source/hoc-clk/overlay/src/ui/gui/about_gui.cpp

@@ -31,7 +31,6 @@ tsl::elm::ListItem* IddqItem = NULL;
 tsl::elm::ListItem* DramModule = NULL;
 tsl::elm::ListItem* sysdockStatusItem = NULL;
 tsl::elm::ListItem* saltyNXStatusItem = NULL;
-tsl::elm::ListItem* RETROStatusItem = NULL;
 tsl::elm::ListItem* waferCordsItem = NULL;
 tsl::elm::ListItem* ramVoltItem = NULL;
 tsl::elm::ListItem* eristaPLLXItem = NULL;
@@ -141,12 +140,6 @@ void AboutGui::listUI()
         new tsl::elm::ListItem("Wafer Position:");
     this->listElement->addItem(waferCordsItem);
 
-    if(IsHoag()) {
-        RETROStatusItem =
-            new tsl::elm::ListItem("RR Display status:");
-        this->listElement->addItem(RETROStatusItem);
-    }
-
     this->listElement->addItem(
         new tsl::elm::CategoryHeader("Software Info")
     );
@@ -224,9 +217,6 @@ void AboutGui::refresh()
 
     saltyNXStatusItem->setValue(this->context->isSaltyNXInstalled ? "Installed" : "Not Installed");
 
-    if(IsHoag())
-        RETROStatusItem->setValue(this->context->isUsingRetroSuper ? "Installed" : "Not Installed");
-
     sprintf(strings[2], "X: %d Y: %d", this->context->waferX, this->context->waferY);
     waferCordsItem->setValue(strings[2]);
 

Source/hoc-clk/overlay/src/ui/gui/app_profile_gui.cpp

@@ -309,7 +309,7 @@ public:
         static constexpr struct { const char* label; int shift; } kAll[] = {
             {"CPU", 0}, {"GPU", 8}, {"VRR", 16}
         };
-        int count = configList.values[HocClkConfigValue_OverwriteRefreshRate] || this->context->isUsingRetroSuper || this->context->profile == HocClkProfile_Docked ? 3 : 2;
+        int count = configList.values[HocClkConfigValue_OverwriteRefreshRate] && profile != HocClkProfile_Docked ? 3 : 2;
 
         for (int i = 0; i < count; i++) {
             u8 cur = (this->profileList->mhzMap[this->profile][HocClkModule_Governor] >> kAll[i].shift) & 0xFF;
@@ -367,7 +367,7 @@ void AppProfileGui::addProfileUI(HocClkProfile profile)
 
         if(configList.values[HocClkConfigValue_OverwriteRefreshRate]) {
             if(profile != HocClkProfile_Docked) {
-                this->addModuleListItemValue(profile, HocClkModule_Display, "Display", IsAula() ? 45 : 40, configList.values[HocClkConfigValue_MaxDisplayClockH], this->context->isUsingRetroSuper ? 5 : 1, " Hz", 1, 0, lcdThresholds);
+                this->addModuleListItemValue(profile, HocClkModule_Display, "Display", IsAula() ? 45 : 40, configList.values[HocClkConfigValue_MaxDisplayClockH],  1, " Hz", 1, 0, lcdThresholds);
             } else {
                 if(IsAula() && this->context->isSysDockInstalled) {
                     std::vector<NamedValue> dockedFreqs = {

Source/hoc-clk/overlay/src/ui/gui/base_menu_gui.cpp

@@ -61,7 +61,7 @@ void BaseMenuGui::preDraw(tsl::gfx::Renderer *renderer) {
 
     // All constants pre-calculated and cached
     const char *labels[] = { "App ID", "Profile", "CPU", "GPU", "MEM",  "SoC", "Board",
-                             "Skin",   "Now",     "Avg", "BAT", "PMIC", "Fan", IsAula() || this->context->isUsingRetroSuper ? "OLED" : "LCD",
+                             "Skin",   "Now",     "Avg", "BAT", "PMIC", "Fan", IsAula() ? "OLED" : "LCD",
                              "FPS",    "RES" };
 
     static constexpr u32 dataPositions[6] = { 63 - 3 + 3, 200 - 1, 344 - 1 - 3, 200 - 1, 342 - 1, 321 - 1 };

Source/hoc-clk/overlay/src/ui/gui/config_info_strings.cpp

@@ -45,6 +45,7 @@ std::vector<std::string> ConfigInfoStrings(HocClkConfigValue val, bool isMariko,
                 "Options:",
                 "- VDD2 - Display VDD2 voltage",
                 "- VDDQ - Display VDDQ voltage",
+                "- VDD2/VDDQ - Display both voltages, but without decimal place",
                 "Default: VDD2"
             };
 

Source/hoc-clk/overlay/src/ui/gui/global_override_gui.cpp

@@ -320,7 +320,7 @@ public:
         static constexpr struct { const char* label; int shift; } kAll[] = {
             {"CPU", 0}, {"GPU", 8}, {"VRR", 16}
         };
-        int count = configList.values[HocClkConfigValue_OverwriteRefreshRate] || this->context->isUsingRetroSuper ? 3 : 2;
+        int count = configList.values[HocClkConfigValue_OverwriteRefreshRate] && this->context->profile != HocClkProfile_Docked ? 3 : 2;
 
         for (int i = 0; i < count; i++) {
             u8 cur = (this->packed >> kAll[i].shift) & 0xFF;
@@ -375,7 +375,7 @@ void GlobalOverrideGui::listUI()
     #if IS_MINIMAL == 0
         ValueThresholds lcdThresholds(60, 65);
         if(configList.values[HocClkConfigValue_OverwriteRefreshRate])
-            this->addModuleListItemValue(HocClkModule_Display, "Display", IsAula() ? 45 : 40, configList.values[HocClkConfigValue_MaxDisplayClockH], this->context->isUsingRetroSuper ? 5 : 1, " Hz", 1, 0, lcdThresholds);
+            this->addModuleListItemValue(HocClkModule_Display, "Display", IsAula() ? 45 : 40, configList.values[HocClkConfigValue_MaxDisplayClockH], 1, " Hz", 1, 0, lcdThresholds);
     #endif
 
     this->addGovernorSection();

Source/hoc-clk/overlay/src/ui/gui/misc_gui.cpp

@@ -1048,20 +1048,18 @@ class DisplaySubMenuGui : public MiscGui {
 
         this->listElement->addItem(new CompactCategoryHeader("Display Settings"));
         addConfigToggle(HocClkConfigValue_OverwriteRefreshRate, nullptr);
-        if (!this->context->isUsingRetroSuper) {
-            tsl::elm::CustomDrawer *warningText = new tsl::elm::CustomDrawer([](tsl::gfx::Renderer *renderer, s32 x, s32 y, s32 w, s32 h) {
-                renderer->drawString("\uE150 Usage of unsafe display", false, x + 20, y + 30, 18, tsl::style::color::ColorText);
-                renderer->drawString("refresh rates may cause stress", false, x + 20, y + 50, 18, tsl::style::color::ColorText);
-                renderer->drawString("or damage to your display! ", false, x + 20, y + 70, 18, tsl::style::color::ColorText);
-                renderer->drawString("Proceed at your own risk!", false, x + 20, y + 90, 18, tsl::style::color::ColorText);
-            });
+        tsl::elm::CustomDrawer *warningText = new tsl::elm::CustomDrawer([](tsl::gfx::Renderer *renderer, s32 x, s32 y, s32 w, s32 h) {
+            renderer->drawString("\uE150 Usage of unsafe display", false, x + 20, y + 30, 18, tsl::style::color::ColorText);
+            renderer->drawString("refresh rates may cause stress", false, x + 20, y + 50, 18, tsl::style::color::ColorText);
+            renderer->drawString("or damage to your display! ", false, x + 20, y + 70, 18, tsl::style::color::ColorText);
+            renderer->drawString("Proceed at your own risk!", false, x + 20, y + 90, 18, tsl::style::color::ColorText);
+        });
 
-            warningText->setBoundaries(0, 0, tsl::cfg::FramebufferWidth, 110);
-            this->listElement->addItem(warningText);
-            ValueThresholds displayThresholds(60, 65);
-            addConfigButton(HocClkConfigValue_MaxDisplayClockH, "Max Handheld Display Hz", ValueRange(60, IsAula() ? 65 : 75, 1, " Hz", 1),
-                            "Display Clock", &displayThresholds, {}, {}, false);
-        }
+        warningText->setBoundaries(0, 0, tsl::cfg::FramebufferWidth, 110);
+        this->listElement->addItem(warningText);
+        ValueThresholds displayThresholds(60, 65);
+        addConfigButton(HocClkConfigValue_MaxDisplayClockH, "Max Handheld Display Hz", ValueRange(60, IsAula() ? 65 : 75, 1, " Hz", 1),
+                        "Display Clock", &displayThresholds, {}, {}, false);
         if (!IsAula()) {
             tsl::elm::CustomDrawer *warningTextDV = new tsl::elm::CustomDrawer([](tsl::gfx::Renderer *renderer, s32 x, s32 y, s32 w, s32 h) {
                 renderer->drawString("\uE150 Adjust the display voltage", false, x + 20, y + 30, 18, tsl::style::color::ColorText);

Source/hoc-clk/sysmodule/src/board/board.cpp

@@ -193,7 +193,7 @@ namespace board {
         display::DisplayRefreshConfig cfg = { .clkVirtAddr = clkVirtAddr,
                                               .dsiVirtAddr = dsiVirtAddr,
                                               .isLite = (GetConsoleType() == HocClkConsoleType_Hoag),
-                                              .isRetroSUPER = integrations::GetRETROSuperStatus() };
+                                              .isRetroSUPER = false };
         display::Initialize(&cfg);
 
         CacheDfllData();
@@ -270,8 +270,4 @@ namespace board {
         return speedoBracket;
     }
 
-    bool IsUsingRetroSuperDisplay() {
-        return false; /* stub for now. */
-    }
-
 }  // namespace board

Source/hoc-clk/sysmodule/src/board/board.hpp

@@ -58,6 +58,5 @@ namespace board {
     bool IsDram8GB();
     void SetDisplayRefreshDockedState(bool docked);
     FuseData *GetFuseData();
-    bool IsUsingRetroSuperDisplay();
 
 }  // namespace board

Source/hoc-clk/sysmodule/src/hos/integrations.cpp

@@ -88,11 +88,6 @@ namespace integrations {
         return stat("sdmc:/atmosphere/contents/0000000000534C56/flags/boot2.flag", &st) == 0;
     }
 
-    bool GetRETROSuperStatus() {
-        struct stat st = { 0 };
-        return stat("sdmc:/config/horizon-oc/retro.flag", &st) == 0;  // TODO: unhardcode this
-    }
-
     void LoadSaltyNX() {
         if (!CheckSaltyNXPort())
             return;

Source/hoc-clk/sysmodule/src/hos/integrations.hpp

@@ -61,7 +61,7 @@ namespace integrations {
 
     bool GetSysDockState();
     bool GetSaltyNXState();
-    bool GetRETROSuperStatus();
+
     void LoadSaltyNX();
     u8 GetSaltyNXFPS();
     u16 GetSaltyNXResolutionHeight();

Source/hoc-clk/sysmodule/src/mgr/clock_manager.cpp

@@ -830,7 +830,6 @@ namespace clockManager {
             integrations::LoadSaltyNX();
         }
 
-        gContext.isUsingRetroSuper = integrations::GetRETROSuperStatus();
         governor::startThreads();
     }