summaryrefslogtreecommitdiffstats
path: root/src/core/hle/service/hid/controllers/npad.h
diff options
context:
space:
mode:
authorLC <mathew1800@gmail.com>2020-09-05 03:31:30 +0200
committerGitHub <noreply@github.com>2020-09-05 03:31:30 +0200
commit80a56e8893d7c1118655e176b2a0b5f2c6f48f2b (patch)
tree4d335edb664e7d53a818ccd575aa495f807e6921 /src/core/hle/service/hid/controllers/npad.h
parentMerge pull request #4596 from FearlessTobi/port-5495 (diff)
parenthid: Implement MergeSingleJoyasDualJoy (diff)
downloadyuzu-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 '')
-rw-r--r--src/core/hle/service/hid/controllers/npad.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/core/hle/service/hid/controllers/npad.h b/src/core/hle/service/hid/controllers/npad.h
index 75ce5b731..ad25c6fbf 100644
--- a/src/core/hle/service/hid/controllers/npad.h
+++ b/src/core/hle/service/hid/controllers/npad.h
@@ -134,6 +134,7 @@ public:
void ConnectAllDisconnectedControllers();
void ClearAllControllers();
+ void MergeSingleJoyAsDualJoy(u32 npad_id_1, u32 npad_id_2);
void StartLRAssignmentMode();
void StopLRAssignmentMode();
bool SwapNpadAssignment(u32 npad_id_1, u32 npad_id_2);