Merge pull request #4188 from VolcaEM/patch-13

mm: Update function table
This commit is contained in:
David 2020-06-28 18:47:55 +10:00 committed by GitHub
commit 00aa9f6a53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -14,14 +14,14 @@ public:
explicit MM_U() : ServiceFramework{"mm:u"} { explicit MM_U() : ServiceFramework{"mm:u"} {
// clang-format off // clang-format off
static const FunctionInfo functions[] = { static const FunctionInfo functions[] = {
{0, &MM_U::Initialize, "Initialize"}, {0, &MM_U::InitializeOld, "InitializeOld"},
{1, &MM_U::Finalize, "Finalize"}, {1, &MM_U::FinalizeOld, "FinalizeOld"},
{2, &MM_U::SetAndWait, "SetAndWait"}, {2, &MM_U::SetAndWaitOld, "SetAndWaitOld"},
{3, &MM_U::Get, "Get"}, {3, &MM_U::GetOld, "GetOld"},
{4, &MM_U::InitializeWithId, "InitializeWithId"}, {4, &MM_U::Initialize, "Initialize"},
{5, &MM_U::FinalizeWithId, "FinalizeWithId"}, {5, &MM_U::Finalize, "Finalize"},
{6, &MM_U::SetAndWaitWithId, "SetAndWaitWithId"}, {6, &MM_U::SetAndWait, "SetAndWait"},
{7, &MM_U::GetWithId, "GetWithId"}, {7, &MM_U::Get, "Get"},
}; };
// clang-format on // clang-format on
@ -29,21 +29,21 @@ public:
} }
private: private:
void Initialize(Kernel::HLERequestContext& ctx) { void InitializeOld(Kernel::HLERequestContext& ctx) {
LOG_WARNING(Service_MM, "(STUBBED) called"); LOG_WARNING(Service_MM, "(STUBBED) called");
IPC::ResponseBuilder rb{ctx, 2}; IPC::ResponseBuilder rb{ctx, 2};
rb.Push(RESULT_SUCCESS); rb.Push(RESULT_SUCCESS);
} }
void Finalize(Kernel::HLERequestContext& ctx) { void FinalizeOld(Kernel::HLERequestContext& ctx) {
LOG_WARNING(Service_MM, "(STUBBED) called"); LOG_WARNING(Service_MM, "(STUBBED) called");
IPC::ResponseBuilder rb{ctx, 2}; IPC::ResponseBuilder rb{ctx, 2};
rb.Push(RESULT_SUCCESS); rb.Push(RESULT_SUCCESS);
} }
void SetAndWait(Kernel::HLERequestContext& ctx) { void SetAndWaitOld(Kernel::HLERequestContext& ctx) {
IPC::RequestParser rp{ctx}; IPC::RequestParser rp{ctx};
min = rp.Pop<u32>(); min = rp.Pop<u32>();
max = rp.Pop<u32>(); max = rp.Pop<u32>();
@ -54,7 +54,7 @@ private:
rb.Push(RESULT_SUCCESS); rb.Push(RESULT_SUCCESS);
} }
void Get(Kernel::HLERequestContext& ctx) { void GetOld(Kernel::HLERequestContext& ctx) {
LOG_WARNING(Service_MM, "(STUBBED) called"); LOG_WARNING(Service_MM, "(STUBBED) called");
IPC::ResponseBuilder rb{ctx, 3}; IPC::ResponseBuilder rb{ctx, 3};
@ -62,7 +62,7 @@ private:
rb.Push(current); rb.Push(current);
} }
void InitializeWithId(Kernel::HLERequestContext& ctx) { void Initialize(Kernel::HLERequestContext& ctx) {
LOG_WARNING(Service_MM, "(STUBBED) called"); LOG_WARNING(Service_MM, "(STUBBED) called");
IPC::ResponseBuilder rb{ctx, 3}; IPC::ResponseBuilder rb{ctx, 3};
@ -70,14 +70,14 @@ private:
rb.Push<u32>(id); // Any non zero value rb.Push<u32>(id); // Any non zero value
} }
void FinalizeWithId(Kernel::HLERequestContext& ctx) { void Finalize(Kernel::HLERequestContext& ctx) {
LOG_WARNING(Service_MM, "(STUBBED) called"); LOG_WARNING(Service_MM, "(STUBBED) called");
IPC::ResponseBuilder rb{ctx, 2}; IPC::ResponseBuilder rb{ctx, 2};
rb.Push(RESULT_SUCCESS); rb.Push(RESULT_SUCCESS);
} }
void SetAndWaitWithId(Kernel::HLERequestContext& ctx) { void SetAndWait(Kernel::HLERequestContext& ctx) {
IPC::RequestParser rp{ctx}; IPC::RequestParser rp{ctx};
u32 input_id = rp.Pop<u32>(); u32 input_id = rp.Pop<u32>();
min = rp.Pop<u32>(); min = rp.Pop<u32>();
@ -90,7 +90,7 @@ private:
rb.Push(RESULT_SUCCESS); rb.Push(RESULT_SUCCESS);
} }
void GetWithId(Kernel::HLERequestContext& ctx) { void Get(Kernel::HLERequestContext& ctx) {
LOG_WARNING(Service_MM, "(STUBBED) called"); LOG_WARNING(Service_MM, "(STUBBED) called");
IPC::ResponseBuilder rb{ctx, 3}; IPC::ResponseBuilder rb{ctx, 3};