VERY experimental Nintendo Switch 2 emulator
C++
service: hid: Free npad applet resource
Narr the Regb765a7e22c42
diff --git a/src/core/hle/service/hid/hid_system_server.cpp b/src/core/hle/service/hid/hid_system_server.cppindex 22471e9e29..7126a1dcd7 100644--- a/src/core/hle/service/hid/hid_system_server.cpp+++ b/src/core/hle/service/hid/hid_system_server.cpp@@ -508,13 +508,8 @@ void IHidSystemServer::RegisterAppletResourceUserId(HLERequestContext& ctx) {Result result = GetResourceManager()->RegisterAppletResourceUserId(parameters.applet_resource_user_id, parameters.enable_input);- if (result.IsSuccess()) {- // result = GetResourceManager()->GetNpad()->RegisterAppletResourceUserId(- // parameters.applet_resource_user_id);- }-IPC::ResponseBuilder rb{ctx, 2};- rb.Push(ResultSuccess);+ rb.Push(result);}void IHidSystemServer::UnregisterAppletResourceUserId(HLERequestContext& ctx) {@@ -524,8 +519,6 @@ void IHidSystemServer::UnregisterAppletResourceUserId(HLERequestContext& ctx) {LOG_INFO(Service_HID, "called, applet_resource_user_id={}", applet_resource_user_id);GetResourceManager()->UnregisterAppletResourceUserId(applet_resource_user_id);- // GetResourceManager()->GetNpad()->UnregisterAppletResourceUserId(applet_resource_user_id);- // GetResourceManager()->GetPalma()->UnregisterAppletResourceUserId(applet_resource_user_id);IPC::ResponseBuilder rb{ctx, 2};rb.Push(ResultSuccess);diff --git a/src/hid_core/resource_manager.cpp b/src/hid_core/resource_manager.cppindex 245da582e5..01261ba972 100644--- a/src/hid_core/resource_manager.cpp+++ b/src/hid_core/resource_manager.cpp@@ -314,6 +314,7 @@ void ResourceManager::UnregisterAppletResourceUserId(u64 aruid) {std::scoped_lock lock{shared_mutex};applet_resource->UnregisterAppletResourceUserId(aruid);npad->UnregisterAppletResourceUserId(aruid);+ // palma->UnregisterAppletResourceUserId(aruid);}Result ResourceManager::GetSharedMemoryHandle(Kernel::KSharedMemory** out_handle, u64 aruid) {@@ -324,6 +325,7 @@ Result ResourceManager::GetSharedMemoryHandle(Kernel::KSharedMemory** out_handlevoid ResourceManager::FreeAppletResourceId(u64 aruid) {std::scoped_lock lock{shared_mutex};applet_resource->FreeAppletResourceId(aruid);+ npad->FreeAppletResourceId(aruid);}void ResourceManager::EnableInput(u64 aruid, bool is_enabled) {diff --git a/src/hid_core/resources/npad/npad.cpp b/src/hid_core/resources/npad/npad.cppindex 053625b55b..e10e97e1c9 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.hindex c634883460..99e761127d 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 memoryvoid 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.cppindex 8dd86b58ed..79f7d74c0c 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.hindex aed89eec69..8ee5702fd4 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();