From ea31f132de1b1632bd0735cd7c8a81cb610678a5 Mon Sep 17 00:00:00 2001 From: souldbminersmwc Date: Sat, 20 Dec 2025 15:35:27 -0500 Subject: [PATCH] hoc-monitor-: fix include path --- Source/Horizon-OC-Monitor/Makefile | 2 +- .../Horizon-OC-Monitor/include/sysclk/apm.h | 39 -- .../Horizon-OC-Monitor/include/sysclk/board.h | 204 ------- .../include/sysclk/client/ipc.h | 58 -- .../include/sysclk/client/types.h | 46 -- .../include/sysclk/clock_manager.h | 61 -- .../include/sysclk/config.h | 571 ------------------ .../include/sysclk/errors.h | 39 -- .../Horizon-OC-Monitor/include/sysclk/ipc.h | 73 --- .../include/sysclk/psm_ext.h | 77 --- 10 files changed, 1 insertion(+), 1169 deletions(-) delete mode 100644 Source/Horizon-OC-Monitor/include/sysclk/apm.h delete mode 100644 Source/Horizon-OC-Monitor/include/sysclk/board.h delete mode 100644 Source/Horizon-OC-Monitor/include/sysclk/client/ipc.h delete mode 100644 Source/Horizon-OC-Monitor/include/sysclk/client/types.h delete mode 100644 Source/Horizon-OC-Monitor/include/sysclk/clock_manager.h delete mode 100644 Source/Horizon-OC-Monitor/include/sysclk/config.h delete mode 100644 Source/Horizon-OC-Monitor/include/sysclk/errors.h delete mode 100644 Source/Horizon-OC-Monitor/include/sysclk/ipc.h delete mode 100644 Source/Horizon-OC-Monitor/include/sysclk/psm_ext.h diff --git a/Source/Horizon-OC-Monitor/Makefile b/Source/Horizon-OC-Monitor/Makefile index aad4ae07..fb23de0e 100644 --- a/Source/Horizon-OC-Monitor/Makefile +++ b/Source/Horizon-OC-Monitor/Makefile @@ -42,7 +42,7 @@ APP_VERSION := 1.3.2+r4-hoc TARGET := $(notdir $(CURDIR)) BUILD := build SOURCES := source -INCLUDES := include lib/Atmosphere-libs/libstratosphere/source/dmnt lib/Atmosphere-libs/libstratosphere/source +INCLUDES := include lib/Atmosphere-libs/libstratosphere/source/dmnt lib/Atmosphere-libs/libstratosphere/source ../sys-clk/common/include/ NO_ICON := 1 #ROMFS := romfs diff --git a/Source/Horizon-OC-Monitor/include/sysclk/apm.h b/Source/Horizon-OC-Monitor/include/sysclk/apm.h deleted file mode 100644 index e6442896..00000000 --- a/Source/Horizon-OC-Monitor/include/sysclk/apm.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) Souldbminer and Horizon OC Contributors - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -/* -------------------------------------------------------------------------- - * "THE BEER-WARE LICENSE" (Revision 42): - * , , - * wrote this file. As long as you retain this notice you can do whatever you - * want with this stuff. If you meet any of us some day, and you think this - * stuff is worth it, you can buy us a beer in return. - The sys-clk authors - * -------------------------------------------------------------------------- - */ - - -#pragma once - -#include "board.h" - -typedef struct { - uint32_t id; - uint32_t cpu_hz; - uint32_t gpu_hz; - uint32_t mem_hz; -} SysClkApmConfiguration; - -extern SysClkApmConfiguration sysclk_g_apm_configurations[]; diff --git a/Source/Horizon-OC-Monitor/include/sysclk/board.h b/Source/Horizon-OC-Monitor/include/sysclk/board.h deleted file mode 100644 index 8462993f..00000000 --- a/Source/Horizon-OC-Monitor/include/sysclk/board.h +++ /dev/null @@ -1,204 +0,0 @@ -/* - * Copyright (c) Souldbminer and Horizon OC Contributors - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -/* -------------------------------------------------------------------------- - * "THE BEER-WARE LICENSE" (Revision 42): - * , , - * wrote this file. As long as you retain this notice you can do whatever you - * want with this stuff. If you meet any of us some day, and you think this - * stuff is worth it, you can buy us a beer in return. - The sys-clk authors - * -------------------------------------------------------------------------- - */ - - -#pragma once - -#include -#include -#include - -typedef enum -{ - SysClkSocType_Erista = 0, - SysClkSocType_Mariko, - SysClkSocType_EnumMax -} SysClkSocType; - -typedef enum -{ - HorizonOCConsoleType_Unknown = 0, - HorizonOCConsoleType_V1, - HorizonOCConsoleType_UnreleasedErista, - HorizonOCConsoleType_V2, - HorizonOCConsoleType_Lite, - HorizonOCConsoleType_UnreleasedMariko, - HorizonOCConsoleType_OLED, - HorizonOCConsoleType_EnumMax, -} HorizonOCConsoleType; - -typedef enum { - HocClkVoltage_SOC = 0, - HocClkVoltage_EMCVDD2, - HocClkVoltage_CPU, - HocClkVoltage_GPU, - HocClkVoltage_EMCVDDQ_MarikoOnly, - HocClkVoltage_Display, - HocClkVoltage_Battery, - HocClkVoltage_EnumMax, -} HocClkVoltage; - -typedef enum -{ - SysClkProfile_Handheld = 0, - SysClkProfile_HandheldCharging, - SysClkProfile_HandheldChargingUSB, - SysClkProfile_HandheldChargingOfficial, - SysClkProfile_Docked, - SysClkProfile_EnumMax -} SysClkProfile; - -typedef enum -{ - SysClkModule_CPU = 0, - SysClkModule_GPU, - SysClkModule_MEM, - SysClkModule_EnumMax, -} SysClkModule; - -typedef enum -{ - SysClkThermalSensor_SOC = 0, - SysClkThermalSensor_PCB, - SysClkThermalSensor_Skin, - HorizonOCThermalSensor_Battery, - HorizonOCThermalSensor_PMIC, - SysClkThermalSensor_EnumMax -} SysClkThermalSensor; - -typedef enum -{ - SysClkPowerSensor_Now = 0, - SysClkPowerSensor_Avg, - SysClkPowerSensor_EnumMax -} SysClkPowerSensor; - -typedef enum -{ - SysClkPartLoad_EMC = 0, - SysClkPartLoad_EMCCpu, - HocClkPartLoad_GPU, - HocClkPartLoad_CPUAvg, - HocClkPartLoad_BAT, - HocClkPartLoad_FAN, - SysClkPartLoad_EnumMax -} SysClkPartLoad; - - -typedef enum -{ - ReverseNX_NotFound = 0, - ReverseNX_SystemDefault = 0, - ReverseNX_Handheld, - ReverseNX_Docked, -} ReverseNXMode; - - -#define SYSCLK_ENUM_VALID(n, v) ((v) < n##_EnumMax) - -static inline const char* sysclkFormatModule(SysClkModule module, bool pretty) -{ - switch(module) - { - case SysClkModule_CPU: - return pretty ? "CPU" : "cpu"; - case SysClkModule_GPU: - return pretty ? "GPU" : "gpu"; - case SysClkModule_MEM: - return pretty ? "Memory" : "mem"; - default: - return NULL; - } -} - -static inline const char* sysclkFormatThermalSensor(SysClkThermalSensor thermSensor, bool pretty) -{ - switch(thermSensor) - { - case SysClkThermalSensor_SOC: - return pretty ? "SOC" : "soc"; - case SysClkThermalSensor_PCB: - return pretty ? "PCB" : "pcb"; - case SysClkThermalSensor_Skin: - return pretty ? "Skin" : "skin"; - default: - return NULL; - } -} - -static inline const char* sysclkFormatPowerSensor(SysClkPowerSensor powSensor, bool pretty) -{ - switch(powSensor) - { - case SysClkPowerSensor_Now: - return pretty ? "Now" : "now"; - case SysClkPowerSensor_Avg: - return pretty ? "Avg" : "avg"; - default: - return NULL; - } -} - -static inline const char* sysclkFormatProfile(SysClkProfile profile, bool pretty) -{ - switch(profile) - { - case SysClkProfile_Docked: - return pretty ? "Docked" : "docked"; - case SysClkProfile_Handheld: - return pretty ? "Handheld" : "handheld"; - case SysClkProfile_HandheldCharging: - return pretty ? "Charging" : "handheld_charging"; - case SysClkProfile_HandheldChargingUSB: - return pretty ? "USB Charger" : "handheld_charging_usb"; - case SysClkProfile_HandheldChargingOfficial: - return pretty ? "PD Charger" : "handheld_charging_official"; - default: - return NULL; - } -} - - -static inline const char* hocClkFormatVoltage(HocClkVoltage voltage, bool pretty) -{ - switch(voltage) - { - case HocClkVoltage_CPU: - return pretty ? "CPU" : "cpu"; - case HocClkVoltage_GPU: - return pretty ? "GPU" : "gpu"; - case HocClkVoltage_EMCVDD2: - return pretty ? "VDD2" : "emcvdd2"; - case HocClkVoltage_EMCVDDQ_MarikoOnly: - return pretty ? "VDDQ" : "vddq"; - case HocClkVoltage_SOC: - return pretty ? "SOC" : "soc"; - case HocClkVoltage_Display: - return pretty ? "SOC" : "soc"; - default: - return NULL; - } -} \ No newline at end of file diff --git a/Source/Horizon-OC-Monitor/include/sysclk/client/ipc.h b/Source/Horizon-OC-Monitor/include/sysclk/client/ipc.h deleted file mode 100644 index b61a0511..00000000 --- a/Source/Horizon-OC-Monitor/include/sysclk/client/ipc.h +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (c) Souldbminer and Horizon OC Contributors - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -/* -------------------------------------------------------------------------- - * "THE BEER-WARE LICENSE" (Revision 42): - * , , - * wrote this file. As long as you retain this notice you can do whatever you - * want with this stuff. If you meet any of us some day, and you think this - * stuff is worth it, you can buy us a beer in return. - The sys-clk authors - * -------------------------------------------------------------------------- - */ - - -#pragma once - -#include "types.h" -#include "../config.h" -#include "../board.h" -#include "../ipc.h" - -bool sysclkIpcRunning(); -Result sysclkIpcInitialize(void); -void sysclkIpcExit(void); - -Result sysclkIpcGetAPIVersion(u32* out_ver); -Result sysclkIpcGetVersionString(char* out, size_t len); -Result sysclkIpcGetCurrentContext(SysClkContext* out_context); -Result sysclkIpcGetProfileCount(u64 tid, u8* out_count); -Result sysclkIpcSetEnabled(bool enabled); -Result sysclkIpcExitCmd(); -Result sysclkIpcSetOverride(SysClkModule module, u32 hz); -Result sysclkIpcGetProfiles(u64 tid, SysClkTitleProfileList* out_profiles); -Result sysclkIpcSetProfiles(u64 tid, SysClkTitleProfileList* profiles); -Result sysclkIpcGetConfigValues(SysClkConfigValueList* out_configValues); -Result sysclkIpcSetConfigValues(SysClkConfigValueList* configValues); -Result sysclkIpcGetFreqList(SysClkModule module, u32* list, u32 maxCount, u32* outCount); -Result sysclkIpcSetReverseNXRTMode(ReverseNXMode mode); -Result hocClkIpcSetKipData(); -Result hocClkIpcGetKipData(); - -static inline Result sysclkIpcRemoveOverride(SysClkModule module) -{ - return sysclkIpcSetOverride(module, 0); -} diff --git a/Source/Horizon-OC-Monitor/include/sysclk/client/types.h b/Source/Horizon-OC-Monitor/include/sysclk/client/types.h deleted file mode 100644 index b2aec78d..00000000 --- a/Source/Horizon-OC-Monitor/include/sysclk/client/types.h +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (c) Souldbminer and Horizon OC Contributors - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -/* -------------------------------------------------------------------------- - * "THE BEER-WARE LICENSE" (Revision 42): - * , , - * wrote this file. As long as you retain this notice you can do whatever you - * want with this stuff. If you meet any of us some day, and you think this - * stuff is worth it, you can buy us a beer in return. - The sys-clk authors - * -------------------------------------------------------------------------- - */ - - -#pragma once - -#ifdef __SWITCH__ - -#include -#include - -#else - -#define R_FAILED(res) ((res) != 0) -#define R_SUCCEEDED(res) ((res) == 0) - -typedef std::uint32_t Result; -typedef std::uint32_t u32; -typedef std::int32_t s32; -typedef std::uint64_t u64; -typedef std::uint8_t u8; - -#endif diff --git a/Source/Horizon-OC-Monitor/include/sysclk/clock_manager.h b/Source/Horizon-OC-Monitor/include/sysclk/clock_manager.h deleted file mode 100644 index 7c94e948..00000000 --- a/Source/Horizon-OC-Monitor/include/sysclk/clock_manager.h +++ /dev/null @@ -1,61 +0,0 @@ -/* - * Copyright (c) Souldbminer and Horizon OC Contributors - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -/* -------------------------------------------------------------------------- - * "THE BEER-WARE LICENSE" (Revision 42): - * , , - * wrote this file. As long as you retain this notice you can do whatever you - * want with this stuff. If you meet any of us some day, and you think this - * stuff is worth it, you can buy us a beer in return. - The sys-clk authors - * -------------------------------------------------------------------------- - */ - - -#pragma once - -#include -#include "board.h" - -typedef struct -{ - uint8_t enabled; - uint64_t applicationId; - SysClkProfile profile; - uint32_t freqs[SysClkModule_EnumMax]; - uint32_t realFreqs[SysClkModule_EnumMax]; - uint32_t overrideFreqs[SysClkModule_EnumMax]; - uint32_t temps[SysClkThermalSensor_EnumMax]; - int32_t power[SysClkPowerSensor_EnumMax]; - uint32_t PartLoad[SysClkPartLoad_EnumMax]; - uint32_t voltages[HocClkVoltage_EnumMax]; - uint32_t perfConfId; - u8 fps; - u8 lcdFreq; - u8 fanLevel; -} SysClkContext; - -typedef struct -{ - union { - uint32_t mhz[+SysClkProfile_EnumMax * +SysClkModule_EnumMax]; - uint32_t mhzMap[+SysClkProfile_EnumMax][+SysClkModule_EnumMax]; - }; -} SysClkTitleProfileList; - -#define SYSCLK_FREQ_LIST_MAX 32 - -#define GLOBAL_PROFILE_ID 0xA111111111111111 \ No newline at end of file diff --git a/Source/Horizon-OC-Monitor/include/sysclk/config.h b/Source/Horizon-OC-Monitor/include/sysclk/config.h deleted file mode 100644 index 51491ae8..00000000 --- a/Source/Horizon-OC-Monitor/include/sysclk/config.h +++ /dev/null @@ -1,571 +0,0 @@ -/* - * Copyright (c) Souldbminer and Horizon OC Contributors - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -/* -------------------------------------------------------------------------- - * "THE BEER-WARE LICENSE" (Revision 42): - * , , - * wrote this file. As long as you retain this notice you can do whatever you - * want with this stuff. If you meet any of us some day, and you think this - * stuff is worth it, you can buy us a beer in return. - The sys-clk authors - * -------------------------------------------------------------------------- - */ - - -#pragma once - -#include -#include - -typedef enum { - SysClkConfigValue_PollingIntervalMs = 0, - SysClkConfigValue_TempLogIntervalMs, - SysClkConfigValue_FreqLogIntervalMs, - SysClkConfigValue_PowerLogIntervalMs, - SysClkConfigValue_CsvWriteIntervalMs, - - HocClkConfigValue_UncappedClocks, - HocClkConfigValue_OverwriteBoostMode, - - HocClkConfigValue_EristaMaxCpuClock, - HocClkConfigValue_EristaMaxGpuClock, - HocClkConfigValue_EristaMaxMemClock, - HocClkConfigValue_MarikoMaxCpuClock, - HocClkConfigValue_MarikoMaxGpuClock, - HocClkConfigValue_MarikoMaxMemClock, - - HocClkConfigValue_ThermalThrottle, - HocClkConfigValue_ThermalThrottleThreshold, - - HocClkConfigValue_HandheldGovernor, - HocClkConfigValue_DockedGovernor, - - HocClkConfigValue_HandheldTDP, - HocClkConfigValue_HandheldTDPLimit, - - HocClkConfigValue_LiteTDPLimit, - - HocClkConfigValue_EnforceBoardLimit, - - HocClkConfigValue_KipEditing, - HocClkConfigValue_KipFileName, - - HorizonOCConfigValue_BatteryChargeCurrent, - - KipConfigValue_custRev, - KipConfigValue_mtcConf, - KipConfigValue_hpMode, - - KipConfigValue_commonEmcMemVolt, - KipConfigValue_eristaEmcMaxClock, - KipConfigValue_marikoEmcMaxClock, - KipConfigValue_marikoEmcVddqVolt, - KipConfigValue_emcDvbShift, - - KipConfigValue_t1_tRCD, - KipConfigValue_t2_tRP, - KipConfigValue_t3_tRAS, - KipConfigValue_t4_tRRD, - KipConfigValue_t5_tRFC, - KipConfigValue_t6_tRTW, - KipConfigValue_t7_tWTR, - KipConfigValue_t8_tREFI, - KipConfigValue_mem_burst_read_latency, - KipConfigValue_mem_burst_write_latency, - - KipConfigValue_eristaCpuUV, - KipConfigValue_eristaCpuVmin, - KipConfigValue_eristaCpuMaxVolt, - KipConfigValue_eristaCpuUnlock, - - KipConfigValue_marikoCpuUVLow, - KipConfigValue_marikoCpuUVHigh, - KipConfigValue_tableConf, - KipConfigValue_marikoCpuLowVmin, - KipConfigValue_marikoCpuHighVmin, - KipConfigValue_marikoCpuMaxVolt, - KipConfigValue_marikoCpuMaxClock, - KipConfigValue_eristaCpuBoostClock, - KipConfigValue_marikoCpuBoostClock, - - KipConfigValue_eristaGpuUV, - KipConfigValue_eristaGpuVmin, - - KipConfigValue_marikoGpuUV, - KipConfigValue_marikoGpuVmin, - KipConfigValue_marikoGpuVmax, - - KipConfigValue_commonGpuVoltOffset, - KipConfigValue_gpuSpeedo, - KipConfigValue_marikoGpuFullUnlock, - - KipConfigValue_g_volt_76800, - KipConfigValue_g_volt_153600, - KipConfigValue_g_volt_230400, - KipConfigValue_g_volt_307200, - KipConfigValue_g_volt_384000, - KipConfigValue_g_volt_460800, - KipConfigValue_g_volt_537600, - KipConfigValue_g_volt_614400, - KipConfigValue_g_volt_691200, - KipConfigValue_g_volt_768000, - KipConfigValue_g_volt_844800, - KipConfigValue_g_volt_921600, - KipConfigValue_g_volt_998400, - KipConfigValue_g_volt_1075200, - KipConfigValue_g_volt_1152000, - KipConfigValue_g_volt_1228800, - KipConfigValue_g_volt_1267200, - KipConfigValue_g_volt_1305600, - KipConfigValue_g_volt_1344000, - KipConfigValue_g_volt_1382400, - KipConfigValue_g_volt_1420800, - KipConfigValue_g_volt_1459200, - KipConfigValue_g_volt_1497600, - KipConfigValue_g_volt_1536000, - - KipConfigValue_g_volt_e_76800, - KipConfigValue_g_volt_e_115200, - KipConfigValue_g_volt_e_153600, - KipConfigValue_g_volt_e_192000, - KipConfigValue_g_volt_e_230400, - KipConfigValue_g_volt_e_268800, - KipConfigValue_g_volt_e_307200, - KipConfigValue_g_volt_e_345600, - KipConfigValue_g_volt_e_384000, - KipConfigValue_g_volt_e_422400, - KipConfigValue_g_volt_e_460800, - KipConfigValue_g_volt_e_499200, - KipConfigValue_g_volt_e_537600, - KipConfigValue_g_volt_e_576000, - KipConfigValue_g_volt_e_614400, - KipConfigValue_g_volt_e_652800, - KipConfigValue_g_volt_e_691200, - KipConfigValue_g_volt_e_729600, - KipConfigValue_g_volt_e_768000, - KipConfigValue_g_volt_e_806400, - KipConfigValue_g_volt_e_844800, - KipConfigValue_g_volt_e_883200, - KipConfigValue_g_volt_e_921600, - KipConfigValue_g_volt_e_960000, - KipConfigValue_g_volt_e_998400, - KipConfigValue_g_volt_e_1036800, - KipConfigValue_g_volt_e_1075200, - - SysClkConfigValue_EnumMax, -} SysClkConfigValue; - -typedef struct { - uint64_t values[SysClkConfigValue_EnumMax]; -} SysClkConfigValueList; - -static inline const char* sysclkFormatConfigValue(SysClkConfigValue val, bool pretty) -{ - switch(val) - { - case SysClkConfigValue_PollingIntervalMs: - return pretty ? "Polling Interval (ms)" : "poll_interval_ms"; - case SysClkConfigValue_TempLogIntervalMs: - return pretty ? "Temperature logging interval (ms)" : "temp_log_interval_ms"; - case SysClkConfigValue_FreqLogIntervalMs: - return pretty ? "Frequency logging interval (ms)" : "freq_log_interval_ms"; - case SysClkConfigValue_PowerLogIntervalMs: - return pretty ? "Power logging interval (ms)" : "power_log_interval_ms"; - case SysClkConfigValue_CsvWriteIntervalMs: - return pretty ? "CSV write interval (ms)" : "csv_write_interval_ms"; - - case HocClkConfigValue_UncappedClocks: - return pretty ? "Uncapped Clocks" : "uncapped_clocks"; - case HocClkConfigValue_OverwriteBoostMode: - return pretty ? "Overwrite Boost Mode" : "ow_boost"; - - case HocClkConfigValue_EristaMaxCpuClock: - return pretty ? "Max CPU Clock" : "cpu_max_e"; - case HocClkConfigValue_EristaMaxGpuClock: - return pretty ? "Max GPU Clock" : "gpu_max_e"; - case HocClkConfigValue_EristaMaxMemClock: - return pretty ? "Erista Max MEM Clock" : "mem_max_e"; - - case HocClkConfigValue_MarikoMaxCpuClock: - return pretty ? "CPU Max Display Clock" : "cpu_max_m"; - case HocClkConfigValue_MarikoMaxGpuClock: - return pretty ? "Mariko Max GPU Clock" : "gpu_max_m"; - case HocClkConfigValue_MarikoMaxMemClock: - return pretty ? "Mariko Max MEM Clock" : "mem_max_m"; - - case HocClkConfigValue_ThermalThrottle: - return pretty ? "Thermal Throttle" : "thermal_throttle"; - - case HocClkConfigValue_ThermalThrottleThreshold: - return pretty ? "Thermal Throttle Threshold" : "thermal_throttle_threshold"; - - case HocClkConfigValue_HandheldGovernor: - return pretty ? "Handheld Governor" : "governor"; - case HocClkConfigValue_DockedGovernor: - return pretty ? "Docked Governor" : "governor_docked"; - - case HocClkConfigValue_HandheldTDP: - return pretty ? "Handheld TDP" : "handheld_tdp"; - - case HocClkConfigValue_HandheldTDPLimit: - return pretty ? "Handheld TDP Limit" : "tdp_limit"; - - case HocClkConfigValue_LiteTDPLimit: - return pretty ? "Lite TDP Limit" : "tdp_limit_l"; - - case HocClkConfigValue_EnforceBoardLimit: - return pretty ? "Enforce Board Limit" : "enforce_board_limit"; - - case HocClkConfigValue_KipEditing: - return pretty ? "Enable KIP Editing" : "kip_editing"; - - case HocClkConfigValue_KipFileName: - return pretty ? "KIP File Name" : "kip_file_name"; - - case HorizonOCConfigValue_BatteryChargeCurrent: - return pretty ? "Battery Charge Current" : "bat_charge_current"; - - // KIP config values - case KipConfigValue_custRev: - return pretty ? "Custom Revision" : "kip_cust_rev"; - case KipConfigValue_mtcConf: - return pretty ? "MTC Config" : "kip_mtc_conf"; - case KipConfigValue_hpMode: - return pretty ? "HP Mode" : "kip_hp_mode"; - - // EMC - case KipConfigValue_commonEmcMemVolt: - return pretty ? "Common EMC/MEM Voltage" : "common_emc_mem_volt"; - case KipConfigValue_eristaEmcMaxClock: - return pretty ? "Erista EMC Max Clock" : "erista_emc_max_clock"; - case KipConfigValue_marikoEmcMaxClock: - return pretty ? "Mariko EMC Max Clock" : "mariko_emc_max_clock"; - case KipConfigValue_marikoEmcVddqVolt: - return pretty ? "Mariko EMC VDDQ Voltage" : "mariko_emc_vddq_volt"; - case KipConfigValue_emcDvbShift: - return pretty ? "EMC DVB Shift" : "emc_dvb_shift"; - - // Memory timings - case KipConfigValue_t1_tRCD: - return pretty ? "t1 - tRCD" : "t1_trcd"; - case KipConfigValue_t2_tRP: - return pretty ? "t2 - tRP" : "t2_trp"; - case KipConfigValue_t3_tRAS: - return pretty ? "t3 - tRAS" : "t3_tras"; - case KipConfigValue_t4_tRRD: - return pretty ? "t4 - tRRD" : "t4_trrd"; - case KipConfigValue_t5_tRFC: - return pretty ? "t5 - tRFC" : "t5_trfc"; - case KipConfigValue_t6_tRTW: - return pretty ? "t6 - tRTW" : "t6_trtw"; - case KipConfigValue_t7_tWTR: - return pretty ? "t7 - tWTR" : "t7_twtr"; - case KipConfigValue_t8_tREFI: - return pretty ? "t8 - tREFI" : "t8_trefi"; - case KipConfigValue_mem_burst_read_latency: - return pretty ? "Memory Burst Read Latency" : "mem_burst_read_latency"; - case KipConfigValue_mem_burst_write_latency: - return pretty ? "Memory Burst Write Latency" : "mem_burst_write_latency"; - - // CPU – Erista - case KipConfigValue_eristaCpuUV: - return pretty ? "Erista CPU Undervolt" : "erista_cpu_uv"; - case KipConfigValue_eristaCpuVmin: - return pretty ? "Erista CPU vMin" : "erista_cpu_vmin"; - case KipConfigValue_eristaCpuMaxVolt: - return pretty ? "Erista CPU Max Voltage" : "erista_cpu_max_volt"; - case KipConfigValue_eristaCpuUnlock: - return pretty ? "Erista CPU Unlock" : "erista_cpu_unlock"; - - // CPU – Mariko - case KipConfigValue_marikoCpuUVLow: - return pretty ? "Mariko CPU Undervolt (Low)" : "mariko_cpu_uv_low"; - case KipConfigValue_marikoCpuUVHigh: - return pretty ? "Mariko CPU Undervolt (High)" : "mariko_cpu_uv_high"; - case KipConfigValue_tableConf: - return pretty ? "Table Config" : "kip_table_conf"; - case KipConfigValue_marikoCpuLowVmin: - return pretty ? "Mariko CPU Low Vmin" : "mariko_cpu_low_vmin"; - case KipConfigValue_marikoCpuHighVmin: - return pretty ? "Mariko CPU High Vmin" : "mariko_cpu_high_vmin"; - case KipConfigValue_marikoCpuMaxVolt: - return pretty ? "Mariko CPU Max Voltage" : "mariko_cpu_max_volt"; - - case KipConfigValue_eristaCpuBoostClock: - return pretty ? "Erista CPU Boost Clock" : "erista_cpu_boost_clock"; - case KipConfigValue_marikoCpuBoostClock: - return pretty ? "Mariko CPU Boost Clock" : "mariko_cpu_boost_clock"; - - case KipConfigValue_marikoCpuMaxClock: - return pretty ? "Mariko CPU Max Clock" : "mariko_cpu_max_clock"; - - // GPU – Erista - case KipConfigValue_eristaGpuUV: - return pretty ? "Erista GPU Undervolt" : "erista_gpu_uv"; - case KipConfigValue_eristaGpuVmin: - return pretty ? "Erista GPU Vmin" : "erista_gpu_vmin"; - - // GPU – Mariko - case KipConfigValue_marikoGpuUV: - return pretty ? "Mariko GPU Undervolt" : "mariko_gpu_uv"; - case KipConfigValue_marikoGpuVmin: - return pretty ? "Mariko GPU Vmin" : "mariko_gpu_vmin"; - case KipConfigValue_marikoGpuVmax: - return pretty ? "Mariko GPU Vmax" : "mariko_gpu_vmax"; - - case KipConfigValue_commonGpuVoltOffset: - return pretty ? "Common GPU Voltage Offset" : "common_gpu_volt_offset"; - case KipConfigValue_gpuSpeedo: - return pretty ? "GPU Speedo" : "gpu_speedo"; - case KipConfigValue_marikoGpuFullUnlock: - return pretty ? "Mariko GPU Full Unlock" : "mariko_gpu_full_unlock"; - - // Mariko GPU voltages (24) - case KipConfigValue_g_volt_76800: return pretty ? "Mariko GPU Volt 76 MHz" : "g_volt_76800"; - case KipConfigValue_g_volt_153600: return pretty ? "Mariko GPU Volt 153 MHz" : "g_volt_153600"; - case KipConfigValue_g_volt_230400: return pretty ? "Mariko GPU Volt 230 MHz" : "g_volt_230400"; - case KipConfigValue_g_volt_307200: return pretty ? "Mariko GPU Volt 307 MHz" : "g_volt_307200"; - case KipConfigValue_g_volt_384000: return pretty ? "Mariko GPU Volt 384 MHz" : "g_volt_384000"; - case KipConfigValue_g_volt_460800: return pretty ? "Mariko GPU Volt 460 MHz" : "g_volt_460800"; - case KipConfigValue_g_volt_537600: return pretty ? "Mariko GPU Volt 537 MHz" : "g_volt_537600"; - case KipConfigValue_g_volt_614400: return pretty ? "Mariko GPU Volt 614 MHz" : "g_volt_614400"; - case KipConfigValue_g_volt_691200: return pretty ? "Mariko GPU Volt 691 MHz" : "g_volt_691200"; - case KipConfigValue_g_volt_768000: return pretty ? "Mariko GPU Volt 768 MHz" : "g_volt_768000"; - case KipConfigValue_g_volt_844800: return pretty ? "Mariko GPU Volt 844 MHz" : "g_volt_844800"; - case KipConfigValue_g_volt_921600: return pretty ? "Mariko GPU Volt 921 MHz" : "g_volt_921600"; - case KipConfigValue_g_volt_998400: return pretty ? "Mariko GPU Volt 998 MHz" : "g_volt_998400"; - case KipConfigValue_g_volt_1075200: return pretty ? "Mariko GPU Volt 1075 MHz" : "g_volt_1075200"; - case KipConfigValue_g_volt_1152000: return pretty ? "Mariko GPU Volt 1152 MHz" : "g_volt_1152000"; - case KipConfigValue_g_volt_1228800: return pretty ? "Mariko GPU Volt 1228 MHz" : "g_volt_1228800"; - case KipConfigValue_g_volt_1267200: return pretty ? "Mariko GPU Volt 1267 MHz" : "g_volt_1267200"; - case KipConfigValue_g_volt_1305600: return pretty ? "Mariko GPU Volt 1305 MHz" : "g_volt_1305600"; - case KipConfigValue_g_volt_1344000: return pretty ? "Mariko GPU Volt 1344 MHz" : "g_volt_1344000"; - case KipConfigValue_g_volt_1382400: return pretty ? "Mariko GPU Volt 1382 MHz" : "g_volt_1382400"; - case KipConfigValue_g_volt_1420800: return pretty ? "Mariko GPU Volt 1420 MHz" : "g_volt_1420800"; - case KipConfigValue_g_volt_1459200: return pretty ? "Mariko GPU Volt 1459 MHz" : "g_volt_1459200"; - case KipConfigValue_g_volt_1497600: return pretty ? "Mariko GPU Volt 1497 MHz" : "g_volt_1497600"; - case KipConfigValue_g_volt_1536000: return pretty ? "Mariko GPU Volt 1536 MHz" : "g_volt_1536000"; - - // Erista GPU voltages (27) - case KipConfigValue_g_volt_e_76800: return pretty ? "Erista GPU Volt 76 MHz" : "g_volt_e_76800"; - case KipConfigValue_g_volt_e_115200: return pretty ? "Erista GPU Volt 115 MHz" : "g_volt_e_115200"; - case KipConfigValue_g_volt_e_153600: return pretty ? "Erista GPU Volt 153 MHz" : "g_volt_e_153600"; - case KipConfigValue_g_volt_e_192000: return pretty ? "Erista GPU Volt 192 MHz" : "g_volt_e_192000"; - case KipConfigValue_g_volt_e_230400: return pretty ? "Erista GPU Volt 230 MHz" : "g_volt_e_230400"; - case KipConfigValue_g_volt_e_268800: return pretty ? "Erista GPU Volt 268 MHz" : "g_volt_e_268800"; - case KipConfigValue_g_volt_e_307200: return pretty ? "Erista GPU Volt 307 MHz" : "g_volt_e_307200"; - case KipConfigValue_g_volt_e_345600: return pretty ? "Erista GPU Volt 345 MHz" : "g_volt_e_345600"; - case KipConfigValue_g_volt_e_384000: return pretty ? "Erista GPU Volt 384 MHz" : "g_volt_e_384000"; - case KipConfigValue_g_volt_e_422400: return pretty ? "Erista GPU Volt 422 MHz" : "g_volt_e_422400"; - case KipConfigValue_g_volt_e_460800: return pretty ? "Erista GPU Volt 460 MHz" : "g_volt_e_460800"; - case KipConfigValue_g_volt_e_499200: return pretty ? "Erista GPU Volt 499 MHz" : "g_volt_e_499200"; - case KipConfigValue_g_volt_e_537600: return pretty ? "Erista GPU Volt 537 MHz" : "g_volt_e_537600"; - case KipConfigValue_g_volt_e_576000: return pretty ? "Erista GPU Volt 576 MHz" : "g_volt_e_576000"; - case KipConfigValue_g_volt_e_614400: return pretty ? "Erista GPU Volt 614 MHz" : "g_volt_e_614400"; - case KipConfigValue_g_volt_e_652800: return pretty ? "Erista GPU Volt 652 MHz" : "g_volt_e_652800"; - case KipConfigValue_g_volt_e_691200: return pretty ? "Erista GPU Volt 691 MHz" : "g_volt_e_691200"; - case KipConfigValue_g_volt_e_729600: return pretty ? "Erista GPU Volt 729 MHz" : "g_volt_e_729600"; - case KipConfigValue_g_volt_e_768000: return pretty ? "Erista GPU Volt 768 MHz" : "g_volt_e_768000"; - case KipConfigValue_g_volt_e_806400: return pretty ? "Erista GPU Volt 806 MHz" : "g_volt_e_806400"; - case KipConfigValue_g_volt_e_844800: return pretty ? "Erista GPU Volt 844 MHz" : "g_volt_e_844800"; - case KipConfigValue_g_volt_e_883200: return pretty ? "Erista GPU Volt 883 MHz" : "g_volt_e_883200"; - case KipConfigValue_g_volt_e_921600: return pretty ? "Erista GPU Volt 921 MHz" : "g_volt_e_921600"; - case KipConfigValue_g_volt_e_960000: return pretty ? "Erista GPU Volt 960 MHz" : "g_volt_e_960000"; - case KipConfigValue_g_volt_e_998400: return pretty ? "Erista GPU Volt 998 MHz" : "g_volt_e_998400"; - case KipConfigValue_g_volt_e_1036800: return pretty ? "Erista GPU Volt 1036 MHz" : "g_volt_e_1036800"; - case KipConfigValue_g_volt_e_1075200: return pretty ? "Erista GPU Volt 1075 MHz" : "g_volt_e_1075200"; - - default: - return pretty ? "[cfg] no enum format string" : "err_no_format_string"; - } -} - -static inline uint64_t sysclkDefaultConfigValue(SysClkConfigValue val) -{ - switch(val) - { - case SysClkConfigValue_PollingIntervalMs: - return 300ULL; - case SysClkConfigValue_TempLogIntervalMs: - case SysClkConfigValue_FreqLogIntervalMs: - case SysClkConfigValue_PowerLogIntervalMs: - case SysClkConfigValue_CsvWriteIntervalMs: - case HocClkConfigValue_UncappedClocks: - case HocClkConfigValue_OverwriteBoostMode: - case HocClkConfigValue_KipFileName: - return 0ULL; - case HocClkConfigValue_EristaMaxCpuClock: - return 1785ULL; - case HocClkConfigValue_EristaMaxGpuClock: - return 921ULL; - case HocClkConfigValue_EristaMaxMemClock: - return 1600ULL; - - case HocClkConfigValue_MarikoMaxCpuClock: - return 1963ULL; - case HocClkConfigValue_MarikoMaxGpuClock: - return 1075ULL; - case HocClkConfigValue_MarikoMaxMemClock: - return 1862ULL; - - case HocClkConfigValue_ThermalThrottle: - case HocClkConfigValue_DockedGovernor: - case HocClkConfigValue_HandheldGovernor: - case HocClkConfigValue_HandheldTDP: - case HocClkConfigValue_EnforceBoardLimit: - case HocClkConfigValue_KipEditing: - return 1ULL; - case HocClkConfigValue_ThermalThrottleThreshold: - return 70ULL; - case HocClkConfigValue_HandheldTDPLimit: - return 8600ULL; - case HocClkConfigValue_LiteTDPLimit: - return 6400ULL; - case HorizonOCConfigValue_BatteryChargeCurrent: - return 0ULL; - default: - return 0ULL; - } -} - -static inline uint64_t sysclkValidConfigValue(SysClkConfigValue val, uint64_t input) -{ - switch(val) - { - case HocClkConfigValue_EristaMaxCpuClock: - case HocClkConfigValue_EristaMaxGpuClock: - case HocClkConfigValue_EristaMaxMemClock: - case HocClkConfigValue_MarikoMaxCpuClock: - case HocClkConfigValue_MarikoMaxGpuClock: - case HocClkConfigValue_MarikoMaxMemClock: - case HocClkConfigValue_ThermalThrottleThreshold: - case HocClkConfigValue_HandheldTDPLimit: - case HocClkConfigValue_LiteTDPLimit: - case SysClkConfigValue_PollingIntervalMs: - return input > 0; - - case SysClkConfigValue_TempLogIntervalMs: - case SysClkConfigValue_FreqLogIntervalMs: - case SysClkConfigValue_PowerLogIntervalMs: - case SysClkConfigValue_CsvWriteIntervalMs: - case HocClkConfigValue_UncappedClocks: - case HocClkConfigValue_OverwriteBoostMode: - case HocClkConfigValue_ThermalThrottle: - case HocClkConfigValue_DockedGovernor: - case HocClkConfigValue_HandheldGovernor: - case HocClkConfigValue_HandheldTDP: - case HocClkConfigValue_EnforceBoardLimit: - case HocClkConfigValue_KipEditing: - case HocClkConfigValue_KipFileName: - return (input & 0x1) == input; - - case KipConfigValue_custRev: - case KipConfigValue_mtcConf: - case KipConfigValue_hpMode: - case KipConfigValue_commonEmcMemVolt: - case KipConfigValue_eristaEmcMaxClock: - case KipConfigValue_marikoEmcMaxClock: - case KipConfigValue_marikoEmcVddqVolt: - case KipConfigValue_emcDvbShift: - case KipConfigValue_t1_tRCD: - case KipConfigValue_t2_tRP: - case KipConfigValue_t3_tRAS: - case KipConfigValue_t4_tRRD: - case KipConfigValue_t5_tRFC: - case KipConfigValue_t6_tRTW: - case KipConfigValue_t7_tWTR: - case KipConfigValue_t8_tREFI: - case KipConfigValue_mem_burst_read_latency: - case KipConfigValue_mem_burst_write_latency: - case KipConfigValue_eristaCpuUV: - case KipConfigValue_eristaCpuMaxVolt: - case KipConfigValue_marikoCpuUVLow: - case KipConfigValue_marikoCpuUVHigh: - case KipConfigValue_tableConf: - case KipConfigValue_marikoCpuLowVmin: - case KipConfigValue_marikoCpuHighVmin: - case KipConfigValue_marikoCpuMaxVolt: - case KipConfigValue_eristaCpuBoostClock: - case KipConfigValue_marikoCpuBoostClock: - case KipConfigValue_marikoCpuMaxClock: - case KipConfigValue_eristaGpuUV: - case KipConfigValue_eristaGpuVmin: - case KipConfigValue_marikoGpuUV: - case KipConfigValue_marikoGpuVmin: - case KipConfigValue_marikoGpuVmax: - case KipConfigValue_commonGpuVoltOffset: - case KipConfigValue_gpuSpeedo: - case KipConfigValue_marikoGpuFullUnlock: - case KipConfigValue_g_volt_76800: - case KipConfigValue_g_volt_153600: - case KipConfigValue_g_volt_230400: - case KipConfigValue_g_volt_307200: - case KipConfigValue_g_volt_384000: - case KipConfigValue_g_volt_460800: - case KipConfigValue_g_volt_537600: - case KipConfigValue_g_volt_614400: - case KipConfigValue_g_volt_691200: - case KipConfigValue_g_volt_768000: - case KipConfigValue_g_volt_844800: - case KipConfigValue_g_volt_921600: - case KipConfigValue_g_volt_998400: - case KipConfigValue_g_volt_1075200: - case KipConfigValue_g_volt_1152000: - case KipConfigValue_g_volt_1228800: - case KipConfigValue_g_volt_1267200: - case KipConfigValue_g_volt_1305600: - case KipConfigValue_g_volt_1344000: - case KipConfigValue_g_volt_1382400: - case KipConfigValue_g_volt_1420800: - case KipConfigValue_g_volt_1459200: - case KipConfigValue_g_volt_1497600: - case KipConfigValue_g_volt_1536000: - case KipConfigValue_g_volt_e_76800: - case KipConfigValue_g_volt_e_115200: - case KipConfigValue_g_volt_e_153600: - case KipConfigValue_g_volt_e_192000: - case KipConfigValue_g_volt_e_230400: - case KipConfigValue_g_volt_e_268800: - case KipConfigValue_g_volt_e_307200: - case KipConfigValue_g_volt_e_345600: - case KipConfigValue_g_volt_e_384000: - case KipConfigValue_g_volt_e_422400: - case KipConfigValue_g_volt_e_460800: - case KipConfigValue_g_volt_e_499200: - case KipConfigValue_g_volt_e_537600: - case KipConfigValue_g_volt_e_576000: - case KipConfigValue_g_volt_e_614400: - case KipConfigValue_g_volt_e_652800: - case KipConfigValue_g_volt_e_691200: - case KipConfigValue_g_volt_e_729600: - case KipConfigValue_g_volt_e_768000: - case KipConfigValue_g_volt_e_806400: - case KipConfigValue_g_volt_e_844800: - case KipConfigValue_g_volt_e_883200: - case KipConfigValue_g_volt_e_921600: - case KipConfigValue_g_volt_e_960000: - case KipConfigValue_g_volt_e_998400: - case KipConfigValue_g_volt_e_1036800: - case KipConfigValue_g_volt_e_1075200: - case KipConfigValue_eristaCpuVmin: - case KipConfigValue_eristaCpuUnlock: - return true; - case HorizonOCConfigValue_BatteryChargeCurrent: - return ((input >= 1024) && (input <= 3072)) || !input; - default: - return false; - } -} \ No newline at end of file diff --git a/Source/Horizon-OC-Monitor/include/sysclk/errors.h b/Source/Horizon-OC-Monitor/include/sysclk/errors.h deleted file mode 100644 index f6c88b75..00000000 --- a/Source/Horizon-OC-Monitor/include/sysclk/errors.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright (c) Souldbminer and Horizon OC Contributors - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -/* -------------------------------------------------------------------------- - * "THE BEER-WARE LICENSE" (Revision 42): - * , , - * wrote this file. As long as you retain this notice you can do whatever you - * want with this stuff. If you meet any of us some day, and you think this - * stuff is worth it, you can buy us a beer in return. - The sys-clk authors - * -------------------------------------------------------------------------- - */ - - -#pragma once - -#define SYSCLK_ERROR_MODULE 388 -#define SYSCLK_ERROR(desc) ((SYSCLK_ERROR_MODULE & 0x1FF) | (SysClkError_##desc & 0x1FFF)<<9) - -typedef enum -{ - SysClkError_Generic = 0, - SysClkError_ConfigNotLoaded = 1, - SysClkError_ConfigSaveFailed = 2, - HocClkError_SocThermFail = 3, -} SysClkError; diff --git a/Source/Horizon-OC-Monitor/include/sysclk/ipc.h b/Source/Horizon-OC-Monitor/include/sysclk/ipc.h deleted file mode 100644 index 50d5ae01..00000000 --- a/Source/Horizon-OC-Monitor/include/sysclk/ipc.h +++ /dev/null @@ -1,73 +0,0 @@ -/* - * Copyright (c) Souldbminer and Horizon OC Contributors - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -/* -------------------------------------------------------------------------- - * "THE BEER-WARE LICENSE" (Revision 42): - * , , - * wrote this file. As long as you retain this notice you can do whatever you - * want with this stuff. If you meet any of us some day, and you think this - * stuff is worth it, you can buy us a beer in return. - The sys-clk authors - * -------------------------------------------------------------------------- - */ - - -#pragma once - -#include -#include "board.h" -#include "clock_manager.h" - -#define SYSCLK_IPC_API_VERSION 4 -#define SYSCLK_IPC_SERVICE_NAME "sys:clk" - -enum SysClkIpcCmd -{ - SysClkIpcCmd_GetApiVersion = 0, - SysClkIpcCmd_GetVersionString = 1, - SysClkIpcCmd_GetCurrentContext = 2, - SysClkIpcCmd_Exit = 3, - SysClkIpcCmd_GetProfileCount = 4, - SysClkIpcCmd_GetProfiles = 5, - SysClkIpcCmd_SetProfiles = 6, - SysClkIpcCmd_SetEnabled = 7, - SysClkIpcCmd_SetOverride = 8, - SysClkIpcCmd_GetConfigValues = 9, - SysClkIpcCmd_SetConfigValues = 10, - SysClkIpcCmd_GetFreqList = 11, - SysClkIpcCmd_SetReverseNXRTMode = 12, - HocClkIpcCmd_SetKipData = 13, - HocClkIpcCmd_GetKipData = 14, -}; - - -typedef struct -{ - uint64_t tid; - SysClkTitleProfileList profiles; -} SysClkIpc_SetProfiles_Args; - -typedef struct -{ - SysClkModule module; - uint32_t hz; -} SysClkIpc_SetOverride_Args; - -typedef struct -{ - SysClkModule module; - uint32_t maxCount; -} SysClkIpc_GetFreqList_Args; \ No newline at end of file diff --git a/Source/Horizon-OC-Monitor/include/sysclk/psm_ext.h b/Source/Horizon-OC-Monitor/include/sysclk/psm_ext.h deleted file mode 100644 index 7065efbc..00000000 --- a/Source/Horizon-OC-Monitor/include/sysclk/psm_ext.h +++ /dev/null @@ -1,77 +0,0 @@ -#pragma once - -#include - -typedef enum { - PsmPDC_NewPDO = 1, //Received new Power Data Object - PsmPDC_NoPD = 2, //No Power Delivery source is detected - PsmPDC_AcceptedRDO = 3 //Received and accepted Request Data Object -} PsmChargeInfoPDC; //BM92T series - -typedef enum { - PsmPowerRole_Sink = 1, - PsmPowerRole_Source = 2 -} PsmPowerRole; - -const char* PsmPowerRoleToStr(PsmPowerRole role); - -typedef enum { - PsmInfoChargerType_None = 0, - PsmInfoChargerType_PD = 1, - PsmInfoChargerType_TypeC_1500mA = 2, - PsmInfoChargerType_TypeC_3000mA = 3, - PsmInfoChargerType_DCP = 4, - PsmInfoChargerType_CDP = 5, - PsmInfoChargerType_SDP = 6, - PsmInfoChargerType_Apple_500mA = 7, - PsmInfoChargerType_Apple_1000mA = 8, - PsmInfoChargerType_Apple_2000mA = 9 -} PsmInfoChargerType; - -const char* PsmInfoChargerTypeToStr(PsmInfoChargerType type); - -typedef enum { - PsmFlags_NoHub = BIT(0), //If hub is disconnected - PsmFlags_Rail = BIT(8), //At least one Joy-con is charging from rail - PsmFlags_SPDSRC = BIT(12), //OTG - PsmFlags_ACC = BIT(16) //Accessory -} PsmChargeInfoFlags; - -typedef struct { - int32_t InputCurrentLimit; //Input (Sink) current limit in mA - int32_t VBUSCurrentLimit; //Output (Source/VBUS/OTG) current limit in mA - int32_t ChargeCurrentLimit; //Battery charging current limit in mA (512mA when Docked, 768mA when BatteryTemperature < 17.0 C) - int32_t ChargeVoltageLimit; //Battery charging voltage limit in mV (3952mV when BatteryTemperature >= 51.0 C) - int32_t unk_x10; //Possibly an emum, getting the same value as PowerRole in all tested cases - int32_t unk_x14; //Possibly flags - PsmChargeInfoPDC PDCState; //Power Delivery Controller State - int32_t BatteryTemperature; //Battery temperature in milli C - int32_t RawBatteryCharge; //Raw battery charged capacity per cent-mille (i.e. 100% = 100000 pcm) - int32_t VoltageAvg; //Voltage avg in mV (more in Notes) - int32_t BatteryAge; //Battery age (capacity full / capacity design) per cent-mille (i.e. 100% = 100000 pcm) - PsmPowerRole PowerRole; - PsmInfoChargerType ChargerType; - int32_t ChargerVoltageLimit; //Charger and external device voltage limit in mV - int32_t ChargerCurrentLimit; //Charger and external device current limit in mA - PsmChargeInfoFlags Flags; //Unknown flags -} PsmChargeInfo; - -typedef enum { - Psm_EnableBatteryCharging = 2, - Psm_DisableBatteryCharging = 3, - Psm_EnableFastBatteryCharging = 10, - Psm_DisableFastBatteryCharging = 11, - Psm_GetBatteryChargeInfoFields = 17, -} IPsmServerCmd; - -bool PsmIsChargerConnected(const PsmChargeInfo* info); -bool PsmIsCharging(const PsmChargeInfo* info); - -typedef enum { - PsmBatteryState_Discharging, - PsmBatteryState_ChargingPaused, - PsmBatteryState_FastCharging -} PsmBatteryState; - -PsmBatteryState PsmGetBatteryState(const PsmChargeInfo* info); -const char* PsmGetBatteryStateIcon(const PsmChargeInfo* info); \ No newline at end of file