From 7d6f296fa09454b2d46ce46be9c712a5ce626652 Mon Sep 17 00:00:00 2001 From: souldbminersmwc Date: Mon, 5 Oct 2026 19:43:36 -0400 Subject: [PATCH] c++ify more stuff --- Source/hoc-clk/sysmodule/src/board/board.cpp | 6 ++--- .../sysmodule/src/board/board_freq.cpp | 6 ++--- .../sysmodule/src/board/board_freq.hpp | 6 ++--- .../sysmodule/src/board/board_load.cpp | 6 ++--- .../sysmodule/src/board/board_profile.cpp | 6 ++--- .../sysmodule/src/board/board_sensor.cpp | 6 ++--- Source/hoc-clk/sysmodule/src/file/config.cpp | 6 ++--- .../hoc-clk/sysmodule/src/file/file_utils.cpp | 6 ++--- .../sysmodule/src/i2c/{i2c.c => i2c.cpp} | 7 +++-- .../sysmodule/src/i2c/{i2c.h => i2c.hpp} | 10 +------ Source/hoc-clk/sysmodule/src/i2c/i2cDrv.cpp | 26 +++++++++---------- .../src/i2c/{max17050.c => max17050.cpp} | 4 +-- .../src/i2c/{max17050.h => max17050.hpp} | 0 .../src/i2c/{tmp451.c => tmp451.cpp} | 21 ++++++++------- .../src/i2c/{tmp451.h => tmp451.hpp} | 12 ++------- .../hoc-clk/sysmodule/src/ipc/ipc_service.cpp | 6 ++--- .../sysmodule/src/mgr/clock_manager.cpp | 2 +- Source/hoc-clk/sysmodule/src/mgr/governor.cpp | 6 ++--- .../hoc-clk/sysmodule/src/tsensor/bq24193.hpp | 2 +- 19 files changed, 67 insertions(+), 77 deletions(-) rename Source/hoc-clk/sysmodule/src/i2c/{i2c.c => i2c.cpp} (90%) rename Source/hoc-clk/sysmodule/src/i2c/{i2c.h => i2c.hpp} (93%) rename Source/hoc-clk/sysmodule/src/i2c/{max17050.c => max17050.cpp} (98%) rename Source/hoc-clk/sysmodule/src/i2c/{max17050.h => max17050.hpp} (100%) rename Source/hoc-clk/sysmodule/src/i2c/{tmp451.c => tmp451.cpp} (83%) rename Source/hoc-clk/sysmodule/src/i2c/{tmp451.h => tmp451.hpp} (93%) diff --git a/Source/hoc-clk/sysmodule/src/board/board.cpp b/Source/hoc-clk/sysmodule/src/board/board.cpp index 54530d7f..1d691252 100644 --- a/Source/hoc-clk/sysmodule/src/board/board.cpp +++ b/Source/hoc-clk/sysmodule/src/board/board.cpp @@ -26,13 +26,13 @@ #include #include -#include -#include +#include +#include #include #include #include #include -#include +#include #include "../display/display_refresh_rate.hpp" #include "../file/file_utils.hpp" diff --git a/Source/hoc-clk/sysmodule/src/board/board_freq.cpp b/Source/hoc-clk/sysmodule/src/board/board_freq.cpp index 780d67fb..5ed302ce 100644 --- a/Source/hoc-clk/sysmodule/src/board/board_freq.cpp +++ b/Source/hoc-clk/sysmodule/src/board/board_freq.cpp @@ -25,11 +25,11 @@ */ #include -#include -#include +#include +#include #include #include -#include +#include #include "../display/display_refresh_rate.hpp" #include "../file/config.hpp" diff --git a/Source/hoc-clk/sysmodule/src/board/board_freq.hpp b/Source/hoc-clk/sysmodule/src/board/board_freq.hpp index 0b21a9c6..eaa3d0c7 100644 --- a/Source/hoc-clk/sysmodule/src/board/board_freq.hpp +++ b/Source/hoc-clk/sysmodule/src/board/board_freq.hpp @@ -26,10 +26,10 @@ #pragma once #include -#include -#include +#include +#include #include -#include +#include #include "../file/errors.hpp" #include "../hos/apm_ext.h" diff --git a/Source/hoc-clk/sysmodule/src/board/board_load.cpp b/Source/hoc-clk/sysmodule/src/board/board_load.cpp index bf7a2dec..13f5c9a3 100644 --- a/Source/hoc-clk/sysmodule/src/board/board_load.cpp +++ b/Source/hoc-clk/sysmodule/src/board/board_load.cpp @@ -27,14 +27,14 @@ #include #include #include -#include +#include #include -#include +#include #include #include #include #include -#include +#include #include #include "../hos/apm_ext.h" diff --git a/Source/hoc-clk/sysmodule/src/board/board_profile.cpp b/Source/hoc-clk/sysmodule/src/board/board_profile.cpp index 38818877..8f9ef7a3 100644 --- a/Source/hoc-clk/sysmodule/src/board/board_profile.cpp +++ b/Source/hoc-clk/sysmodule/src/board/board_profile.cpp @@ -25,10 +25,10 @@ */ #include -#include -#include +#include +#include #include -#include +#include #include "../hos/apm_ext.h" #include "board.hpp" diff --git a/Source/hoc-clk/sysmodule/src/board/board_sensor.cpp b/Source/hoc-clk/sysmodule/src/board/board_sensor.cpp index fe9f44a3..c3f0c4e7 100644 --- a/Source/hoc-clk/sysmodule/src/board/board_sensor.cpp +++ b/Source/hoc-clk/sysmodule/src/board/board_sensor.cpp @@ -27,11 +27,11 @@ #include #include #include -#include -#include +#include +#include #include #include -#include +#include #include "../file/config.hpp" #include "../hos/apm_ext.h" diff --git a/Source/hoc-clk/sysmodule/src/file/config.cpp b/Source/hoc-clk/sysmodule/src/file/config.cpp index a10861f6..9e504d8a 100644 --- a/Source/hoc-clk/sysmodule/src/file/config.cpp +++ b/Source/hoc-clk/sysmodule/src/file/config.cpp @@ -29,13 +29,13 @@ #include #include #include -#include +#include #include -#include +#include #include #include #include -#include +#include #include #include "../board/board.hpp" diff --git a/Source/hoc-clk/sysmodule/src/file/file_utils.cpp b/Source/hoc-clk/sysmodule/src/file/file_utils.cpp index 3beab7ca..754b26e2 100644 --- a/Source/hoc-clk/sysmodule/src/file/file_utils.cpp +++ b/Source/hoc-clk/sysmodule/src/file/file_utils.cpp @@ -24,9 +24,9 @@ * -------------------------------------------------------------------------- */ -#include -#include -#include +#include +#include +#include #include "../hos/apm_ext.h" #include "file_utils.hpp" diff --git a/Source/hoc-clk/sysmodule/src/i2c/i2c.c b/Source/hoc-clk/sysmodule/src/i2c/i2c.cpp similarity index 90% rename from Source/hoc-clk/sysmodule/src/i2c/i2c.c rename to Source/hoc-clk/sysmodule/src/i2c/i2c.cpp index cfdeb177..42564897 100644 --- a/Source/hoc-clk/sysmodule/src/i2c/i2c.c +++ b/Source/hoc-clk/sysmodule/src/i2c/i2c.cpp @@ -24,7 +24,10 @@ * -------------------------------------------------------------------------- */ -#include "i2c.h" +#include "i2c.hpp" +#include + +using namespace nx; #define I2C_CMD_SND 0 #define I2C_CMD_RCV 1 @@ -34,5 +37,5 @@ Result i2csessionExtRegReceive(I2cSession *s, u8 in, void *out, u8 out_size) { I2C_CMD_RCV | (I2cTransactionOption_All << 6), out_size }; - return i2csessionExecuteCommandList(s, out, out_size, cmdlist, sizeof(cmdlist)); + return i2csession::ExecuteCommandList(s, out, out_size, cmdlist, sizeof(cmdlist)); } diff --git a/Source/hoc-clk/sysmodule/src/i2c/i2c.h b/Source/hoc-clk/sysmodule/src/i2c/i2c.hpp similarity index 93% rename from Source/hoc-clk/sysmodule/src/i2c/i2c.h rename to Source/hoc-clk/sysmodule/src/i2c/i2c.hpp index 91a099de..75a41f0f 100644 --- a/Source/hoc-clk/sysmodule/src/i2c/i2c.h +++ b/Source/hoc-clk/sysmodule/src/i2c/i2c.hpp @@ -25,15 +25,7 @@ */ #pragma once - -#ifdef __cplusplus -extern "C" { -#endif - -#include +#include Result i2csessionExtRegReceive(I2cSession *s, u8 in, void *out, u8 out_size); -#ifdef __cplusplus -} -#endif diff --git a/Source/hoc-clk/sysmodule/src/i2c/i2cDrv.cpp b/Source/hoc-clk/sysmodule/src/i2c/i2cDrv.cpp index 31616197..9843d7b8 100644 --- a/Source/hoc-clk/sysmodule/src/i2c/i2cDrv.cpp +++ b/Source/hoc-clk/sysmodule/src/i2c/i2cDrv.cpp @@ -28,14 +28,14 @@ Result I2cSet_U8(I2cDevice dev, u8 reg, u8 val) { } __attribute__((packed)) cmd; I2cSession _session; - Result res = i2cOpenSession(&_session, dev); + Result res = i2c::OpenSession(&_session, dev); if (res) return res; cmd.reg = reg; cmd.val = val; - res = i2csessionSendAuto(&_session, &cmd, sizeof(cmd), I2cTransactionOption_All); - i2csessionClose(&_session); + res = i2csession::SendAuto(&_session, &cmd, sizeof(cmd), I2cTransactionOption_All); + i2csession::Close(&_session); return res; } @@ -48,19 +48,19 @@ Result I2cRead_OutU8(I2cDevice dev, u8 reg, u8 *out) { } __attribute__((packed)) rec; I2cSession _session; - Result res = i2cOpenSession(&_session, dev); + Result res = i2c::OpenSession(&_session, dev); if (res) return res; cmd.reg = reg; - res = i2csessionSendAuto(&_session, &cmd, sizeof(cmd), I2cTransactionOption_All); + res = i2csession::SendAuto(&_session, &cmd, sizeof(cmd), I2cTransactionOption_All); if (res) { - i2csessionClose(&_session); + i2csession::Close(&_session); return res; } - res = i2csessionReceiveAuto(&_session, &rec, sizeof(rec), I2cTransactionOption_All); - i2csessionClose(&_session); + res = i2csession::ReceiveAuto(&_session, &rec, sizeof(rec), I2cTransactionOption_All); + i2csession::Close(&_session); if (res) { return res; } @@ -78,19 +78,19 @@ Result I2cRead_OutU16(I2cDevice dev, u8 reg, u16 *out) { } __attribute__((packed)) rec; I2cSession _session; - Result res = i2cOpenSession(&_session, dev); + Result res = i2c::OpenSession(&_session, dev); if (res) return res; cmd.reg = reg; - res = i2csessionSendAuto(&_session, &cmd, sizeof(cmd), I2cTransactionOption_All); + res = i2csession::SendAuto(&_session, &cmd, sizeof(cmd), I2cTransactionOption_All); if (res) { - i2csessionClose(&_session); + i2csession::Close(&_session); return res; } - res = i2csessionReceiveAuto(&_session, &rec, sizeof(rec), I2cTransactionOption_All); - i2csessionClose(&_session); + res = i2csession::ReceiveAuto(&_session, &rec, sizeof(rec), I2cTransactionOption_All); + i2csession::Close(&_session); if (res) { return res; } diff --git a/Source/hoc-clk/sysmodule/src/i2c/max17050.c b/Source/hoc-clk/sysmodule/src/i2c/max17050.cpp similarity index 98% rename from Source/hoc-clk/sysmodule/src/i2c/max17050.c rename to Source/hoc-clk/sysmodule/src/i2c/max17050.cpp index 8f82c14c..df89c3fa 100644 --- a/Source/hoc-clk/sysmodule/src/i2c/max17050.c +++ b/Source/hoc-clk/sysmodule/src/i2c/max17050.cpp @@ -22,8 +22,8 @@ * */ -#include "i2c.h" -#include "max17050.h" +#include "i2c.hpp" +#include "max17050.hpp" #define MAX17050_WAIT_NS 1000000000UL diff --git a/Source/hoc-clk/sysmodule/src/i2c/max17050.h b/Source/hoc-clk/sysmodule/src/i2c/max17050.hpp similarity index 100% rename from Source/hoc-clk/sysmodule/src/i2c/max17050.h rename to Source/hoc-clk/sysmodule/src/i2c/max17050.hpp diff --git a/Source/hoc-clk/sysmodule/src/i2c/tmp451.c b/Source/hoc-clk/sysmodule/src/i2c/tmp451.cpp similarity index 83% rename from Source/hoc-clk/sysmodule/src/i2c/tmp451.c rename to Source/hoc-clk/sysmodule/src/i2c/tmp451.cpp index e82383b4..ab0bb546 100644 --- a/Source/hoc-clk/sysmodule/src/i2c/tmp451.c +++ b/Source/hoc-clk/sysmodule/src/i2c/tmp451.cpp @@ -17,8 +17,11 @@ * along with this program. If not, see . */ -#include "i2c.h" -#include "tmp451.h" +#include "i2c.hpp" +#include "tmp451.hpp" +#include + +using namespace nx; #define TMP451_WAIT_NS 1000000000UL @@ -50,14 +53,14 @@ static Result _tmp451_get_temp(u8 reg, u8 dec_reg, s32 *out) { } static void _tmp451_update() { - u64 ticks = armGetSystemTick(); - if (armTicksToNs(ticks - g_update_ticks) <= TMP451_WAIT_NS) { + u64 ticks = arm::GetSystemTick(); + if (arm::TicksToNs(ticks - g_update_ticks) <= TMP451_WAIT_NS) { return; } g_update_ticks = ticks; - if (!serviceIsActive(&g_i2c_session.s)) { + if (!service::IsActive(&g_i2c_session.s)) { return; } @@ -66,18 +69,18 @@ static void _tmp451_update() { } Result tmp451Initialize(void) { - Result rc = i2cInitialize(); + Result rc = i2c::Initialize(); if (R_SUCCEEDED(rc)) { - rc = i2cOpenSession(&g_i2c_session, I2cDevice_Tmp451); + rc = i2c::OpenSession(&g_i2c_session, I2cDevice_Tmp451); } return rc; } void tmp451Exit(void) { - i2csessionClose(&g_i2c_session); - i2cExit(); + i2csession::Close(&g_i2c_session); + i2c::Exit(); } s32 tmp451TempPcb(void) { diff --git a/Source/hoc-clk/sysmodule/src/i2c/tmp451.h b/Source/hoc-clk/sysmodule/src/i2c/tmp451.hpp similarity index 93% rename from Source/hoc-clk/sysmodule/src/i2c/tmp451.h rename to Source/hoc-clk/sysmodule/src/i2c/tmp451.hpp index 7872b59e..e61d3329 100644 --- a/Source/hoc-clk/sysmodule/src/i2c/tmp451.h +++ b/Source/hoc-clk/sysmodule/src/i2c/tmp451.hpp @@ -26,17 +26,9 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - -#include - +#include +using namespace nx; Result tmp451Initialize(void); void tmp451Exit(void); s32 tmp451TempPcb(void); s32 tmp451TempSoc(void); - -#ifdef __cplusplus -} -#endif diff --git a/Source/hoc-clk/sysmodule/src/ipc/ipc_service.cpp b/Source/hoc-clk/sysmodule/src/ipc/ipc_service.cpp index 4d6f9ca9..feffcf81 100644 --- a/Source/hoc-clk/sysmodule/src/ipc/ipc_service.cpp +++ b/Source/hoc-clk/sysmodule/src/ipc/ipc_service.cpp @@ -25,11 +25,11 @@ */ #include -#include -#include +#include +#include #include #include -#include +#include #include "../file/config.hpp" #include "../file/errors.hpp" diff --git a/Source/hoc-clk/sysmodule/src/mgr/clock_manager.cpp b/Source/hoc-clk/sysmodule/src/mgr/clock_manager.cpp index 14f0bfb6..d6942317 100644 --- a/Source/hoc-clk/sysmodule/src/mgr/clock_manager.cpp +++ b/Source/hoc-clk/sysmodule/src/mgr/clock_manager.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include "../board/board.hpp" #include "../display/aula.hpp" diff --git a/Source/hoc-clk/sysmodule/src/mgr/governor.cpp b/Source/hoc-clk/sysmodule/src/mgr/governor.cpp index 05cf88e5..cb0900a1 100644 --- a/Source/hoc-clk/sysmodule/src/mgr/governor.cpp +++ b/Source/hoc-clk/sysmodule/src/mgr/governor.cpp @@ -316,11 +316,11 @@ namespace mgr { } void StartThreads() { - threadCreate(&governorTHREAD, GovernorThread, nullptr, NULL, 0x2000, 0x3F, -2); - threadStart(&governorTHREAD); + thread::Create(&governorTHREAD, GovernorThread, nullptr, NULL, 0x2000, 0x3F, -2); + thread::Start(&governorTHREAD); } void ExitThreads() { - threadClose(&governorTHREAD); + thread::Close(&governorTHREAD); } } // namespace mgr diff --git a/Source/hoc-clk/sysmodule/src/tsensor/bq24193.hpp b/Source/hoc-clk/sysmodule/src/tsensor/bq24193.hpp index 23b41fa7..c1520e1a 100644 --- a/Source/hoc-clk/sysmodule/src/tsensor/bq24193.hpp +++ b/Source/hoc-clk/sysmodule/src/tsensor/bq24193.hpp @@ -17,7 +17,7 @@ * */ -#include +#include #include "../board/board.hpp" #include "../i2c/i2cDrv.h"