diff --git a/include/services/ndm.hpp b/include/services/ndm.hpp index 917af8ba..8879f2c2 100644 --- a/include/services/ndm.hpp +++ b/include/services/ndm.hpp @@ -11,6 +11,7 @@ class NDMService { // Service commands void overrideDefaultDaemons(u32 messagePointer); + void resumeDaemons(u32 messagePointer); void resumeScheduler(u32 messagePointer); void suspendDaemons(u32 messagePointer); void suspendScheduler(u32 messagePointer); diff --git a/src/core/services/frd.cpp b/src/core/services/frd.cpp index 483fb9c8..2436811e 100644 --- a/src/core/services/frd.cpp +++ b/src/core/services/frd.cpp @@ -45,7 +45,7 @@ void FRDService::getFriendKeyList(u32 messagePointer) { constexpr u32 friendCount = 0; // And this should be the number of friends whose keys were actually received? mem.write32(messagePointer + 4, Result::Success); - mem.write32(messagePointer + 8, 0); + mem.write32(messagePointer + 8, friendCount); // Zero out friend keys for (u32 i = 0; i < count * sizeof(FriendKey); i += 4) { diff --git a/src/core/services/ndm.cpp b/src/core/services/ndm.cpp index ac3a2bde..d6c18afe 100644 --- a/src/core/services/ndm.cpp +++ b/src/core/services/ndm.cpp @@ -4,6 +4,7 @@ namespace NDMCommands { enum : u32 { OverrideDefaultDaemons = 0x00140040, SuspendDaemons = 0x00060040, + ResumeDaemons = 0x00070040, SuspendScheduler = 0x00080040, ResumeScheduler = 0x00090000 }; @@ -21,6 +22,7 @@ void NDMService::handleSyncRequest(u32 messagePointer) { const u32 command = mem.read32(messagePointer); switch (command) { case NDMCommands::OverrideDefaultDaemons: overrideDefaultDaemons(messagePointer); break; + case NDMCommands::ResumeDaemons: resumeDaemons(messagePointer); break; case NDMCommands::ResumeScheduler: resumeScheduler(messagePointer); break; case NDMCommands::SuspendDaemons: suspendDaemons(messagePointer); break; case NDMCommands::SuspendScheduler: suspendScheduler(messagePointer); break; @@ -33,6 +35,11 @@ void NDMService::overrideDefaultDaemons(u32 messagePointer) { mem.write32(messagePointer + 4, Result::Success); } +void NDMService::resumeDaemons(u32 messagePointer) { + log("NDM::resumeDaemons(stubbed)\n"); + mem.write32(messagePointer + 4, Result::Success); +} + void NDMService::suspendDaemons(u32 messagePointer) { log("NDM::SuspendDaemons(stubbed)\n"); mem.write32(messagePointer + 4, Result::Success);