diff options
| author | LC <mathew1800@gmail.com> | 2020-09-05 03:31:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-05 03:31:30 +0200 |
| commit | 80a56e8893d7c1118655e176b2a0b5f2c6f48f2b (patch) | |
| tree | 4d335edb664e7d53a818ccd575aa495f807e6921 /src/core/hle/service/hid/hid.cpp | |
| parent | Merge pull request #4596 from FearlessTobi/port-5495 (diff) | |
| parent | hid: Implement MergeSingleJoyasDualJoy (diff) | |
| download | yuzu-80a56e8893d7c1118655e176b2a0b5f2c6f48f2b.tar yuzu-80a56e8893d7c1118655e176b2a0b5f2c6f48f2b.tar.gz yuzu-80a56e8893d7c1118655e176b2a0b5f2c6f48f2b.tar.bz2 yuzu-80a56e8893d7c1118655e176b2a0b5f2c6f48f2b.tar.lz yuzu-80a56e8893d7c1118655e176b2a0b5f2c6f48f2b.tar.xz yuzu-80a56e8893d7c1118655e176b2a0b5f2c6f48f2b.tar.zst yuzu-80a56e8893d7c1118655e176b2a0b5f2c6f48f2b.zip | |
Diffstat (limited to 'src/core/hle/service/hid/hid.cpp')
| -rw-r--r-- | src/core/hle/service/hid/hid.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp index 33416b5dd..bd3c2f26b 100644 --- a/src/core/hle/service/hid/hid.cpp +++ b/src/core/hle/service/hid/hid.cpp @@ -671,13 +671,15 @@ void Hid::SetNpadJoyAssignmentModeDual(Kernel::HLERequestContext& ctx) { void Hid::MergeSingleJoyAsDualJoy(Kernel::HLERequestContext& ctx) { IPC::RequestParser rp{ctx}; - const auto unknown_1{rp.Pop<u32>()}; - const auto unknown_2{rp.Pop<u32>()}; + const auto npad_id_1{rp.Pop<u32>()}; + const auto npad_id_2{rp.Pop<u32>()}; const auto applet_resource_user_id{rp.Pop<u64>()}; - LOG_WARNING(Service_HID, - "(STUBBED) called, unknown_1={}, unknown_2={}, applet_resource_user_id={}", - unknown_1, unknown_2, applet_resource_user_id); + LOG_DEBUG(Service_HID, "called, npad_id_1={}, npad_id_2={}, applet_resource_user_id={}", + npad_id_1, npad_id_2, applet_resource_user_id); + + auto& controller = applet_resource->GetController<Controller_NPad>(HidController::NPad); + controller.MergeSingleJoyAsDualJoy(npad_id_1, npad_id_2); IPC::ResponseBuilder rb{ctx, 2}; rb.Push(RESULT_SUCCESS); |