octo
/
yuzu-mainline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2989 from lioncash/apm 

service/apm/controller: Minor interface changes
This commit is contained in:
Rodrigo Locatti 2019-10-17 19:20:14 -03:00 committed by GitHub
parent 7398466c33 b77430df70
commit 7cf091bb20
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/core/hle/service/apm/controller.cpp
View File

@ -2,6 +2,10 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <algorithm>
#include <array>
#include <utility>
#include "common/logging/log.h" #include "common/logging/log.h"
#include "core/core_timing.h" #include "core/core_timing.h"
#include "core/hle/service/apm/controller.h" #include "core/hle/service/apm/controller.h"
@ -9,8 +13,7 @@
namespace Service::APM { namespace Service::APM {
constexpr PerformanceConfiguration DEFAULT_PERFORMANCE_CONFIGURATION = constexpr auto DEFAULT_PERFORMANCE_CONFIGURATION = PerformanceConfiguration::Config7;
PerformanceConfiguration::Config7;
Controller::Controller(Core::Timing::CoreTiming& core_timing) Controller::Controller(Core::Timing::CoreTiming& core_timing)
: core_timing{core_timing}, configs{ : core_timing{core_timing}, configs{
@ -22,18 +25,35 @@ Controller::~Controller() = default;
void Controller::SetPerformanceConfiguration(PerformanceMode mode, void Controller::SetPerformanceConfiguration(PerformanceMode mode,
PerformanceConfiguration config) { PerformanceConfiguration config) {
static const std::map<PerformanceConfiguration, u32> PCONFIG_TO_SPEED_MAP{ static constexpr std::array<std::pair<PerformanceConfiguration, u32>, 16> config_to_speed{{
{PerformanceConfiguration::Config1, 1020}, {PerformanceConfiguration::Config2, 1020}, {PerformanceConfiguration::Config1, 1020},
{PerformanceConfiguration::Config3, 1224}, {PerformanceConfiguration::Config4, 1020}, {PerformanceConfiguration::Config2, 1020},
{PerformanceConfiguration::Config5, 1020}, {PerformanceConfiguration::Config6, 1224}, {PerformanceConfiguration::Config3, 1224},
{PerformanceConfiguration::Config7, 1020}, {PerformanceConfiguration::Config8, 1020}, {PerformanceConfiguration::Config4, 1020},
{PerformanceConfiguration::Config9, 1020}, {PerformanceConfiguration::Config10, 1020}, {PerformanceConfiguration::Config5, 1020},
{PerformanceConfiguration::Config11, 1020}, {PerformanceConfiguration::Config12, 1020}, {PerformanceConfiguration::Config6, 1224},
{PerformanceConfiguration::Config13, 1785}, {PerformanceConfiguration::Config14, 1785}, {PerformanceConfiguration::Config7, 1020},
{PerformanceConfiguration::Config15, 1020}, {PerformanceConfiguration::Config16, 1020}, {PerformanceConfiguration::Config8, 1020},
}; {PerformanceConfiguration::Config9, 1020},
{PerformanceConfiguration::Config10, 1020},
{PerformanceConfiguration::Config11, 1020},
{PerformanceConfiguration::Config12, 1020},
{PerformanceConfiguration::Config13, 1785},
{PerformanceConfiguration::Config14, 1785},
{PerformanceConfiguration::Config15, 1020},
{PerformanceConfiguration::Config16, 1020},
}};
SetClockSpeed(PCONFIG_TO_SPEED_MAP.find(config)->second); const auto iter = std::find_if(config_to_speed.cbegin(), config_to_speed.cend(),
[config](const auto& entry) { return entry.first == config; });
if (iter == config_to_speed.cend()) {
LOG_ERROR(Service_APM, "Invalid performance configuration value provided: {}",
static_cast<u32>(config));
return;
}
SetClockSpeed(iter->second);
configs.insert_or_assign(mode, config); configs.insert_or_assign(mode, config);
} }
@ -48,7 +68,7 @@ void Controller::SetFromCpuBoostMode(CpuBoostMode mode) {
BOOST_MODE_TO_CONFIG_MAP.at(static_cast<u32>(mode))); BOOST_MODE_TO_CONFIG_MAP.at(static_cast<u32>(mode)));
} }
PerformanceMode Controller::GetCurrentPerformanceMode() { PerformanceMode Controller::GetCurrentPerformanceMode() const {
return Settings::values.use_docked_mode ? PerformanceMode::Docked : PerformanceMode::Handheld; return Settings::values.use_docked_mode ? PerformanceMode::Docked : PerformanceMode::Handheld;
} }

2
src/core/hle/service/apm/controller.h
View File

@ -56,7 +56,7 @@ public:
void SetPerformanceConfiguration(PerformanceMode mode, PerformanceConfiguration config); void SetPerformanceConfiguration(PerformanceMode mode, PerformanceConfiguration config);
void SetFromCpuBoostMode(CpuBoostMode mode); void SetFromCpuBoostMode(CpuBoostMode mode);
PerformanceMode GetCurrentPerformanceMode(); PerformanceMode GetCurrentPerformanceMode() const;
PerformanceConfiguration GetCurrentPerformanceConfiguration(PerformanceMode mode); PerformanceConfiguration GetCurrentPerformanceConfiguration(PerformanceMode mode);
private: private: