From f965dea916e064816d9cc23b1127b3c61756304a Mon Sep 17 00:00:00 2001 From: wheremyfoodat Date: Fri, 6 Jan 2023 02:40:45 +0200 Subject: [PATCH] Add BOSS service --- CMakeLists.txt | 4 ++-- include/kernel/handles.hpp | 3 ++- include/logger.hpp | 1 + include/services/boss.hpp | 19 ++++++++++++++++++ include/services/service_manager.hpp | 2 ++ src/core/services/boss.cpp | 28 +++++++++++++++++++++++++++ src/core/services/service_manager.cpp | 8 ++++++-- 7 files changed, 60 insertions(+), 5 deletions(-) create mode 100644 include/services/boss.hpp create mode 100644 src/core/services/boss.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 77bd20b3..0466a643 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,7 +58,7 @@ set(SERVICE_SOURCE_FILES src/core/services/service_manager.cpp src/core/services src/core/services/fs.cpp src/core/services/gsp_gpu.cpp src/core/services/gsp_lcd.cpp src/core/services/ndm.cpp src/core/services/dsp.cpp src/core/services/cfg.cpp src/core/services/ptm.cpp src/core/services/mic.cpp src/core/services/cecd.cpp - src/core/services/ac.cpp src/core/services/frd.cpp + src/core/services/ac.cpp src/core/services/boss.cpp src/core/services/frd.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 @@ -82,7 +82,7 @@ set(HEADER_FILES include/emulator.hpp include/helpers.hpp include/opengl.hpp inc include/fs/archive_save_data.hpp include/fs/archive_sdmc.hpp include/services/ptm.hpp include/services/mic.hpp include/services/cecd.hpp include/renderer_gl/renderer_gl.hpp include/renderer_gl/surfaces.hpp include/renderer_gl/surface_cache.hpp include/services/ac.hpp - include/services/frd.hpp + include/services/boss.hpp include/services/frd.hpp ) set(THIRD_PARTY_SOURCE_FILES third_party/imgui/imgui.cpp diff --git a/include/kernel/handles.hpp b/include/kernel/handles.hpp index 2bcc3d57..7735cacf 100644 --- a/include/kernel/handles.hpp +++ b/include/kernel/handles.hpp @@ -12,7 +12,8 @@ namespace KernelHandles { CurrentProcess = 0xFFFF8001, // Used by the original kernel AC, // Something network related APT, // App Title something service? - CECD, // Streetpass stuff? + BOSS, // Streetpass stuff? + CECD, // More Streetpass stuff? CFG, // CFG service (Console & region info) HID, // HID service (Handles everything input-related including gyro) FRD, // Friend service (Miiverse friend service) diff --git a/include/logger.hpp b/include/logger.hpp index f83aaace..8d6b406a 100644 --- a/include/logger.hpp +++ b/include/logger.hpp @@ -30,6 +30,7 @@ namespace Log { // Service loggers static Logger acLogger; static Logger aptLogger; + static Logger bossLogger; static Logger cecdLogger; static Logger cfgLogger; static Logger dspServiceLogger; diff --git a/include/services/boss.hpp b/include/services/boss.hpp new file mode 100644 index 00000000..87a72c9f --- /dev/null +++ b/include/services/boss.hpp @@ -0,0 +1,19 @@ +#pragma once +#include "helpers.hpp" +#include "kernel_types.hpp" +#include "logger.hpp" +#include "memory.hpp" + +class BOSSService { + Handle handle = KernelHandles::BOSS; + Memory& mem; + MAKE_LOG_FUNCTION(log, bossLogger) + + // Service commands + void initializeSession(u32 messagePointer); + +public: + BOSSService(Memory& mem) : mem(mem) {} + void reset(); + void handleSyncRequest(u32 messagePointer); +}; \ No newline at end of file diff --git a/include/services/service_manager.hpp b/include/services/service_manager.hpp index 6b2326d4..261ef9e8 100644 --- a/include/services/service_manager.hpp +++ b/include/services/service_manager.hpp @@ -6,6 +6,7 @@ #include "memory.hpp" #include "services/ac.hpp" #include "services/apt.hpp" +#include "services/boss.hpp" #include "services/cecd.hpp" #include "services/cfg.hpp" #include "services/dsp.hpp" @@ -32,6 +33,7 @@ class ServiceManager { ACService ac; APTService apt; + BOSSService boss; CECDService cecd; CFGService cfg; DSPService dsp; diff --git a/src/core/services/boss.cpp b/src/core/services/boss.cpp new file mode 100644 index 00000000..fb5053f7 --- /dev/null +++ b/src/core/services/boss.cpp @@ -0,0 +1,28 @@ +#include "services/boss.hpp" + +namespace BOSSCommands { + enum : u32 { + InitializeSession = 0x00010082 + }; +} + +namespace Result { + enum : u32 { + Success = 0, + }; +} + +void BOSSService::reset() {} + +void BOSSService::handleSyncRequest(u32 messagePointer) { + const u32 command = mem.read32(messagePointer); + switch (command) { + case BOSSCommands::InitializeSession: initializeSession(messagePointer); break; + default: Helpers::panic("BOSS service requested. Command: %08X\n", command); + } +} + +void BOSSService::initializeSession(u32 messagePointer) { + log("BOSS::InitializeSession (stubbed)\n"); + mem.write32(messagePointer + 4, Result::Success); +} \ No newline at end of file diff --git a/src/core/services/service_manager.cpp b/src/core/services/service_manager.cpp index 4dd44d58..c9ec66b7 100644 --- a/src/core/services/service_manager.cpp +++ b/src/core/services/service_manager.cpp @@ -2,14 +2,15 @@ #include "kernel.hpp" ServiceManager::ServiceManager(std::array& regs, Memory& mem, GPU& gpu, u32& currentPID, Kernel& kernel) - : regs(regs), mem(mem), kernel(kernel), ac(mem), apt(mem, kernel), cecd(mem), cfg(mem), dsp(mem), hid(mem), - frd(mem), fs(mem, kernel), gsp_gpu(mem, gpu, currentPID), gsp_lcd(mem), mic(mem), ndm(mem), ptm(mem) {} + : regs(regs), mem(mem), kernel(kernel), ac(mem), boss(mem), apt(mem, kernel), cecd(mem), cfg(mem), dsp(mem), + hid(mem), frd(mem), fs(mem, kernel), gsp_gpu(mem, gpu, currentPID), gsp_lcd(mem), mic(mem), ndm(mem), ptm(mem) {} static constexpr int MAX_NOTIFICATION_COUNT = 16; void ServiceManager::reset() { ac.reset(); apt.reset(); + boss.reset(); cecd.reset(); cfg.reset(); dsp.reset(); @@ -90,6 +91,8 @@ void ServiceManager::getServiceHandle(u32 messagePointer) { handle = KernelHandles::APT; } else if (service == "APT:U") { handle = KernelHandles::APT; + } else if (service == "boss:U") { + handle = KernelHandles::BOSS; } else if (service == "cecd:u") { handle = KernelHandles::CECD; } else if (service == "cfg:u") { @@ -152,6 +155,7 @@ void ServiceManager::sendCommandToService(u32 messagePointer, Handle handle) { switch (handle) { case KernelHandles::AC: ac.handleSyncRequest(messagePointer); break; case KernelHandles::APT: apt.handleSyncRequest(messagePointer); break; + case KernelHandles::BOSS: boss.handleSyncRequest(messagePointer); break; case KernelHandles::CECD: cecd.handleSyncRequest(messagePointer); break; case KernelHandles::CFG: cfg.handleSyncRequest(messagePointer); break; case KernelHandles::DSP: dsp.handleSyncRequest(messagePointer); break;