diff --git a/Source/Atmosphere/stratosphere/loader/source/oc/customize.cpp b/Source/Atmosphere/stratosphere/loader/source/oc/customize.cpp index 416bf18d..54e59808 100644 --- a/Source/Atmosphere/stratosphere/loader/source/oc/customize.cpp +++ b/Source/Atmosphere/stratosphere/loader/source/oc/customize.cpp @@ -93,6 +93,14 @@ volatile CustomizeTable C = { .commonGpuVoltOffset = 0, +.marikoCpuHighVoltOffset = 0, + +.marikoCpuHighUV = 0, + +.cpuMaxFreq = 1963500, + +.gpuMaxFreq = 1267200, + .marikoEmcDvbShift = 0, .ramTimingPresetOne = 4, // T1-3 EOS @@ -111,13 +119,7 @@ volatile CustomizeTable C = { .marikoGpuVoltArray = {635, 635, 635, 635, 635, 635, 635, 635, 635, 635, 635, 635, 660, 685, 715, 745, 765, 785}, -.marikoCpuHighVoltOffset = 0, -.marikoCpuHighUV = 0, - -.cpuMaxFreq = 1963500, - -.gpuMaxFreq = 1267200, /* Advanced Settings: diff --git a/Source/Atmosphere/stratosphere/loader/source/oc/customize.hpp b/Source/Atmosphere/stratosphere/loader/source/oc/customize.hpp index 97d82c0f..488c63c5 100644 --- a/Source/Atmosphere/stratosphere/loader/source/oc/customize.hpp +++ b/Source/Atmosphere/stratosphere/loader/source/oc/customize.hpp @@ -55,6 +55,11 @@ typedef struct CustomizeTable { u32 marikoCpuUV; u32 marikoGpuUV; u32 commonGpuVoltOffset; + u8 marikoCpuHighVoltOffset; + u8 marikoCpuHighUV; + + u32 cpuMaxFreq; + u32 gpuMaxFreq; // advanced config u32 marikoEmcDvbShift; u32 ramTimingPresetOne; @@ -66,11 +71,7 @@ typedef struct CustomizeTable { u32 ramTimingPresetSeven; // u32 marikoGpuVoltArray[18]; - u8 marikoCpuHighVoltOffset; - u8 marikoCpuHighUV; - u32 cpuMaxFreq; - u32 gpuMaxFreq; CustomizeCpuDvfsTable eristaCpuDvfsTable; @@ -88,7 +89,6 @@ typedef struct CustomizeTable { u32 marikoVDDQMax; u8 marikoB3; - } CustomizeTable; //static_assert(sizeof(CustomizeTable) == sizeof(u8) * 4 + sizeof(u32) * 10 + sizeof(CustomizeCpuDvfsTable) * 5 + sizeof(void*) * 2); //static_assert(sizeof(CustomizeTable) == 7000); diff --git a/docs/main.js b/docs/main.js index f8a4558b..44649b45 100644 --- a/docs/main.js +++ b/docs/main.js @@ -188,11 +188,11 @@ var CustTable = [ "Acceptable range: 0 ~ 100" ], 0, [0, 100], 1), - new CustEntry("marikoCpuHighVoltOffset", "CPU Voltage offset at high frequencies", CustPlatform.Mariko, 4, [ + new CustEntry("marikoCpuHighVoltOffset", "CPU Voltage offset at high frequencies", CustPlatform.Mariko, 1, [ "Reduce CPU power draw at high clocks", ], 0, [0, 100], 1), - new CustEntry("marikoCpuHighUV", "Enable Mariko CPU High Undervolt", CustPlatform.Mariko, 4, [ + new CustEntry("marikoCpuHighUV", "Enable Mariko CPU High Undervolt", CustPlatform.Mariko, 1, [ "Reduce CPU power draw at high clocks", ], 0, [0, 12], 1),