diff --git a/CMakeLists.txt b/CMakeLists.txt index 22a68a75..69915a76 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -135,6 +135,7 @@ set(SERVICE_SOURCE_FILES src/core/services/service_manager.cpp src/core/services src/core/services/y2r.cpp src/core/services/cam.cpp src/core/services/ldr_ro.cpp src/core/services/act.cpp src/core/services/nfc.cpp src/core/services/dlp_srvr.cpp src/core/services/ir_user.cpp src/core/services/http.cpp src/core/services/soc.cpp + src/core/services/ssl.cpp ) set(PICA_SOURCE_FILES src/core/PICA/gpu.cpp src/core/PICA/regs.cpp src/core/PICA/shader_unit.cpp src/core/PICA/shader_interpreter.cpp src/core/PICA/dynapica/shader_rec.cpp @@ -175,7 +176,7 @@ set(HEADER_FILES include/emulator.hpp include/helpers.hpp include/termcolor.hpp include/config.hpp include/services/ir_user.hpp include/http_server.hpp include/cheats.hpp include/action_replay.hpp include/renderer_sw/renderer_sw.hpp include/compiler_builtins.hpp include/fs/romfs.hpp include/fs/ivfc.hpp include/discord_rpc.hpp include/services/http.hpp include/result/result_cfg.hpp - include/services/soc.hpp + include/services/soc.hpp include/services/ssl.hpp ) set(THIRD_PARTY_SOURCE_FILES third_party/imgui/imgui.cpp diff --git a/include/kernel/handles.hpp b/include/kernel/handles.hpp index 256ae02b..79524324 100644 --- a/include/kernel/handles.hpp +++ b/include/kernel/handles.hpp @@ -35,6 +35,7 @@ namespace KernelHandles { NDM, // ????? PTM, // PTM service (Used for accessing various console info, such as battery, shell and pedometer state) SOC, // Socket service + SSL, // SSL service (Totally didn't expect that) Y2R, // Also does camera stuff MinServiceHandle = AC, @@ -86,6 +87,7 @@ namespace KernelHandles { case NIM: return "NIM"; case PTM: return "PTM"; case SOC: return "SOC"; + case SSL: return "SSL"; case Y2R: return "Y2R"; default: return "Unknown"; } diff --git a/include/logger.hpp b/include/logger.hpp index 26ecb70f..4048619f 100644 --- a/include/logger.hpp +++ b/include/logger.hpp @@ -54,6 +54,7 @@ namespace Log { static Logger ndmLogger; static Logger ptmLogger; static Logger socLogger; + static Logger sslLogger; static Logger y2rLogger; static Logger srvLogger; diff --git a/include/services/service_manager.hpp b/include/services/service_manager.hpp index 08460cd5..42287bac 100644 --- a/include/services/service_manager.hpp +++ b/include/services/service_manager.hpp @@ -30,6 +30,7 @@ #include "services/nim.hpp" #include "services/ptm.hpp" #include "services/soc.hpp" +#include "services/ssl.hpp" #include "services/y2r.hpp" // More circular dependencies!! @@ -68,6 +69,7 @@ class ServiceManager { NDMService ndm; PTMService ptm; SOCService soc; + SSLService ssl; Y2RService y2r; // "srv:" commands diff --git a/include/services/ssl.hpp b/include/services/ssl.hpp new file mode 100644 index 00000000..7c312e3e --- /dev/null +++ b/include/services/ssl.hpp @@ -0,0 +1,18 @@ +#pragma once +#include "helpers.hpp" +#include "kernel_types.hpp" +#include "logger.hpp" +#include "memory.hpp" + +class SSLService { + Handle handle = KernelHandles::SSL; + Memory& mem; + MAKE_LOG_FUNCTION(log, sslLogger) + + // Service commands + + public: + SSLService(Memory& mem) : mem(mem) {} + void reset(); + void handleSyncRequest(u32 messagePointer); +}; \ No newline at end of file diff --git a/src/core/services/service_manager.cpp b/src/core/services/service_manager.cpp index 56ae6637..ea2c031f 100644 --- a/src/core/services/service_manager.cpp +++ b/src/core/services/service_manager.cpp @@ -9,7 +9,7 @@ ServiceManager::ServiceManager(std::span regs, Memory& mem, GPU& gpu, u : regs(regs), mem(mem), kernel(kernel), ac(mem), am(mem), boss(mem), act(mem), apt(mem, kernel), cam(mem), cecd(mem, kernel), cfg(mem), dlp_srvr(mem), dsp(mem, kernel), hid(mem, kernel), http(mem), ir_user(mem, kernel), frd(mem), fs(mem, kernel), gsp_gpu(mem, gpu, kernel, currentPID), gsp_lcd(mem), ldr(mem), mic(mem), nfc(mem, kernel), nim(mem), ndm(mem), ptm(mem), soc(mem), - y2r(mem, kernel) {} + ssl(mem), y2r(mem, kernel) {} static constexpr int MAX_NOTIFICATION_COUNT = 16; @@ -38,6 +38,7 @@ void ServiceManager::reset() { ndm.reset(); ptm.reset(); soc.reset(); + ssl.reset(); y2r.reset(); notificationSemaphore = std::nullopt; @@ -116,6 +117,7 @@ static std::map serviceMap = { { "ptm:u", KernelHandles::PTM }, // TODO: ptm:u and ptm:sysm have very different command sets { "ptm:sysm", KernelHandles::PTM }, { "soc:U", KernelHandles::SOC }, + { "ssl:C", KernelHandles::SSL }, { "y2r:u", KernelHandles::Y2R } }; // clang-format on @@ -199,6 +201,7 @@ void ServiceManager::sendCommandToService(u32 messagePointer, Handle handle) { case KernelHandles::NDM: ndm.handleSyncRequest(messagePointer); break; case KernelHandles::PTM: ptm.handleSyncRequest(messagePointer); break; case KernelHandles::SOC: soc.handleSyncRequest(messagePointer); break; + case KernelHandles::SSL: ssl.handleSyncRequest(messagePointer); break; case KernelHandles::Y2R: y2r.handleSyncRequest(messagePointer); break; default: Helpers::panic("Sent IPC message to unknown service %08X\n Command: %08X", handle, mem.read32(messagePointer)); } diff --git a/src/core/services/ssl.cpp b/src/core/services/ssl.cpp new file mode 100644 index 00000000..864b3eea --- /dev/null +++ b/src/core/services/ssl.cpp @@ -0,0 +1,17 @@ +#include "ipc.hpp" +#include "result/result.hpp" +#include "services/ssl.hpp" + +namespace SSLCommands { + enum : u32 { + }; +} + +void SSLService::reset() {} + +void SSLService::handleSyncRequest(u32 messagePointer) { + const u32 command = mem.read32(messagePointer); + switch (command) { + default: Helpers::panic("SSL service requested. Command: %08X\n", command); + } +} \ No newline at end of file