diff options
| author | german77 <juangerman-13@hotmail.com> | 2022-05-21 23:40:11 +0200 |
|---|---|---|
| committer | Narr the Reg <juangerman-13@hotmail.com> | 2022-05-27 17:21:09 +0200 |
| commit | 3cf15af31e20b62dddcb9d9a19fbdc3a56e021e2 (patch) | |
| tree | 5b70b8d48ea5e347e551ba334f516055891b5ab2 /src/core/hle/service/hid/controllers/npad.h | |
| parent | service: hid: Add error handling to setNpadAssignment and variants (diff) | |
| download | yuzu-3cf15af31e20b62dddcb9d9a19fbdc3a56e021e2.tar yuzu-3cf15af31e20b62dddcb9d9a19fbdc3a56e021e2.tar.gz yuzu-3cf15af31e20b62dddcb9d9a19fbdc3a56e021e2.tar.bz2 yuzu-3cf15af31e20b62dddcb9d9a19fbdc3a56e021e2.tar.lz yuzu-3cf15af31e20b62dddcb9d9a19fbdc3a56e021e2.tar.xz yuzu-3cf15af31e20b62dddcb9d9a19fbdc3a56e021e2.tar.zst yuzu-3cf15af31e20b62dddcb9d9a19fbdc3a56e021e2.zip | |
Diffstat (limited to 'src/core/hle/service/hid/controllers/npad.h')
| -rw-r--r-- | src/core/hle/service/hid/controllers/npad.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/hle/service/hid/controllers/npad.h b/src/core/hle/service/hid/controllers/npad.h index f03e9294d..5305e8cf8 100644 --- a/src/core/hle/service/hid/controllers/npad.h +++ b/src/core/hle/service/hid/controllers/npad.h @@ -174,7 +174,8 @@ public: void ConnectAllDisconnectedControllers(); void ClearAllControllers(); - void MergeSingleJoyAsDualJoy(Core::HID::NpadIdType npad_id_1, Core::HID::NpadIdType npad_id_2); + ResultCode MergeSingleJoyAsDualJoy(Core::HID::NpadIdType npad_id_1, + Core::HID::NpadIdType npad_id_2); void StartLRAssignmentMode(); void StopLRAssignmentMode(); ResultCode SwapNpadAssignment(Core::HID::NpadIdType npad_id_1, Core::HID::NpadIdType npad_id_2); |