From 3cf15af31e20b62dddcb9d9a19fbdc3a56e021e2 Mon Sep 17 00:00:00 2001 From: german77 Date: Sat, 21 May 2022 16:40:11 -0500 Subject: service: hid: Implement MergeSingleJoyAsDualJoy according to RE --- src/core/hle/service/hid/controllers/npad.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/core/hle/service/hid/controllers/npad.h') 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); -- cgit v1.2.3