diff options
| author | 2021-12-05 22:41:21 -0600 | |
|---|---|---|
| committer | 2021-12-05 22:44:31 -0600 | |
| commit | 189741b521e569a7087deee9f92ac66ab4f6f154 (patch) | |
| tree | 89af4b27c9cba49a00c033fbcca47f95f80e8acd /src | |
| parent | Merge pull request #7518 from german77/is_npad_valid (diff) | |
| download | yuzu-189741b521e569a7087deee9f92ac66ab4f6f154.tar.gz yuzu-189741b521e569a7087deee9f92ac66ab4f6f154.tar.xz yuzu-189741b521e569a7087deee9f92ac66ab4f6f154.zip | |
service/hid: Stub SetNpadCaptureButtonAssignment and ClearNpadCaptureButtonAssignment
Used by ring fit adventure 1.2.0
Diffstat (limited to '')
| -rw-r--r-- | src/core/hle/service/hid/hid.cpp | 35 | ||||
| -rw-r--r-- | src/core/hle/service/hid/hid.h | 2 |
2 files changed, 35 insertions, 2 deletions
diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp index b36689552..14f737d39 100644 --- a/src/core/hle/service/hid/hid.cpp +++ b/src/core/hle/service/hid/hid.cpp | |||
| @@ -293,8 +293,8 @@ Hid::Hid(Core::System& system_) | |||
| 293 | {132, &Hid::EnableUnintendedHomeButtonInputProtection, "EnableUnintendedHomeButtonInputProtection"}, | 293 | {132, &Hid::EnableUnintendedHomeButtonInputProtection, "EnableUnintendedHomeButtonInputProtection"}, |
| 294 | {133, nullptr, "SetNpadJoyAssignmentModeSingleWithDestination"}, | 294 | {133, nullptr, "SetNpadJoyAssignmentModeSingleWithDestination"}, |
| 295 | {134, &Hid::SetNpadAnalogStickUseCenterClamp, "SetNpadAnalogStickUseCenterClamp"}, | 295 | {134, &Hid::SetNpadAnalogStickUseCenterClamp, "SetNpadAnalogStickUseCenterClamp"}, |
| 296 | {135, nullptr, "SetNpadCaptureButtonAssignment"}, | 296 | {135, &Hid::SetNpadCaptureButtonAssignment, "SetNpadCaptureButtonAssignment"}, |
| 297 | {136, nullptr, "ClearNpadCaptureButtonAssignment"}, | 297 | {136, &Hid::ClearNpadCaptureButtonAssignment, "ClearNpadCaptureButtonAssignment"}, |
| 298 | {200, &Hid::GetVibrationDeviceInfo, "GetVibrationDeviceInfo"}, | 298 | {200, &Hid::GetVibrationDeviceInfo, "GetVibrationDeviceInfo"}, |
| 299 | {201, &Hid::SendVibrationValue, "SendVibrationValue"}, | 299 | {201, &Hid::SendVibrationValue, "SendVibrationValue"}, |
| 300 | {202, &Hid::GetActualVibrationValue, "GetActualVibrationValue"}, | 300 | {202, &Hid::GetActualVibrationValue, "GetActualVibrationValue"}, |
| @@ -1186,6 +1186,37 @@ void Hid::SetNpadAnalogStickUseCenterClamp(Kernel::HLERequestContext& ctx) { | |||
| 1186 | rb.Push(ResultSuccess); | 1186 | rb.Push(ResultSuccess); |
| 1187 | } | 1187 | } |
| 1188 | 1188 | ||
| 1189 | void Hid::SetNpadCaptureButtonAssignment(Kernel::HLERequestContext& ctx) { | ||
| 1190 | IPC::RequestParser rp{ctx}; | ||
| 1191 | struct Parameters { | ||
| 1192 | Core::HID::NpadStyleSet npad_styleset; | ||
| 1193 | INSERT_PADDING_WORDS_NOINIT(1); | ||
| 1194 | u64 applet_resource_user_id; | ||
| 1195 | Core::HID::NpadButton button; | ||
| 1196 | }; | ||
| 1197 | static_assert(sizeof(Parameters) == 0x18, "Parameters has incorrect size."); | ||
| 1198 | |||
| 1199 | const auto parameters{rp.PopRaw<Parameters>()}; | ||
| 1200 | |||
| 1201 | LOG_WARNING(Service_HID, | ||
| 1202 | "(STUBBED) called, npad_styleset={}, applet_resource_user_id={}, button={}", | ||
| 1203 | parameters.npad_styleset, parameters.applet_resource_user_id, parameters.button); | ||
| 1204 | |||
| 1205 | IPC::ResponseBuilder rb{ctx, 2}; | ||
| 1206 | rb.Push(ResultSuccess); | ||
| 1207 | } | ||
| 1208 | |||
| 1209 | void Hid::ClearNpadCaptureButtonAssignment(Kernel::HLERequestContext& ctx) { | ||
| 1210 | IPC::RequestParser rp{ctx}; | ||
| 1211 | const auto applet_resource_user_id{rp.Pop<u64>()}; | ||
| 1212 | |||
| 1213 | LOG_WARNING(Service_HID, "(STUBBED) called, applet_resource_user_id={}", | ||
| 1214 | applet_resource_user_id); | ||
| 1215 | |||
| 1216 | IPC::ResponseBuilder rb{ctx, 2}; | ||
| 1217 | rb.Push(ResultSuccess); | ||
| 1218 | } | ||
| 1219 | |||
| 1189 | void Hid::GetVibrationDeviceInfo(Kernel::HLERequestContext& ctx) { | 1220 | void Hid::GetVibrationDeviceInfo(Kernel::HLERequestContext& ctx) { |
| 1190 | IPC::RequestParser rp{ctx}; | 1221 | IPC::RequestParser rp{ctx}; |
| 1191 | const auto vibration_device_handle{rp.PopRaw<Core::HID::VibrationDeviceHandle>()}; | 1222 | const auto vibration_device_handle{rp.PopRaw<Core::HID::VibrationDeviceHandle>()}; |
diff --git a/src/core/hle/service/hid/hid.h b/src/core/hle/service/hid/hid.h index ab0084118..d290df161 100644 --- a/src/core/hle/service/hid/hid.h +++ b/src/core/hle/service/hid/hid.h | |||
| @@ -136,6 +136,8 @@ private: | |||
| 136 | void IsUnintendedHomeButtonInputProtectionEnabled(Kernel::HLERequestContext& ctx); | 136 | void IsUnintendedHomeButtonInputProtectionEnabled(Kernel::HLERequestContext& ctx); |
| 137 | void EnableUnintendedHomeButtonInputProtection(Kernel::HLERequestContext& ctx); | 137 | void EnableUnintendedHomeButtonInputProtection(Kernel::HLERequestContext& ctx); |
| 138 | void SetNpadAnalogStickUseCenterClamp(Kernel::HLERequestContext& ctx); | 138 | void SetNpadAnalogStickUseCenterClamp(Kernel::HLERequestContext& ctx); |
| 139 | void SetNpadCaptureButtonAssignment(Kernel::HLERequestContext& ctx); | ||
| 140 | void ClearNpadCaptureButtonAssignment(Kernel::HLERequestContext& ctx); | ||
| 139 | void GetVibrationDeviceInfo(Kernel::HLERequestContext& ctx); | 141 | void GetVibrationDeviceInfo(Kernel::HLERequestContext& ctx); |
| 140 | void SendVibrationValue(Kernel::HLERequestContext& ctx); | 142 | void SendVibrationValue(Kernel::HLERequestContext& ctx); |
| 141 | void GetActualVibrationValue(Kernel::HLERequestContext& ctx); | 143 | void GetActualVibrationValue(Kernel::HLERequestContext& ctx); |