etc/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1056 from lioncash/mm

Browse source 
mm_u: Move interface class into the cpp file
This commit is contained in:
bunnei 2018-08-14 21:47:07 -04:00 committed by GitHub
commit 409d2e07c2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 55 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
src/core/hle/service/mm/mm_u.cpp
View file

@ -9,17 +9,39 @@
namespace Service::MM { namespace Service::MM {
void InstallInterfaces(SM::ServiceManager& service_manager) { class MM_U final : public ServiceFramework<MM_U> {
std::make_shared<MM_U>()->InstallAsService(service_manager); public:
} explicit MM_U() : ServiceFramework{"mm:u"} {
// clang-format off
static const FunctionInfo functions[] = {
{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, &MM_U::Finalize, "Finalize"},
{6, &MM_U::SetAndWait, "SetAndWait"},
{7, &MM_U::Get, "Get"},
};
// clang-format on
void MM_U::Initialize(Kernel::HLERequestContext& ctx) { RegisterHandlers(functions);
}
private:
void Initialize(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 MM_U::SetAndWait(Kernel::HLERequestContext& ctx) { 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}; IPC::RequestParser rp{ctx};
min = rp.Pop<u32>(); min = rp.Pop<u32>();
max = rp.Pop<u32>(); max = rp.Pop<u32>();
@ -28,23 +50,22 @@ void MM_U::SetAndWait(Kernel::HLERequestContext& ctx) {
LOG_WARNING(Service_MM, "(STUBBED) called, min=0x{:X}, max=0x{:X}", min, max); LOG_WARNING(Service_MM, "(STUBBED) called, min=0x{:X}, max=0x{:X}", min, max);
IPC::ResponseBuilder rb{ctx, 2}; IPC::ResponseBuilder rb{ctx, 2};
rb.Push(RESULT_SUCCESS); rb.Push(RESULT_SUCCESS);
} }
void MM_U::Get(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};
rb.Push(RESULT_SUCCESS); rb.Push(RESULT_SUCCESS);
rb.Push(current); rb.Push(current);
} }
MM_U::MM_U() : ServiceFramework("mm:u") { u32 min{0};
static const FunctionInfo functions[] = { u32 max{0};
{0, nullptr, "InitializeOld"}, {1, nullptr, "FinalizeOld"}, u32 current{0};
{2, nullptr, "SetAndWaitOld"}, {3, nullptr, "GetOld"}, };
{4, &MM_U::Initialize, "Initialize"}, {5, nullptr, "Finalize"},
{6, &MM_U::SetAndWait, "SetAndWait"}, {7, &MM_U::Get, "Get"}, void InstallInterfaces(SM::ServiceManager& service_manager) {
}; std::make_shared<MM_U>()->InstallAsService(service_manager);
RegisterHandlers(functions);
} }
} // namespace Service::MM } // namespace Service::MM

15
src/core/hle/service/mm/mm_u.h
View file

@ -8,21 +8,6 @@
namespace Service::MM { namespace Service::MM {
class MM_U final : public ServiceFramework<MM_U> {
public:
MM_U();
~MM_U() = default;
private:
void Initialize(Kernel::HLERequestContext& ctx);
void SetAndWait(Kernel::HLERequestContext& ctx);
void Get(Kernel::HLERequestContext& ctx);
u32 min{0};
u32 max{0};
u32 current{0};
};
/// Registers all MM services with the specified service manager. /// Registers all MM services with the specified service manager.
void InstallInterfaces(SM::ServiceManager& service_manager); void InstallInterfaces(SM::ServiceManager& service_manager);