mirror of
https://github.com/wheremyfoodat/Panda3DS.git
synced 2025-04-12 09:09:47 +12:00
[Y2R] Add service skeleton
This commit is contained in:
parent
38fde0f608
commit
9a6640cae2
6 changed files with 51 additions and 3 deletions
|
@ -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/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/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/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
|
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/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/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/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/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
|
set(THIRD_PARTY_SOURCE_FILES third_party/imgui/imgui.cpp
|
||||||
|
|
|
@ -26,9 +26,10 @@ namespace KernelHandles {
|
||||||
NIM, // Updates, DLC, etc
|
NIM, // Updates, DLC, etc
|
||||||
NDM, // ?????
|
NDM, // ?????
|
||||||
PTM, // PTM service (Used for accessing various console info, such as battery, shell and pedometer state)
|
PTM, // PTM service (Used for accessing various console info, such as battery, shell and pedometer state)
|
||||||
|
Y2R,
|
||||||
|
|
||||||
MinServiceHandle = AC,
|
MinServiceHandle = AC,
|
||||||
MaxServiceHandle = PTM,
|
MaxServiceHandle = Y2R,
|
||||||
|
|
||||||
GSPSharedMemHandle = MaxServiceHandle + 1, // Handle for the GSP shared memory
|
GSPSharedMemHandle = MaxServiceHandle + 1, // Handle for the GSP shared memory
|
||||||
FontSharedMemHandle,
|
FontSharedMemHandle,
|
||||||
|
@ -73,6 +74,7 @@ namespace KernelHandles {
|
||||||
case NDM: return "NDM";
|
case NDM: return "NDM";
|
||||||
case NIM: return "NIM";
|
case NIM: return "NIM";
|
||||||
case PTM: return "PTM";
|
case PTM: return "PTM";
|
||||||
|
case Y2R: return "Y2R";
|
||||||
default: return "Unknown";
|
default: return "Unknown";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,6 +20,7 @@
|
||||||
#include "services/nim.hpp"
|
#include "services/nim.hpp"
|
||||||
#include "services/ndm.hpp"
|
#include "services/ndm.hpp"
|
||||||
#include "services/ptm.hpp"
|
#include "services/ptm.hpp"
|
||||||
|
#include "services/y2r.hpp"
|
||||||
|
|
||||||
// More circular dependencies!!
|
// More circular dependencies!!
|
||||||
class Kernel;
|
class Kernel;
|
||||||
|
@ -49,6 +50,7 @@ class ServiceManager {
|
||||||
NIMService nim;
|
NIMService nim;
|
||||||
NDMService ndm;
|
NDMService ndm;
|
||||||
PTMService ptm;
|
PTMService ptm;
|
||||||
|
Y2RService y2r;
|
||||||
|
|
||||||
// "srv:" commands
|
// "srv:" commands
|
||||||
void enableNotification(u32 messagePointer);
|
void enableNotification(u32 messagePointer);
|
||||||
|
|
18
include/services/y2r.hpp
Normal file
18
include/services/y2r.hpp
Normal file
|
@ -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);
|
||||||
|
};
|
|
@ -4,7 +4,7 @@
|
||||||
ServiceManager::ServiceManager(std::array<u32, 16>& regs, Memory& mem, GPU& gpu, u32& currentPID, Kernel& kernel)
|
ServiceManager::ServiceManager(std::array<u32, 16>& 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),
|
: 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),
|
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;
|
static constexpr int MAX_NOTIFICATION_COUNT = 16;
|
||||||
|
|
||||||
|
@ -26,6 +26,7 @@ void ServiceManager::reset() {
|
||||||
nim.reset();
|
nim.reset();
|
||||||
ndm.reset();
|
ndm.reset();
|
||||||
ptm.reset();
|
ptm.reset();
|
||||||
|
y2r.reset();
|
||||||
|
|
||||||
notificationSemaphore = std::nullopt;
|
notificationSemaphore = std::nullopt;
|
||||||
}
|
}
|
||||||
|
@ -123,6 +124,8 @@ void ServiceManager::getServiceHandle(u32 messagePointer) {
|
||||||
handle = KernelHandles::NIM;
|
handle = KernelHandles::NIM;
|
||||||
} else if (service == "ptm:u") {
|
} else if (service == "ptm:u") {
|
||||||
handle = KernelHandles::PTM;
|
handle = KernelHandles::PTM;
|
||||||
|
} else if (service == "y2r:u") {
|
||||||
|
handle = KernelHandles::Y2R;
|
||||||
} else {
|
} else {
|
||||||
Helpers::panic("srv: GetServiceHandle with unknown service %s", service.c_str());
|
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::NIM: nim.handleSyncRequest(messagePointer); break;
|
||||||
case KernelHandles::NDM: ndm.handleSyncRequest(messagePointer); break;
|
case KernelHandles::NDM: ndm.handleSyncRequest(messagePointer); break;
|
||||||
case KernelHandles::PTM: ptm.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));
|
default: Helpers::panic("Sent IPC message to unknown service %08X\n Command: %08X", handle, mem.read32(messagePointer));
|
||||||
}
|
}
|
||||||
}
|
}
|
21
src/core/services/y2r.cpp
Normal file
21
src/core/services/y2r.cpp
Normal file
|
@ -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);
|
||||||
|
}
|
||||||
|
}
|
Loading…
Add table
Reference in a new issue