Diamond75/Panda3DS
1
0
Fork 0
mirror of https://github.com/wheremyfoodat/Panda3DS.git synced 2025-04-11 00:25:41 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #274 from wheremyfoodat/SystemSaveData

Browse source 
Split PTM service types
This commit is contained in:
wheremyfoodat 2023-09-14 17:37:12 +03:00 • committed by GitHub
commit 61bfd3d5ab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 62 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/kernel/handles.hpp
View file

@ -38,7 +38,9 @@ namespace KernelHandles {
NDM, // ????? NDM, // ?????
NWM_UDS, // Local multiplayer NWM_UDS, // Local multiplayer
NEWS_U, // This service literally has 1 command (AddNotification) and I don't even understand what it does NEWS_U, // This service literally has 1 command (AddNotification) and I don't even understand what it does
PTM, // PTM service (Used for accessing various console info, such as battery, shell and pedometer state) PTM_U, // PTM service (Used for accessing various console info, such as battery, shell and pedometer state)
PTM_SYSM, // PTM system service
PTM_PLAY, // PTM Play service, ues for retrieving play history
SOC, // Socket service SOC, // Socket service
SSL, // SSL service (Totally didn't expect that) SSL, // SSL service (Totally didn't expect that)
Y2R, // Also does camera stuff Y2R, // Also does camera stuff
@ -96,7 +98,9 @@ namespace KernelHandles {
case NWM_UDS: return "nwm::UDS"; case NWM_UDS: return "nwm::UDS";
case NFC: return "NFC"; case NFC: return "NFC";
case NIM: return "NIM"; case NIM: return "NIM";
case PTM: return "PTM"; case PTM_U: return "PTM:U";
case PTM_SYSM: return "PTM:SYSM";
case PTM_PLAY: return "PTM:PLAY";
case SOC: return "SOC"; case SOC: return "SOC";
case SSL: return "SSL"; case SSL: return "SSL";
case Y2R: return "Y2R"; case Y2R: return "Y2R";

10
include/services/ptm.hpp
View file

@ -7,7 +7,6 @@
#include "result/result.hpp" #include "result/result.hpp"
class PTMService { class PTMService {
Handle handle = KernelHandles::PTM;
Memory& mem; Memory& mem;
MAKE_LOG_FUNCTION(log, ptmLogger) MAKE_LOG_FUNCTION(log, ptmLogger)
@ -19,12 +18,19 @@ class PTMService {
void getBatteryChargeState(u32 messagePointer); void getBatteryChargeState(u32 messagePointer);
void getBatteryLevel(u32 messagePointer); void getBatteryLevel(u32 messagePointer);
void getStepHistory(u32 messagePointer); void getStepHistory(u32 messagePointer);
void getStepHistoryAll(u32 messagePointer);
void getTotalStepCount(u32 messagePointer); void getTotalStepCount(u32 messagePointer);
public: public:
enum class Type {
U, // ptm:u
SYSM, // ptm:sysm
PLAY, // ptm:play
};
PTMService(Memory& mem, const EmulatorConfig& config) : mem(mem), config(config) {} PTMService(Memory& mem, const EmulatorConfig& config) : mem(mem), config(config) {}
void reset(); void reset();
void handleSyncRequest(u32 messagePointer); void handleSyncRequest(u32 messagePointer, Type type);
// 0% -> 0 (shutting down) // 0% -> 0 (shutting down)
// 1-5% -> 1 // 1-5% -> 1

51
src/core/services/ptm.cpp
View file

@ -8,23 +8,50 @@ namespace PTMCommands {
GetBatteryChargeState = 0x00080000, GetBatteryChargeState = 0x00080000,
GetStepHistory = 0x000B00C2, GetStepHistory = 0x000B00C2,
GetTotalStepCount = 0x000C0000, GetTotalStepCount = 0x000C0000,
GetStepHistoryAll = 0x000F0084,
ConfigureNew3DSCPU = 0x08180040, ConfigureNew3DSCPU = 0x08180040,
// ptm:play functions
GetPlayHistory = 0x08070082,
GetPlayHistoryStart = 0x08080000,
GetPlayHistoryLength = 0x08090000,
CalcPlayHistoryStart = 0x080B0080,
}; };
} }
void PTMService::reset() {} void PTMService::reset() {}
void PTMService::handleSyncRequest(u32 messagePointer) { void PTMService::handleSyncRequest(u32 messagePointer, PTMService::Type type) {
const u32 command = mem.read32(messagePointer); const u32 command = mem.read32(messagePointer);
// ptm:play functions
switch (command) { switch (command) {
case PTMCommands::ConfigureNew3DSCPU: configureNew3DSCPU(messagePointer); break; case PTMCommands::ConfigureNew3DSCPU: configureNew3DSCPU(messagePointer); break;
case PTMCommands::GetAdapterState: getAdapterState(messagePointer); break; case PTMCommands::GetAdapterState: getAdapterState(messagePointer); break;
case PTMCommands::GetBatteryChargeState: getBatteryChargeState(messagePointer); break; case PTMCommands::GetBatteryChargeState: getBatteryChargeState(messagePointer); break;
case PTMCommands::GetBatteryLevel: getBatteryLevel(messagePointer); break; case PTMCommands::GetBatteryLevel: getBatteryLevel(messagePointer); break;
case PTMCommands::GetStepHistory: getStepHistory(messagePointer); break; case PTMCommands::GetStepHistory: getStepHistory(messagePointer); break;
case PTMCommands::GetTotalStepCount: getTotalStepCount(messagePointer); break; case PTMCommands::GetStepHistoryAll: getStepHistoryAll(messagePointer); break;
default: Helpers::panic("PTM service requested. Command: %08X\n", command); case PTMCommands::GetTotalStepCount: getTotalStepCount(messagePointer); break;
}
default:
// ptm:play-only functions
if (type == Type::PLAY) {
switch (command) {
case PTMCommands::GetPlayHistory:
case PTMCommands::GetPlayHistoryStart:
case PTMCommands::GetPlayHistoryLength:
mem.write32(messagePointer + 4, Result::Success);
mem.write64(messagePointer + 8, 0);
Helpers::warn("Stubbed PTM:PLAY service requested. Command: %08X\n", command);
break;
default: Helpers::panic("PTM PLAY service requested. Command: %08X\n", command); break;
}
} else {
Helpers::panic("PTM service requested. Command: %08X\n", command);
}
}
} }
void PTMService::getAdapterState(u32 messagePointer) { void PTMService::getAdapterState(u32 messagePointer) {
@ -59,6 +86,12 @@ void PTMService::getStepHistory(u32 messagePointer) {
mem.write32(messagePointer + 4, Result::Success); mem.write32(messagePointer + 4, Result::Success);
} }
void PTMService::getStepHistoryAll(u32 messagePointer) {
log("PTM::GetStepHistoryAll [stubbed]\n");
mem.write32(messagePointer, IPC::responseHeader(0xF, 1, 2));
mem.write32(messagePointer + 4, Result::Success);
}
void PTMService::getTotalStepCount(u32 messagePointer) { void PTMService::getTotalStepCount(u32 messagePointer) {
log("PTM::GetTotalStepCount\n"); log("PTM::GetTotalStepCount\n");
mem.write32(messagePointer, IPC::responseHeader(0xC, 2, 0)); mem.write32(messagePointer, IPC::responseHeader(0xC, 2, 0));

9
src/core/services/service_manager.cpp
View file

@ -124,8 +124,9 @@ static std::map<std::string, Handle> serviceMap = {
{ "nfc:u", KernelHandles::NFC }, { "nfc:u", KernelHandles::NFC },
{ "nwm::UDS", KernelHandles::NWM_UDS }, { "nwm::UDS", KernelHandles::NWM_UDS },
{ "nim:aoc", KernelHandles::NIM }, { "nim:aoc", KernelHandles::NIM },
{ "ptm:u", KernelHandles::PTM }, // TODO: ptm:u and ptm:sysm have very different command sets { "ptm:u", KernelHandles::PTM_U }, // TODO: ptm:u and ptm:sysm have very different command sets
{ "ptm:sysm", KernelHandles::PTM }, { "ptm:sysm", KernelHandles::PTM_SYSM },
{ "ptm:play", KernelHandles::PTM_PLAY },
{ "soc:U", KernelHandles::SOC }, { "soc:U", KernelHandles::SOC },
{ "ssl:C", KernelHandles::SSL }, { "ssl:C", KernelHandles::SSL },
{ "y2r:u", KernelHandles::Y2R }, { "y2r:u", KernelHandles::Y2R },
@ -223,7 +224,9 @@ void ServiceManager::sendCommandToService(u32 messagePointer, Handle handle) {
case KernelHandles::NDM: ndm.handleSyncRequest(messagePointer); break; case KernelHandles::NDM: ndm.handleSyncRequest(messagePointer); break;
case KernelHandles::NEWS_U: news_u.handleSyncRequest(messagePointer); break; case KernelHandles::NEWS_U: news_u.handleSyncRequest(messagePointer); break;
case KernelHandles::NWM_UDS: nwm_uds.handleSyncRequest(messagePointer); break; case KernelHandles::NWM_UDS: nwm_uds.handleSyncRequest(messagePointer); break;
case KernelHandles::PTM: ptm.handleSyncRequest(messagePointer); break; case KernelHandles::PTM_PLAY: ptm.handleSyncRequest(messagePointer, PTMService::Type::PLAY); break;
case KernelHandles::PTM_SYSM: ptm.handleSyncRequest(messagePointer, PTMService::Type::SYSM); break;
case KernelHandles::PTM_U: ptm.handleSyncRequest(messagePointer, PTMService::Type::U); break;
case KernelHandles::SOC: soc.handleSyncRequest(messagePointer); break; case KernelHandles::SOC: soc.handleSyncRequest(messagePointer); break;
case KernelHandles::SSL: ssl.handleSyncRequest(messagePointer); break; case KernelHandles::SSL: ssl.handleSyncRequest(messagePointer); break;
case KernelHandles::Y2R: y2r.handleSyncRequest(messagePointer); break; case KernelHandles::Y2R: y2r.handleSyncRequest(messagePointer); break;