From 30371125c625d44ce0c6dee8e2c1e3f467754034 Mon Sep 17 00:00:00 2001 From: Lightos1 <124387232+Lightos1@users.noreply.github.com> Date: Thu, 23 Jul 2026 20:31:19 +0200 Subject: [PATCH] ldr: fix formating --- .../stratosphere/loader/source/oc/pcv/pcv.cpp | 104 ++++-------------- .../stratosphere/loader/source/oc/pcv/pcv.hpp | 2 +- 2 files changed, 23 insertions(+), 83 deletions(-) diff --git a/Source/Atmosphere/stratosphere/loader/source/oc/pcv/pcv.cpp b/Source/Atmosphere/stratosphere/loader/source/oc/pcv/pcv.cpp index 6f514aeb..d14ee91a 100644 --- a/Source/Atmosphere/stratosphere/loader/source/oc/pcv/pcv.cpp +++ b/Source/Atmosphere/stratosphere/loader/source/oc/pcv/pcv.cpp @@ -44,11 +44,11 @@ namespace ams::ldr::hoc::pcv { constexpr u32 uv_min = 600'000; auto validator = [](regulator *entry) { - R_UNLESS(entry->id == 1, ldr::ResultInvalidRegulatorEntry()); - R_UNLESS(entry->type == 1, ldr::ResultInvalidRegulatorEntry()); - R_UNLESS(entry->type_1.volt_reg == 0x17, ldr::ResultInvalidRegulatorEntry()); - R_UNLESS(entry->type_1.step_uv == uv_step, ldr::ResultInvalidRegulatorEntry()); - R_UNLESS(entry->type_1.min_uv == uv_min, ldr::ResultInvalidRegulatorEntry()); + R_UNLESS(entry->id == 1, ldr::ResultInvalidRegulatorEntry()); + R_UNLESS(entry->type == 1, ldr::ResultInvalidRegulatorEntry()); + R_UNLESS(entry->type_1.volt_reg == 0x17, ldr::ResultInvalidRegulatorEntry()); + R_UNLESS(entry->type_1.step_uv == uv_step, ldr::ResultInvalidRegulatorEntry()); + R_UNLESS(entry->type_1.min_uv == uv_min, ldr::ResultInvalidRegulatorEntry()); R_SUCCEED(); }; @@ -76,14 +76,14 @@ namespace ams::ldr::hoc::pcv { } void SafetyCheck() { - struct sValidator { + struct Validator { volatile u32 value; u32 min; u32 max; u32 panic; bool value_required = false; - Result check() { + Result Check() { if (!value_required && !value) { R_SUCCEED(); } @@ -145,85 +145,25 @@ namespace ams::ldr::hoc::pcv { break; } - sValidator validators[] = { + Validator validators[] = { { C.eristaCpuBoostClock, 1020'000, 2397'000, panic::Cpu, true }, { C.marikoCpuBoostClock, 1020'000, 2703'000, panic::Cpu, true }, - { - C.eristaCpuMaxVolt, - 1000, - 1260, - panic::Cpu, - }, - { - C.marikoCpuMaxVolt, - 1000, - 1200, - panic::Cpu, - }, - { - eristaCpuDvfsMaxFreq, - 1785'000, - 2397'000, - panic::Cpu, - }, - { - marikoCpuDvfsMaxFreq, - 1785'000, - 2703'000, - panic::Cpu, - }, - { - C.commonEmcMemVolt, - 912'500, - 1350'000, - panic::Emc, - }, /* Official vmax for the RAMs is 1400-1500mV */ - { - C.eristaEmcMaxClock, - 1600'000, - 2600'000, - panic::Emc, - }, - { - C.marikoEmcMaxClock, - 1600'000, - 3500'000, - panic::Emc, - }, - { - C.marikoEmcVddqVolt, - 400'000, - 750'000, - panic::Emc, - }, - { - C.marikoSocVmax, - 1000, - 1200, - panic::Emc, - }, - { - eristaGpuDvfsMaxFreq, - 768'000, - 1152'000, - panic::Gpu, - }, - { - marikoGpuDvfsMaxFreq, - 768'000, - 1536'000, - panic::Gpu, - }, - { - C.marikoGpuVmax, - 800, - 960, - panic::Gpu, - }, + { C.eristaCpuMaxVolt, 1000, 1260, panic::Cpu, }, + { C.marikoCpuMaxVolt, 1000, 1200, panic::Cpu, }, + { eristaCpuDvfsMaxFreq, 1785'000, 2397'000, panic::Cpu, }, + { marikoCpuDvfsMaxFreq, 1785'000, 2703'000, panic::Cpu, }, + { C.commonEmcMemVolt, 912'500, 1350'000, panic::Emc, }, /* Official vmax for the RAMs is 1400-1500mV */ + { C.eristaEmcMaxClock, 1600'000, 2600'000, panic::Emc, }, + { C.marikoEmcMaxClock, 1600'000, 3500'000, panic::Emc, }, + { C.marikoEmcVddqVolt, 400'000, 750'000, panic::Emc, }, + { C.marikoSocVmax, 1000, 1200, panic::Emc, }, + { eristaGpuDvfsMaxFreq, 768'000, 1152'000, panic::Gpu, }, + { marikoGpuDvfsMaxFreq, 768'000, 1536'000, panic::Gpu, }, + { C.marikoGpuVmax, 800, 960, panic::Gpu, }, }; for (auto &v : validators) { - if (R_FAILED(v.check())) { + if (R_FAILED(v.Check())) { panic::SmcError(v.panic); CRASH("Validation FAIL"); } @@ -249,4 +189,4 @@ namespace ams::ldr::hoc::pcv { WriteKipLoadToIram(); } -} // namespace ams::ldr::hoc::pcv +} diff --git a/Source/Atmosphere/stratosphere/loader/source/oc/pcv/pcv.hpp b/Source/Atmosphere/stratosphere/loader/source/oc/pcv/pcv.hpp index 1e5141ee..a4586c94 100644 --- a/Source/Atmosphere/stratosphere/loader/source/oc/pcv/pcv.hpp +++ b/Source/Atmosphere/stratosphere/loader/source/oc/pcv/pcv.hpp @@ -202,4 +202,4 @@ namespace ams::ldr::hoc::pcv { void SafetyCheck(); void Patch(uintptr_t mapped_nso, size_t nso_size); -} // namespace ams::ldr::hoc::pcv +}