From 4eb491ee411c9ef5928411c6afc977d7abe984d4 Mon Sep 17 00:00:00 2001 From: Lightos1 Date: Tue, 30 Sep 2025 22:43:55 +0200 Subject: [PATCH] Fixing dumb mistakes that I should have thought of. --- .../stratosphere/loader/source/oc/customize.hpp | 10 ++++++++-- .../stratosphere/loader/source/oc/pcv/pcv_erista.cpp | 2 +- .../stratosphere/loader/source/oc/pcv/pcv_mariko.cpp | 4 ++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Source/Atmosphere/stratosphere/loader/source/oc/customize.hpp b/Source/Atmosphere/stratosphere/loader/source/oc/customize.hpp index 11287b52..4ce25dae 100644 --- a/Source/Atmosphere/stratosphere/loader/source/oc/customize.hpp +++ b/Source/Atmosphere/stratosphere/loader/source/oc/customize.hpp @@ -30,7 +30,12 @@ #include "mtc_timing_table.hpp" enum MtcConfig: u32 { - AUTO_ADJ = 0, + AUTO_ADJ_ALL = 0, + CUSTOM_ADJ_ALL = 1, + NO_ADJ_ALL = 2, + + CUSTOMIZED_ALL = 4, + AUTO_ADJ, }; using CustomizeCpuDvfsTable = pcv::cvb_entry_t[pcv::DvfsTableEntryLimit]; @@ -44,7 +49,8 @@ typedef struct CustomizeTable { u8 cust[4] = {'C', 'U', 'S', 'T'}; u32 custRev = CUST_REV; - u32 mtcConf = AUTO_ADJ_ALL; + u32 mtcConfErista = AUTO_ADJ; + u32 mtcConfMariko = AUTO_ADJ_ALL; // TODO: Fix mariko and merge into mtcConf u32 commonCpuBoostClock; u32 commonEmcMemVolt; u32 eristaCpuMaxVolt; diff --git a/Source/Atmosphere/stratosphere/loader/source/oc/pcv/pcv_erista.cpp b/Source/Atmosphere/stratosphere/loader/source/oc/pcv/pcv_erista.cpp index 91b2f8f5..16bb85b8 100644 --- a/Source/Atmosphere/stratosphere/loader/source/oc/pcv/pcv_erista.cpp +++ b/Source/Atmosphere/stratosphere/loader/source/oc/pcv/pcv_erista.cpp @@ -160,7 +160,7 @@ } void MemMtcTableAutoAdjust(EristaMtcTable *table) { - if (C.mtcConf != AUTO_ADJ) + if (C.mtcConfErista != AUTO_ADJ) return; #define WRITE_PARAM_ALL_REG(TABLE, PARAM, VALUE) \ diff --git a/Source/Atmosphere/stratosphere/loader/source/oc/pcv/pcv_mariko.cpp b/Source/Atmosphere/stratosphere/loader/source/oc/pcv/pcv_mariko.cpp index a96539e8..471577ce 100644 --- a/Source/Atmosphere/stratosphere/loader/source/oc/pcv/pcv_mariko.cpp +++ b/Source/Atmosphere/stratosphere/loader/source/oc/pcv/pcv_mariko.cpp @@ -227,7 +227,7 @@ Result GpuVmax(u32 *ptr) * you'd better calculate timings yourself rather than relying on following algorithm. */ - if (C.mtcConf != AUTO_ADJ_ALL) + if (C.mtcConfMariko != AUTO_ADJ_ALL) return; // scale with linear interpolation @@ -400,7 +400,7 @@ Result GpuVmax(u32 *ptr) } void MemMtcTableCustomAdjust(MarikoMtcTable* table) { - if (C.mtcConf != CUSTOM_ADJ_ALL) + if (C.mtcConfMariko != CUSTOM_ADJ_ALL) return; constexpr u32 MC_ARB_DIV = 4;