diff options
author | bunnei <bunneidev@gmail.com> | 2023-08-10 06:24:06 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-10 06:24:06 +0200 |
commit | 3d6ce9dd2b5bad115b295fb7092abc5c30a34448 (patch) | |
tree | 2d7c5660e50468e815d923492b3fcb3c6fe63636 /src/core | |
parent | Merge pull request #11216 from lat9nq/no-mesa-astc (diff) | |
parent | service: pctl: Partially revert 11221 (diff) | |
download | yuzu-3d6ce9dd2b5bad115b295fb7092abc5c30a34448.tar yuzu-3d6ce9dd2b5bad115b295fb7092abc5c30a34448.tar.gz yuzu-3d6ce9dd2b5bad115b295fb7092abc5c30a34448.tar.bz2 yuzu-3d6ce9dd2b5bad115b295fb7092abc5c30a34448.tar.lz yuzu-3d6ce9dd2b5bad115b295fb7092abc5c30a34448.tar.xz yuzu-3d6ce9dd2b5bad115b295fb7092abc5c30a34448.tar.zst yuzu-3d6ce9dd2b5bad115b295fb7092abc5c30a34448.zip |
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/hle/service/pctl/pctl_module.cpp | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/src/core/hle/service/pctl/pctl_module.cpp b/src/core/hle/service/pctl/pctl_module.cpp index 7c8a539b8..5db1703d1 100644 --- a/src/core/hle/service/pctl/pctl_module.cpp +++ b/src/core/hle/service/pctl/pctl_module.cpp @@ -152,7 +152,7 @@ private: if (pin_code[0] == '\0') { return true; } - if (!restriction_settings.is_free_communication_default_on) { + if (!settings.is_free_communication_default_on) { return true; } // TODO(ogniK): Check for blacklisted/exempted applications. Return false can happen here @@ -168,21 +168,21 @@ private: if (pin_code[0] == '\0') { return true; } - if (!restriction_settings.is_stero_vision_restricted) { + if (!settings.is_stero_vision_restricted) { return false; } return true; } void SetStereoVisionRestrictionImpl(bool is_restricted) { - if (restriction_settings.disabled) { + if (settings.disabled) { return; } if (pin_code[0] == '\0') { return; } - restriction_settings.is_stero_vision_restricted = is_restricted; + settings.is_stero_vision_restricted = is_restricted; } void Initialize(HLERequestContext& ctx) { @@ -430,7 +430,7 @@ private: } rb.Push(ResultSuccess); - rb.Push(restriction_settings.is_stero_vision_restricted); + rb.Push(settings.is_stero_vision_restricted); } void ResetConfirmedStereoVisionPermission(HLERequestContext& ctx) { @@ -460,22 +460,28 @@ private: bool stereo_vision{}; }; - // This is nn::pctl::RestrictionSettings - struct RestrictionSettings { + struct ParentalControlSettings { bool is_stero_vision_restricted{}; bool is_free_communication_default_on{}; bool disabled{}; }; + + // This is nn::pctl::RestrictionSettings + struct RestrictionSettings { + u8 rating_age; + bool sns_post_restriction; + bool free_communication_restriction; + }; static_assert(sizeof(RestrictionSettings) == 0x3, "RestrictionSettings has incorrect size."); // This is nn::pctl::PlayTimerSettings struct PlayTimerSettings { - // TODO: RE the actual contents of this struct - std::array<u8, 0x34> settings; + std::array<u32, 13> settings; }; static_assert(sizeof(PlayTimerSettings) == 0x34, "PlayTimerSettings has incorrect size."); States states{}; + ParentalControlSettings settings{}; RestrictionSettings restriction_settings{}; std::array<char, 8> pin_code{}; Capability capability{}; |