From 9a6640cae2739b3d878d443c2a1a6fe8a3bd62b9 Mon Sep 17 00:00:00 2001 From: wheremyfoodat Date: Mon, 13 Mar 2023 00:01:10 +0200 Subject: [PATCH] [Y2R] Add service skeleton --- CMakeLists.txt | 3 ++- include/kernel/handles.hpp | 4 +++- include/services/service_manager.hpp | 2 ++ include/services/y2r.hpp | 18 ++++++++++++++++++ src/core/services/service_manager.cpp | 6 +++++- src/core/services/y2r.cpp | 21 +++++++++++++++++++++ 6 files changed, 51 insertions(+), 3 deletions(-) create mode 100644 include/services/y2r.hpp create mode 100644 src/core/services/y2r.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index e3009c1f..dea89282 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -60,6 +60,7 @@ set(SERVICE_SOURCE_FILES src/core/services/service_manager.cpp src/core/services src/core/services/ptm.cpp src/core/services/mic.cpp src/core/services/cecd.cpp src/core/services/ac.cpp src/core/services/am.cpp src/core/services/boss.cpp src/core/services/frd.cpp src/core/services/nim.cpp src/core/services/shared_font.cpp + src/core/services/y2r.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 @@ -87,7 +88,7 @@ set(HEADER_FILES include/emulator.hpp include/helpers.hpp include/opengl.hpp inc include/renderer_gl/surfaces.hpp include/renderer_gl/surface_cache.hpp include/services/ac.hpp include/services/am.hpp include/services/boss.hpp include/services/frd.hpp include/services/nim.hpp include/fs/archive_ext_save_data.hpp include/services/shared_font.hpp include/fs/archive_ncch.hpp - include/renderer_gl/textures.hpp include/colour.hpp + include/renderer_gl/textures.hpp include/colour.hpp include/services/y2r.hpp ) set(THIRD_PARTY_SOURCE_FILES third_party/imgui/imgui.cpp diff --git a/include/kernel/handles.hpp b/include/kernel/handles.hpp index f0ded503..e8cc19bd 100644 --- a/include/kernel/handles.hpp +++ b/include/kernel/handles.hpp @@ -26,9 +26,10 @@ namespace KernelHandles { NIM, // Updates, DLC, etc NDM, // ????? PTM, // PTM service (Used for accessing various console info, such as battery, shell and pedometer state) + Y2R, MinServiceHandle = AC, - MaxServiceHandle = PTM, + MaxServiceHandle = Y2R, GSPSharedMemHandle = MaxServiceHandle + 1, // Handle for the GSP shared memory FontSharedMemHandle, @@ -73,6 +74,7 @@ namespace KernelHandles { case NDM: return "NDM"; case NIM: return "NIM"; case PTM: return "PTM"; + case Y2R: return "Y2R"; default: return "Unknown"; } } diff --git a/include/services/service_manager.hpp b/include/services/service_manager.hpp index 5f119342..89931d7c 100644 --- a/include/services/service_manager.hpp +++ b/include/services/service_manager.hpp @@ -20,6 +20,7 @@ #include "services/nim.hpp" #include "services/ndm.hpp" #include "services/ptm.hpp" +#include "services/y2r.hpp" // More circular dependencies!! class Kernel; @@ -49,6 +50,7 @@ class ServiceManager { NIMService nim; NDMService ndm; PTMService ptm; + Y2RService y2r; // "srv:" commands void enableNotification(u32 messagePointer); diff --git a/include/services/y2r.hpp b/include/services/y2r.hpp new file mode 100644 index 00000000..ecb21ce4 --- /dev/null +++ b/include/services/y2r.hpp @@ -0,0 +1,18 @@ +#pragma once +#include "helpers.hpp" +#include "kernel_types.hpp" +#include "logger.hpp" +#include "memory.hpp" + +class Y2RService { + Handle handle = KernelHandles::Y2R; + Memory& mem; + MAKE_LOG_FUNCTION(log, y2rLogger) + + // Service commands + +public: + Y2RService(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 c960f461..dd180926 100644 --- a/src/core/services/service_manager.cpp +++ b/src/core/services/service_manager.cpp @@ -4,7 +4,7 @@ ServiceManager::ServiceManager(std::array& regs, Memory& mem, GPU& gpu, u32& currentPID, Kernel& kernel) : regs(regs), mem(mem), kernel(kernel), ac(mem), am(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), - nim(mem), ndm(mem), ptm(mem) {} + nim(mem), ndm(mem), ptm(mem), y2r(mem) {} static constexpr int MAX_NOTIFICATION_COUNT = 16; @@ -26,6 +26,7 @@ void ServiceManager::reset() { nim.reset(); ndm.reset(); ptm.reset(); + y2r.reset(); notificationSemaphore = std::nullopt; } @@ -123,6 +124,8 @@ void ServiceManager::getServiceHandle(u32 messagePointer) { handle = KernelHandles::NIM; } else if (service == "ptm:u") { handle = KernelHandles::PTM; + } else if (service == "y2r:u") { + handle = KernelHandles::Y2R; } else { Helpers::panic("srv: GetServiceHandle with unknown service %s", service.c_str()); } @@ -177,6 +180,7 @@ void ServiceManager::sendCommandToService(u32 messagePointer, Handle handle) { case KernelHandles::NIM: nim.handleSyncRequest(messagePointer); break; case KernelHandles::NDM: ndm.handleSyncRequest(messagePointer); break; case KernelHandles::PTM: ptm.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)); } } \ No newline at end of file diff --git a/src/core/services/y2r.cpp b/src/core/services/y2r.cpp new file mode 100644 index 00000000..5d990f30 --- /dev/null +++ b/src/core/services/y2r.cpp @@ -0,0 +1,21 @@ +#include "services/y2r.hpp" + +namespace Y2RCommands { + enum : u32 { + }; +} + +namespace Result { + enum : u32 { + Success = 0, + }; +} + +void Y2RService::reset() {} + +void Y2RService::handleSyncRequest(u32 messagePointer) { + const u32 command = mem.read32(messagePointer); + switch (command) { + default: Helpers::panic("Y2R service requested. Command: %08X\n", command); + } +} \ No newline at end of file