VERY experimental Nintendo Switch 2 emulator
C++
service: hid: Implement AssigningSingleOnSlSrPress
german771f3c770e7990
diff --git a/src/core/hle/service/hid/hid_system_server.cpp b/src/core/hle/service/hid/hid_system_server.cppindex ead593ab3a..94d566650e 100644--- a/src/core/hle/service/hid/hid_system_server.cpp+++ b/src/core/hle/service/hid/hid_system_server.cpp@@ -251,14 +251,24 @@ void IHidSystemServer::ApplyNpadSystemCommonPolicy(HLERequestContext& ctx) {}void IHidSystemServer::EnableAssigningSingleOnSlSrPress(HLERequestContext& ctx) {- LOG_WARNING(Service_HID, "(STUBBED) called");+ IPC::RequestParser rp{ctx};+ const auto applet_resource_user_id{rp.Pop<u64>()};++ LOG_INFO(Service_HID, "called, applet_resource_user_id={}", applet_resource_user_id);++ GetResourceManager()->GetNpad()->AssigningSingleOnSlSrPress(applet_resource_user_id, true);IPC::ResponseBuilder rb{ctx, 2};rb.Push(ResultSuccess);}void IHidSystemServer::DisableAssigningSingleOnSlSrPress(HLERequestContext& ctx) {- LOG_WARNING(Service_HID, "(STUBBED) called");+ IPC::RequestParser rp{ctx};+ const auto applet_resource_user_id{rp.Pop<u64>()};++ LOG_INFO(Service_HID, "called, applet_resource_user_id={}", applet_resource_user_id);++ GetResourceManager()->GetNpad()->AssigningSingleOnSlSrPress(applet_resource_user_id, false);IPC::ResponseBuilder rb{ctx, 2};rb.Push(ResultSuccess);diff --git a/src/hid_core/resources/npad/npad.cpp b/src/hid_core/resources/npad/npad.cppindex 6be6edb7ec..2995634c5d 100644--- a/src/hid_core/resources/npad/npad.cpp+++ b/src/hid_core/resources/npad/npad.cpp@@ -1368,4 +1368,14 @@ Result NPad::SetNpadSystemExtStateEnabled(u64 aruid, bool is_enabled) {return result;}+Result NPad::AssigningSingleOnSlSrPress(u64 aruid, bool is_enabled) {+ std::scoped_lock lock{mutex};+ bool is_currently_enabled{};+ Result result = npad_resource.IsAssigningSingleOnSlSrPressEnabled(is_currently_enabled, aruid);+ if (result.IsSuccess() && is_enabled != is_currently_enabled) {+ result = npad_resource.SetAssigningSingleOnSlSrPress(aruid, is_enabled);+ }+ return result;+}+} // namespace Service::HIDdiff --git a/src/hid_core/resources/npad/npad.h b/src/hid_core/resources/npad/npad.hindex 73e2780c4a..91bc59afd7 100644--- a/src/hid_core/resources/npad/npad.h+++ b/src/hid_core/resources/npad/npad.h@@ -157,6 +157,8 @@ public:Result SetNpadSystemExtStateEnabled(u64 aruid, bool is_enabled);+ Result AssigningSingleOnSlSrPress(u64 aruid, bool is_enabled);+private:struct VibrationData {bool device_mounted{};