From c11c13dfd55bf9653e56ff542fe32b1b144dba71 Mon Sep 17 00:00:00 2001 From: souldbminersmwc Date: Sun, 30 Nov 2025 16:49:51 -0500 Subject: [PATCH] loader: fix compilation and revert to ocs unlock uv table (worked before) --- .../loader/source/oc/customize.cpp | 54 ++++++++---------- .../loader/source/oc/pcv/pcv_erista.cpp | 8 +-- Source/Configurator/deps.bat | 7 +-- Source/Configurator/hoc.kip | Bin 269468 -> 269468 bytes .../contents/00FF0000636C6BFF/exefs.nsp | Bin 185515 -> 185515 bytes 5 files changed, 30 insertions(+), 39 deletions(-) diff --git a/Source/Atmosphere/stratosphere/loader/source/oc/customize.cpp b/Source/Atmosphere/stratosphere/loader/source/oc/customize.cpp index 1c2f4ad4..0cccd273 100644 --- a/Source/Atmosphere/stratosphere/loader/source/oc/customize.cpp +++ b/Source/Atmosphere/stratosphere/loader/source/oc/customize.cpp @@ -205,35 +205,31 @@ volatile CustomizeTable C = { }, .marikoCpuDvfsTableSLT = { - // { 204000, { 732856, -17335, 113 }, { } }, - // { 306000, { 760024, -18195, 113 }, { } }, - // { 408000, { 789258, -19055, 113 }, { } }, - // { 510000, { 789258, -19915, 113 }, { } }, - { 612000, { 789258, -19055, 113 }, { } }, - { 714000, { 820558, -19915, 113 }, { } }, - { 816000, { 853926, -20775, 113 }, { } }, - { 918000, { 889361, -21625, 113 }, { } }, - { 1020000, { 926862, -22485, 113 }, { 1120000 } }, - { 1122000, { 926862, -22485, 113 }, { 1120000 } }, - { 1224000, { 926862, -22485, 113 }, { 1120000 } }, - { 1326000, { 966431, -23345, 113 }, { 1120000 } }, - { 1428000, { 1008066, -24205, 113 }, { 1120000 } }, - { 1581000, { 1051768, -25065, 113 }, { 1120000 } }, - { 1683000, { 1097537, -25925, 113 }, { 1120000 } }, - { 1785000, { 1145373, -26785, 113 }, { 1120000 } }, - { 1887000, { 1195276, -27645, 113 }, { 1120000 } }, - { 1963500, { 1274006, -29795, 113 }, { 1120000 } }, - { 2091000, { 1349076, -33235, 113 }, { CPU_MAX_MAX_VOLT } }, - { 2193000, { 1386213, -33235, 113 }, { CPU_MAX_MAX_VOLT } }, - { 2295000, { 1445416, -34095, 113 }, { CPU_MAX_MAX_VOLT } }, - { 2397000, { 1490873, -34955, 113 }, { CPU_MAX_MAX_VOLT } }, - { 2499000, { 1580725, -35815, 113 }, { CPU_MAX_MAX_VOLT } }, - { 2601000, { 1702903, -36675, 113 }, { CPU_MAX_MAX_VOLT } }, - { 2703000, { 1748360, -37535, 113 }, { CPU_MAX_MAX_VOLT } }, - { 2805000, { 1793817, -38395, 113 }, { CPU_MAX_MAX_VOLT } }, - { 2907000, { 1839274, -39255, 113 }, { CPU_MAX_MAX_VOLT } }, - { 3009000, { 1884731, -40115, 113 }, { CPU_MAX_MAX_VOLT } }, -}, + { 612000, { 853926, -20775, 113 }, {} }, + { 714000, { 889361, -21625, 113 }, {} }, + { 816000, { 926862, -22485, 113 }, {} }, + { 918000, { 966431, -23345, 113 }, {} }, + { 1020000, { 1008066, -24205, 113 }, { 1120000 } }, + { 1122000, { 1051768, -25065, 113 }, { 1120000 } }, + { 1224000, { 1097537, -25925, 113 }, { 1120000 } }, + { 1326000, { 1145373, -26785, 113 }, { 1120000 } }, + { 1428000, { 1195276, -27645, 113 }, { 1120000 } }, + { 1581000, { 1274006, -28935, 113 }, { 1120000 } }, + { 1683000, { 1329076, -29795, 113 }, { 1120000 } }, + { 1785000, { 1386213, -30655, 113 }, { 1120000 } }, + { 1887000, { 1445416, -31515, 113 }, { 1120000 } }, + { 1963500, { 1490873, -32155, 113 }, { 1120000 } }, + // Appending table + { 2091000, { 1580725, -33235, 113 }, { CPU_MAX_MAX_VOLT } }, + { 2193000, { 1580725, -33235, 113 }, { CPU_MAX_MAX_VOLT } }, + { 2295000, { 1635431, -34095, 113 }, { CPU_MAX_MAX_VOLT } }, + { 2397000, { 1702903, -34955, 113 }, { CPU_MAX_MAX_VOLT } }, + { 2499000, { 1754400, -35643, 113 }, { CPU_MAX_MAX_VOLT } }, + { 2601000, { 1805897, -36331, 113 }, { CPU_MAX_MAX_VOLT } }, + { 2703000, { 1857394, -37019, 113 }, { CPU_MAX_MAX_VOLT } }, + { 2805000, { 1908891, -37707, 113 }, { CPU_MAX_MAX_VOLT } }, + { 2907000, { 1960388, -38395, 113 }, { CPU_MAX_MAX_VOLT } }, + }, /* - Erista GPU DVFS Table: */ 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 598a359c..68532707 100644 --- a/Source/Atmosphere/stratosphere/loader/source/oc/pcv/pcv_erista.cpp +++ b/Source/Atmosphere/stratosphere/loader/source/oc/pcv/pcv_erista.cpp @@ -472,10 +472,10 @@ namespace ams::ldr::oc::pcv::erista { // using namespace pcv::erista; // - // #define WRITE_PARAM_ALL_REG(TABLE, PARAM, VALUE) \ - // TABLE->burst_regs.PARAM = VALUE; \ - // TABLE->shadow_regs_ca_train.PARAM = VALUE; \ - // TABLE->shadow_regs_quse_train.PARAM = VALUE; \ + // #define WRITE_PARAM_ALL_REG(TABLE, PARAM, VALUE) // note: add backslashes to make the macro definition work + // TABLE->burst_regs.PARAM = VALUE; + // TABLE->shadow_regs_ca_train.PARAM = VALUE; + // TABLE->shadow_regs_quse_train.PARAM = VALUE; // TABLE->shadow_regs_rdwr_train.PARAM = VALUE; // #define GET_CYCLE(PARAM) ((u32)((double)(PARAM) / (1000000.0 / 1600000.0))) diff --git a/Source/Configurator/deps.bat b/Source/Configurator/deps.bat index 8273bf6c..a3927623 100644 --- a/Source/Configurator/deps.bat +++ b/Source/Configurator/deps.bat @@ -1,6 +1 @@ -pip install pyinstaller -pip install dearpygui==2.0.0 -pip install numpy -pip install psutil -pip install pil -pip install pathlib \ No newline at end of file +pip install pyinstaller dearpygui numpy psutil pil \ No newline at end of file diff --git a/Source/Configurator/hoc.kip b/Source/Configurator/hoc.kip index 405aacaa748f4fb81b5d4acbf3a092d14e3bcbe3..45326ca113485afd8b8f7e25efde7180783300b6 100644 GIT binary patch delta 77 zcmbQUQ((?cfrb{w7N#xC7Po{$8iW`wvoJ6)WXmut1kwr)I@7&xF*i;>aEqBkvVn<# Zp&y7>0P!&(z6HeZfS70d+gr@*9RYo07773W delta 80 zcmbQUQ((?cfrb{w7N#xC7Po{i2njP>W?^7p$d+MP2&6Ntw5NODVs2E-VPart0OG|! Yd<=;11F;}81oHst1KZ!;VqWhE0Cyh~{r~^~ diff --git a/dist/atmosphere/contents/00FF0000636C6BFF/exefs.nsp b/dist/atmosphere/contents/00FF0000636C6BFF/exefs.nsp index 2c378849cf9cd95eb5af2d289c4e1d7e3a303fc3..7884b485dfebd666af2cd9658b3d6dd015932def 100644 GIT binary patch delta 123 zcmZ3zl6&<^?gWd!pup4qIGbV1yQFtDCY1NG|7WLzs5C6)T z6?pQ5;{t2PMc%%txsST0*xkF=?7-OWz{t4Wfsv`roZHY$H$62eCDFvda{EOKCa+$s M=5E(N##F-x0Q7=3&j0`b delta 123 zcmZ3zl6&<^?g!EBf=ZRZ#6lRHSw{d>Oe3iLP_SLc3 zaZj&4bB&NaxmA6d<#mof@>=}O4vg&%jEvhI7@6A4xeY9J(-Tw8lg-SHw_mhi^6JHE L?solSOf`G}eoip~