From b6c47b578f2945c0909728e26b1c3dd6982a59a5 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 13 Aug 2018 18:54:22 -0400 Subject: [PATCH] mm_u: Forward all old variants of functions to the new ones Ensures both variants go through the same interface, and while we're at it, add Finalize to provide the inverse of Initialize for consistency. --- src/core/hle/service/mm/mm_u.cpp | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/core/hle/service/mm/mm_u.cpp b/src/core/hle/service/mm/mm_u.cpp index 0183c6e2e3..7b91bb2581 100644 --- a/src/core/hle/service/mm/mm_u.cpp +++ b/src/core/hle/service/mm/mm_u.cpp @@ -14,12 +14,12 @@ public: explicit MM_U() : ServiceFramework{"mm:u"} { // clang-format off static const FunctionInfo functions[] = { - {0, nullptr, "InitializeOld"}, - {1, nullptr, "FinalizeOld"}, - {2, nullptr, "SetAndWaitOld"}, - {3, nullptr, "GetOld"}, + {0, &MM_U::Initialize, "InitializeOld"}, + {1, &MM_U::Finalize, "FinalizeOld"}, + {2, &MM_U::SetAndWait, "SetAndWaitOld"}, + {3, &MM_U::Get, "GetOld"}, {4, &MM_U::Initialize, "Initialize"}, - {5, nullptr, "Finalize"}, + {5, &MM_U::Finalize, "Finalize"}, {6, &MM_U::SetAndWait, "SetAndWait"}, {7, &MM_U::Get, "Get"}, }; @@ -35,6 +35,12 @@ private: rb.Push(RESULT_SUCCESS); } + void Finalize(Kernel::HLERequestContext& ctx) { + LOG_WARNING(Service_MM, "(STUBBED) called"); + IPC::ResponseBuilder rb{ctx, 2}; + rb.Push(RESULT_SUCCESS); + } + void SetAndWait(Kernel::HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; min = rp.Pop();