yuzu-emu
/
yuzu-mainline
Archived
1
0
Fork 0
Code

apm: Add getters for performance config and mode

This commit is contained in:
Zach Hilman 2019-06-28 22:45:31 -04:00
parent 9175b00e7d
commit 1c6e6305ea
2 changed files with 49 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/core/hle/service/apm/interface.cpp
View File

@ -5,43 +5,32 @@
#include "common/logging/log.h" #include "common/logging/log.h"
#include "core/hle/ipc_helpers.h" #include "core/hle/ipc_helpers.h"
#include "core/hle/service/apm/apm.h" #include "core/hle/service/apm/apm.h"
#include "core/hle/service/apm/controller.h"
#include "core/hle/service/apm/interface.h" #include "core/hle/service/apm/interface.h"
namespace Service::APM { namespace Service::APM {
class ISession final : public ServiceFramework<ISession> { class ISession final : public ServiceFramework<ISession> {
public: public:
ISession() : ServiceFramework("ISession") { ISession(Controller& controller) : ServiceFramework("ISession"), controller(controller) {
static const FunctionInfo functions[] = { static const FunctionInfo functions[] = {
{0, &ISession::SetPerformanceConfiguration, "SetPerformanceConfiguration"}, {0, &ISession::SetPerformanceConfiguration, "SetPerformanceConfiguration"},
{1, &ISession::GetPerformanceConfiguration, "GetPerformanceConfiguration"}, {1, &ISession::GetPerformanceConfiguration, "GetPerformanceConfiguration"},
{2, nullptr, "SetCpuOverclockEnabled"},
}; };
RegisterHandlers(functions); RegisterHandlers(functions);
} }
private: private:
enum class PerformanceConfiguration : u32 {
Config1 = 0x00010000,
Config2 = 0x00010001,
Config3 = 0x00010002,
Config4 = 0x00020000,
Config5 = 0x00020001,
Config6 = 0x00020002,
Config7 = 0x00020003,
Config8 = 0x00020004,
Config9 = 0x00020005,
Config10 = 0x00020006,
Config11 = 0x92220007,
Config12 = 0x92220008,
};
void SetPerformanceConfiguration(Kernel::HLERequestContext& ctx) { void SetPerformanceConfiguration(Kernel::HLERequestContext& ctx) {
IPC::RequestParser rp{ctx}; IPC::RequestParser rp{ctx};
auto mode = static_cast<PerformanceMode>(rp.Pop<u32>()); const auto mode = rp.PopEnum<PerformanceMode>();
u32 config = rp.Pop<u32>(); const auto config = rp.PopEnum<PerformanceConfiguration>();
LOG_WARNING(Service_APM, "(STUBBED) called mode={} config={}", static_cast<u32>(mode), LOG_DEBUG(Service_APM, "called mode={} config={}", static_cast<u32>(mode),
config); static_cast<u32>(config));
controller.SetPerformanceConfiguration(mode, config);
IPC::ResponseBuilder rb{ctx, 2}; IPC::ResponseBuilder rb{ctx, 2};
rb.Push(RESULT_SUCCESS); rb.Push(RESULT_SUCCESS);
@ -50,20 +39,23 @@ private:
void GetPerformanceConfiguration(Kernel::HLERequestContext& ctx) { void GetPerformanceConfiguration(Kernel::HLERequestContext& ctx) {
IPC::RequestParser rp{ctx}; IPC::RequestParser rp{ctx};
auto mode = static_cast<PerformanceMode>(rp.Pop<u32>()); const auto mode = rp.PopEnum<PerformanceMode>();
LOG_WARNING(Service_APM, "(STUBBED) called mode={}", static_cast<u32>(mode)); LOG_DEBUG(Service_APM, "called mode={}", static_cast<u32>(mode));
IPC::ResponseBuilder rb{ctx, 3}; IPC::ResponseBuilder rb{ctx, 3};
rb.Push(RESULT_SUCCESS); rb.Push(RESULT_SUCCESS);
rb.Push<u32>(static_cast<u32>(PerformanceConfiguration::Config1)); rb.PushEnum(controller.GetCurrentPerformanceConfiguration(mode));
} }
Controller& controller;
}; };
APM::APM(std::shared_ptr<Module> apm, const char* name) APM::APM(std::shared_ptr<Module> apm, Controller& controller, const char* name)
: ServiceFramework(name), apm(std::move(apm)) { : ServiceFramework(name), apm(std::move(apm)), controller(controller) {
static const FunctionInfo functions[] = { static const FunctionInfo functions[] = {
{0, &APM::OpenSession, "OpenSession"}, {0, &APM::OpenSession, "OpenSession"},
{1, nullptr, "GetPerformanceMode"}, {1, &APM::GetPerformanceMode, "GetPerformanceMode"},
{6, nullptr, "IsCpuOverclockEnabled"},
}; };
RegisterHandlers(functions); RegisterHandlers(functions);
} }
@ -75,10 +67,17 @@ void APM::OpenSession(Kernel::HLERequestContext& ctx) {
IPC::ResponseBuilder rb{ctx, 2, 0, 1}; IPC::ResponseBuilder rb{ctx, 2, 0, 1};
rb.Push(RESULT_SUCCESS); rb.Push(RESULT_SUCCESS);
rb.PushIpcInterface<ISession>(); rb.PushIpcInterface<ISession>(controller);
} }
APM_Sys::APM_Sys() : ServiceFramework{"apm:sys"} { void APM::GetPerformanceMode(Kernel::HLERequestContext& ctx) {
LOG_DEBUG(Service_APM, "called");
IPC::ResponseBuilder rb{ctx, 2};
rb.PushEnum(controller.GetCurrentPerformanceMode());
}
APM_Sys::APM_Sys(Controller& controller) : ServiceFramework{"apm:sys"}, controller(controller) {
// clang-format off // clang-format off
static const FunctionInfo functions[] = { static const FunctionInfo functions[] = {
{0, nullptr, "RequestPerformanceMode"}, {0, nullptr, "RequestPerformanceMode"},
@ -87,8 +86,8 @@ APM_Sys::APM_Sys() : ServiceFramework{"apm:sys"} {
{3, nullptr, "GetLastThrottlingState"}, {3, nullptr, "GetLastThrottlingState"},
{4, nullptr, "ClearLastThrottlingState"}, {4, nullptr, "ClearLastThrottlingState"},
{5, nullptr, "LoadAndApplySettings"}, {5, nullptr, "LoadAndApplySettings"},
{6, nullptr, "SetCpuBoostMode"}, {6, &APM_Sys::SetCpuBoostMode, "SetCpuBoostMode"},
{7, nullptr, "GetCurrentPerformanceConfiguration"}, {7, &APM_Sys::GetCurrentPerformanceConfiguration, "GetCurrentPerformanceConfiguration"},
}; };
// clang-format on // clang-format on
@ -102,7 +101,16 @@ void APM_Sys::GetPerformanceEvent(Kernel::HLERequestContext& ctx) {
IPC::ResponseBuilder rb{ctx, 2, 0, 1}; IPC::ResponseBuilder rb{ctx, 2, 0, 1};
rb.Push(RESULT_SUCCESS); rb.Push(RESULT_SUCCESS);
rb.PushIpcInterface<ISession>(); rb.PushIpcInterface<ISession>(controller);
}
void APM_Sys::GetCurrentPerformanceConfiguration(Kernel::HLERequestContext& ctx) {
LOG_DEBUG(Service_APM, "called");
IPC::ResponseBuilder rb{ctx, 3};
rb.Push(RESULT_SUCCESS);
rb.PushEnum(
controller.GetCurrentPerformanceConfiguration(controller.GetCurrentPerformanceMode()));
} }
} // namespace Service::APM } // namespace Service::APM

12
src/core/hle/service/apm/interface.h
View File

@ -8,24 +8,32 @@
namespace Service::APM { namespace Service::APM {
class Controller;
class Module;
class APM final : public ServiceFramework<APM> { class APM final : public ServiceFramework<APM> {
public: public:
explicit APM(std::shared_ptr<Module> apm, const char* name); explicit APM(std::shared_ptr<Module> apm, Controller& controller, const char* name);
~APM() override; ~APM() override;
private: private:
void OpenSession(Kernel::HLERequestContext& ctx); void OpenSession(Kernel::HLERequestContext& ctx);
void GetPerformanceMode(Kernel::HLERequestContext& ctx);
std::shared_ptr<Module> apm; std::shared_ptr<Module> apm;
Controller& controller;
}; };
class APM_Sys final : public ServiceFramework<APM_Sys> { class APM_Sys final : public ServiceFramework<APM_Sys> {
public: public:
explicit APM_Sys(); explicit APM_Sys(Controller& controller);
~APM_Sys() override; ~APM_Sys() override;
private: private:
void GetPerformanceEvent(Kernel::HLERequestContext& ctx); void GetPerformanceEvent(Kernel::HLERequestContext& ctx);
void GetCurrentPerformanceConfiguration(Kernel::HLERequestContext& ctx);
Controller& controller;
}; };
} // namespace Service::APM } // namespace Service::APM