diff options
author | Narr the Reg <juangerman-13@hotmail.com> | 2024-02-09 01:11:56 +0100 |
---|---|---|
committer | Narr the Reg <juangerman-13@hotmail.com> | 2024-02-09 01:50:54 +0100 |
commit | 0ac777460d8b4b3cd2b299c89ba2986f088d5e68 (patch) | |
tree | f0170dbd819fc95c104f22c51c5f4e4eb970852f /src/hid_core/resources/npad | |
parent | Merge pull request #12903 from liamwhite/const-offset (diff) | |
download | yuzu-0ac777460d8b4b3cd2b299c89ba2986f088d5e68.tar yuzu-0ac777460d8b4b3cd2b299c89ba2986f088d5e68.tar.gz yuzu-0ac777460d8b4b3cd2b299c89ba2986f088d5e68.tar.bz2 yuzu-0ac777460d8b4b3cd2b299c89ba2986f088d5e68.tar.lz yuzu-0ac777460d8b4b3cd2b299c89ba2986f088d5e68.tar.xz yuzu-0ac777460d8b4b3cd2b299c89ba2986f088d5e68.tar.zst yuzu-0ac777460d8b4b3cd2b299c89ba2986f088d5e68.zip |
Diffstat (limited to '')
-rw-r--r-- | src/hid_core/resources/npad/npad.cpp | 4 | ||||
-rw-r--r-- | src/hid_core/resources/npad/npad.h | 2 | ||||
-rw-r--r-- | src/hid_core/resources/npad/npad_resource.cpp | 10 | ||||
-rw-r--r-- | src/hid_core/resources/npad/npad_resource.h | 2 |
4 files changed, 14 insertions, 4 deletions
diff --git a/src/hid_core/resources/npad/npad.cpp b/src/hid_core/resources/npad/npad.cpp index 053625b55..e10e97e1c 100644 --- a/src/hid_core/resources/npad/npad.cpp +++ b/src/hid_core/resources/npad/npad.cpp @@ -117,6 +117,10 @@ Result NPad::ActivateNpadResource(u64 aruid) { return npad_resource.Activate(aruid); } +void NPad::FreeAppletResourceId(u64 aruid) { + return npad_resource.FreeAppletResourceId(aruid); +} + void NPad::ControllerUpdate(Core::HID::ControllerTriggerType type, std::size_t controller_idx) { if (type == Core::HID::ControllerTriggerType::All) { ControllerUpdate(Core::HID::ControllerTriggerType::Connected, controller_idx); diff --git a/src/hid_core/resources/npad/npad.h b/src/hid_core/resources/npad/npad.h index c63488346..99e761127 100644 --- a/src/hid_core/resources/npad/npad.h +++ b/src/hid_core/resources/npad/npad.h @@ -58,6 +58,8 @@ public: Result ActivateNpadResource(); Result ActivateNpadResource(u64 aruid); + void FreeAppletResourceId(u64 aruid); + // When the controller is requesting an update for the shared memory void OnUpdate(const Core::Timing::CoreTiming& core_timing); diff --git a/src/hid_core/resources/npad/npad_resource.cpp b/src/hid_core/resources/npad/npad_resource.cpp index 8dd86b58e..79f7d74c0 100644 --- a/src/hid_core/resources/npad/npad_resource.cpp +++ b/src/hid_core/resources/npad/npad_resource.cpp @@ -67,7 +67,7 @@ Result NPadResource::RegisterAppletResourceUserId(u64 aruid) { void NPadResource::UnregisterAppletResourceUserId(u64 aruid) { const u64 aruid_index = GetIndexFromAruid(aruid); - DestroyStyleSetUpdateEvents(aruid); + FreeAppletResourceId(aruid); if (aruid_index < AruidIndexMax) { state[aruid_index] = {}; registration_list.flag[aruid_index] = RegistrationStatus::PendingDelete; @@ -80,14 +80,18 @@ void NPadResource::UnregisterAppletResourceUserId(u64 aruid) { } } -void NPadResource::DestroyStyleSetUpdateEvents(u64 aruid) { +void NPadResource::FreeAppletResourceId(u64 aruid) { const u64 aruid_index = GetIndexFromAruid(aruid); if (aruid_index >= AruidIndexMax) { return; } - for (auto& controller_state : state[aruid_index].controller_state) { + auto& aruid_data = state[aruid_index]; + + aruid_data.flag.is_assigned.Assign(false); + + for (auto& controller_state : aruid_data.controller_state) { if (!controller_state.is_styleset_update_event_initialized) { continue; } diff --git a/src/hid_core/resources/npad/npad_resource.h b/src/hid_core/resources/npad/npad_resource.h index aed89eec6..8ee5702fd 100644 --- a/src/hid_core/resources/npad/npad_resource.h +++ b/src/hid_core/resources/npad/npad_resource.h @@ -55,7 +55,7 @@ public: Result RegisterAppletResourceUserId(u64 aruid); void UnregisterAppletResourceUserId(u64 aruid); - void DestroyStyleSetUpdateEvents(u64 aruid); + void FreeAppletResourceId(u64 aruid); Result Activate(u64 aruid); Result Activate(); |