diff options
| author | Mat M <mathew1800@gmail.com> | 2020-04-30 19:39:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-30 19:39:16 +0200 |
| commit | f88d2f57396b8bceda1a07431dab31d8b2cc741d (patch) | |
| tree | d2e9bdb257310e1214b9e2018b61aaa279beb5ad /src/core/hle | |
| parent | Merge pull request #3830 from ogniK5377/GetFriendInvitationStorageChannelEvent (diff) | |
| parent | am: IsVrModeEnabled & SetVrModeEnabled fixes (diff) | |
| download | yuzu-f88d2f57396b8bceda1a07431dab31d8b2cc741d.tar yuzu-f88d2f57396b8bceda1a07431dab31d8b2cc741d.tar.gz yuzu-f88d2f57396b8bceda1a07431dab31d8b2cc741d.tar.bz2 yuzu-f88d2f57396b8bceda1a07431dab31d8b2cc741d.tar.lz yuzu-f88d2f57396b8bceda1a07431dab31d8b2cc741d.tar.xz yuzu-f88d2f57396b8bceda1a07431dab31d8b2cc741d.tar.zst yuzu-f88d2f57396b8bceda1a07431dab31d8b2cc741d.zip | |
Diffstat (limited to 'src/core/hle')
| -rw-r--r-- | src/core/hle/service/am/am.cpp | 21 | ||||
| -rw-r--r-- | src/core/hle/service/am/am.h | 1 |
2 files changed, 6 insertions, 16 deletions
diff --git a/src/core/hle/service/am/am.cpp b/src/core/hle/service/am/am.cpp index 0bb6141b0..9450de6e9 100644 --- a/src/core/hle/service/am/am.cpp +++ b/src/core/hle/service/am/am.cpp @@ -52,11 +52,6 @@ enum class LaunchParameterKind : u32 { AccountPreselectedUser = 2, }; -enum class VrMode : u8 { - Disabled = 0, - Enabled = 1, -}; - constexpr u32 LAUNCH_PARAMETER_ACCOUNT_PRESELECTED_USER_MAGIC = 0xC79497CA; struct LaunchParameterAccountPreselectedUser { @@ -685,27 +680,21 @@ void ICommonStateGetter::GetCurrentFocusState(Kernel::HLERequestContext& ctx) { } void ICommonStateGetter::IsVrModeEnabled(Kernel::HLERequestContext& ctx) { - LOG_WARNING(Service_AM, "(STUBBED) called"); + LOG_DEBUG(Service_AM, "called"); IPC::ResponseBuilder rb{ctx, 3}; rb.Push(RESULT_SUCCESS); - rb.PushEnum(VrMode::Disabled); + rb.Push(vr_mode_state); } void ICommonStateGetter::SetVrModeEnabled(Kernel::HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; - const auto is_vr_mode_enabled = rp.Pop<bool>(); + vr_mode_state = rp.Pop<bool>(); - LOG_WARNING(Service_AM, "(STUBBED) called. is_vr_mode_enabled={}", is_vr_mode_enabled); + LOG_WARNING(Service_AM, "VR Mode is {}", vr_mode_state ? "on" : "off"); IPC::ResponseBuilder rb{ctx, 2}; - if (!is_vr_mode_enabled) { - rb.Push(RESULT_SUCCESS); - } else { - // TODO: Find better error code for this - UNIMPLEMENTED_MSG("is_vr_mode_enabled={}", is_vr_mode_enabled); - rb.Push(RESULT_UNKNOWN); - } + rb.Push(RESULT_SUCCESS); } void ICommonStateGetter::SetLcdBacklighOffEnabled(Kernel::HLERequestContext& ctx) { diff --git a/src/core/hle/service/am/am.h b/src/core/hle/service/am/am.h index 55afe2b63..dfa701d73 100644 --- a/src/core/hle/service/am/am.h +++ b/src/core/hle/service/am/am.h @@ -191,6 +191,7 @@ private: Core::System& system; std::shared_ptr<AppletMessageQueue> msg_queue; + bool vr_mode_state{}; }; class IStorageImpl { |