diff options
| author | 2018-03-26 22:59:18 -0400 | |
|---|---|---|
| committer | 2018-03-26 23:02:36 -0400 | |
| commit | 5ecf152c8ee1bb6f8f050d16dda56c1b115e0ff3 (patch) | |
| tree | eb7722cc9dee21ca3fe35df1187f3e2d41131448 /src/core | |
| parent | configure_general: Cleanup naming. (diff) | |
| download | yuzu-5ecf152c8ee1bb6f8f050d16dda56c1b115e0ff3.tar.gz yuzu-5ecf152c8ee1bb6f8f050d16dda56c1b115e0ff3.tar.xz yuzu-5ecf152c8ee1bb6f8f050d16dda56c1b115e0ff3.zip | |
config: Rename is_docked to use_docked_mode to be consistent with other config bools.
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/hle/service/am/am.cpp | 10 | ||||
| -rw-r--r-- | src/core/settings.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp index 07522e730..bab338205 100644 --- a/src/core/hle/service/am/am.cpp +++ b/src/core/hle/service/am/am.cpp | |||
| @@ -242,20 +242,20 @@ void ICommonStateGetter::GetCurrentFocusState(Kernel::HLERequestContext& ctx) { | |||
| 242 | } | 242 | } |
| 243 | 243 | ||
| 244 | void ICommonStateGetter::GetOperationMode(Kernel::HLERequestContext& ctx) { | 244 | void ICommonStateGetter::GetOperationMode(Kernel::HLERequestContext& ctx) { |
| 245 | const bool is_docked{Settings::values.is_docked}; | 245 | const bool use_docked_mode{Settings::values.use_docked_mode}; |
| 246 | IPC::ResponseBuilder rb{ctx, 3}; | 246 | IPC::ResponseBuilder rb{ctx, 3}; |
| 247 | rb.Push(RESULT_SUCCESS); | 247 | rb.Push(RESULT_SUCCESS); |
| 248 | rb.Push(static_cast<u8>(is_docked ? OperationMode::Docked : OperationMode::Handheld)); | 248 | rb.Push(static_cast<u8>(use_docked_mode ? OperationMode::Docked : OperationMode::Handheld)); |
| 249 | 249 | ||
| 250 | LOG_WARNING(Service_AM, "(STUBBED) called"); | 250 | LOG_WARNING(Service_AM, "(STUBBED) called"); |
| 251 | } | 251 | } |
| 252 | 252 | ||
| 253 | void ICommonStateGetter::GetPerformanceMode(Kernel::HLERequestContext& ctx) { | 253 | void ICommonStateGetter::GetPerformanceMode(Kernel::HLERequestContext& ctx) { |
| 254 | const bool is_docked{Settings::values.is_docked}; | 254 | const bool use_docked_mode{Settings::values.use_docked_mode}; |
| 255 | IPC::ResponseBuilder rb{ctx, 3}; | 255 | IPC::ResponseBuilder rb{ctx, 3}; |
| 256 | rb.Push(RESULT_SUCCESS); | 256 | rb.Push(RESULT_SUCCESS); |
| 257 | rb.Push(static_cast<u32>(is_docked ? APM::PerformanceMode::Docked | 257 | rb.Push(static_cast<u32>(use_docked_mode ? APM::PerformanceMode::Docked |
| 258 | : APM::PerformanceMode::Handheld)); | 258 | : APM::PerformanceMode::Handheld)); |
| 259 | 259 | ||
| 260 | LOG_WARNING(Service_AM, "(STUBBED) called"); | 260 | LOG_WARNING(Service_AM, "(STUBBED) called"); |
| 261 | } | 261 | } |
diff --git a/src/core/settings.h b/src/core/settings.h index 002d25dbd..eaef47236 100644 --- a/src/core/settings.h +++ b/src/core/settings.h | |||
| @@ -112,7 +112,7 @@ enum class CpuCore { | |||
| 112 | 112 | ||
| 113 | struct Values { | 113 | struct Values { |
| 114 | // System | 114 | // System |
| 115 | bool is_docked; | 115 | bool use_docked_mode; |
| 116 | 116 | ||
| 117 | // Controls | 117 | // Controls |
| 118 | std::array<std::string, NativeButton::NumButtons> buttons; | 118 | std::array<std::string, NativeButton::NumButtons> buttons; |