fix namespace overusage

This commit is contained in:
Lightos1 committed 2026-09-11 13:11:04 +02:00
1 parent 1741e27116
commit 8fc18ee3e8
41 files changed
+438 -440

No files matched your search

+4 -4
View File
@@ -192,7 +192,7 @@ namespace board {
Result bpmpfwRc = bpmp::StartBpmfwExecution();
if (R_FAILED(bpmpfwRc)) {
fileUtils::LogLine("[bpmp] StartBpmfwExecution failed: 0x%x", bpmpfwRc);
file::utils::LogLine("[bpmp] StartBpmfwExecution failed: 0x%x", bpmpfwRc);
}
bpmp::StartSleepMonitorThread();
@@ -255,7 +255,7 @@ namespace board {
}
#define MMIO32(addr) (*reinterpret_cast<volatile u32 *>(addr))
NX_NORETURN void panic(u32 c) {
NX_NORETURN void Panic(u32 c) {
SmcReadWriteRegister(0x7000EC40 /* PMC_BASE + APBDEV_PMC_SCRATCH200 */, ~0, c);
/* Write timer magic */
@@ -287,7 +287,7 @@ namespace board {
}
u8 GetDramID() {
return soc::mrr::IdentifyDramId();
return soc::IdentifyDramId();
}
u8 GetFuseDramId() {
@@ -301,7 +301,7 @@ namespace board {
svcCallSecureMonitor(&args);
if (args.X[1] == (MC_REGISTER_BASE + MC_EMEM_CFG_0)) { // if param 1 is identical read failed
notification::writeNotification("Horizon OC\nSecmon read failed!\n This may be a hardware issue!");
hos::WriteNotification("Horizon OC\nSecmon read failed!\n This may be a hardware issue!");
return false;
}
+1 -1
View File
@@ -62,6 +62,6 @@ namespace board {
bool IsDram8GB();
void SetDisplayRefreshDockedState(bool docked);
FuseData *GetFuseData();
NX_NORETURN void panic(u32 c);
NX_NORETURN void Panic(u32 c);
} // namespace board
@@ -82,10 +82,10 @@ namespace board {
void HandleCpuUv() {
if (board::GetSocType() == HocClkSocType_Erista)
board::SetDfllTunings(config::GetConfigValue(KipConfigValue_eristaCpuUV), 0, 1581000000); // Erista tbreak is always 1581MHz
board::SetDfllTunings(file::config::GetConfigValue(KipConfigValue_eristaCpuUV), 0, 1581000000); // Erista tbreak is always 1581MHz
else
board::SetDfllTunings(config::GetConfigValue(KipConfigValue_marikoCpuUVLow), config::GetConfigValue(KipConfigValue_marikoCpuUVHigh),
board::CalculateTbreak(config::GetConfigValue(KipConfigValue_tableConf)));
board::SetDfllTunings(file::config::GetConfigValue(KipConfigValue_marikoCpuUVLow), file::config::GetConfigValue(KipConfigValue_marikoCpuUVHigh),
board::CalculateTbreak(file::config::GetConfigValue(KipConfigValue_tableConf)));
}
void SetHz(HocClkModule module, u32 hz) {
@@ -130,11 +130,11 @@ namespace board {
PcvSetHz(GetPcvModule(module), pcvHz);
}
}
if (config::GetConfigValue(HocClkConfigValue_LiveCpuUv) && module == HocClkModule_CPU) {
if (file::config::GetConfigValue(HocClkConfigValue_LiveCpuUv) && module == HocClkModule_CPU) {
HandleCpuUv();
}
if (useGm20b) {
if (gm20b::setClock(hz / 1000)) {
if (soc::SetClock(hz / 1000)) {
currentInjectedHz = hz;
}
}
@@ -55,7 +55,7 @@ namespace board {
s32 PollDramMr4TempMilli() {
u8 mr4 = 0;
if (!soc::mrr::ReadRamMr4(&mr4))
if (!soc::ReadRamMr4(&mr4))
return 0; /* stock exosphere */
/* TODO: verify this table manually*/
@@ -132,7 +132,7 @@ namespace board {
break;
}
case HocClkThermalSensor_BQ24193: {
millis = bq24193::getBQTemp();
millis = tsensor::GetBqTemp();
break;
}
case HocClkThermalSensor_AO: {
@@ -283,7 +283,7 @@ namespace board {
bool ValidateHandle(Handle handle) {
if (handle == INVALID_HANDLE) {
fileUtils::LogLine("Invalid handle!");
file::utils::LogLine("Invalid handle!");
return false;
}
@@ -319,7 +319,7 @@ namespace board {
if (R_FAILED(resultProcessMemory) || !address) {
svcCloseHandle(handle);
fileUtils::LogLine("[dvfs] Failed to get process data. %u", R_DESCRIPTION(resultProcessMemory));
file::utils::LogLine("[dvfs] Failed to get process data. %u", R_DESCRIPTION(resultProcessMemory));
handle = INVALID_HANDLE;
return;
}
@@ -359,11 +359,11 @@ namespace board {
// Print info AFTER we exit the handle to avoid hangs
for (int i = 0; i < (int)std::size(cpuVoltTable); ++i) {
fileUtils::LogLine("[dvfs] cpu volt %d: %u mV", i, cpuVoltTable[i]);
file::utils::LogLine("[dvfs] cpu volt %d: %u mV", i, cpuVoltTable[i]);
}
for (int i = 0; i < (int)std::size(voltData.voltTableStock); ++i) {
fileUtils::LogLine("[dvfs] gpu volt %d: %u mV", i, voltData.voltTableStock[0][i]);
file::utils::LogLine("[dvfs] gpu volt %d: %u mV", i, voltData.voltTableStock[0][i]);
}
return;
}
@@ -412,7 +412,7 @@ namespace board {
ASSERT_RESULT_OK(WriteGpuVoltTable(table), "WriteGpuVoltTable");
voltData.ramVmin = vmin;
fileUtils::LogLine("[dvfs] voltage set to %u mV", vmin);
file::utils::LogLine("[dvfs] voltage set to %u mV", vmin);
}
u32 GetGpuFreqIndex(u32 hz) {