mika/libnx
1
0
Fork 0
mirror of https://github.com/switchbrew/libnx.git synced 2025-06-22 13:02:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

hid: Various fixes.

Browse Source
This commit is contained in:
yellows8 2020-11-22 19:46:59 -05:00 committed by fincs
parent d28776e4d9
commit 324a835b0c
No known key found for this signature in database
GPG Key ID: 62C7609ADA219C60
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nx/include/switch/services/hid.h
View File

@ -328,12 +328,12 @@ typedef enum {
/// HidNpadAttribute /// HidNpadAttribute
typedef enum { typedef enum {
NpadAttribute_IsConnected = BIT(0), ///< IsConnected HidNpadAttribute_IsConnected = BIT(0), ///< IsConnected
NpadAttribute_IsWired = BIT(1), ///< IsWired HidNpadAttribute_IsWired = BIT(1), ///< IsWired
NpadAttribute_IsLeftConnected = BIT(2), ///< IsLeftConnected HidNpadAttribute_IsLeftConnected = BIT(2), ///< IsLeftConnected
NpadAttribute_IsLeftWired = BIT(3), ///< IsLeftWired HidNpadAttribute_IsLeftWired = BIT(3), ///< IsLeftWired
NpadAttribute_IsRightConnected = BIT(4), ///< IsRightConnected HidNpadAttribute_IsRightConnected = BIT(4), ///< IsRightConnected
NpadAttribute_IsRightWired = BIT(5), ///< IsRightWired HidNpadAttribute_IsRightWired = BIT(5), ///< IsRightWired
} HidNpadAttribute; } HidNpadAttribute;
/// HidSixAxisSensorAttribute /// HidSixAxisSensorAttribute
@ -464,7 +464,7 @@ typedef enum {
HidAppletFooterUiType_LarkNesLeft = 17, ///< LarkNesLeft HidAppletFooterUiType_LarkNesLeft = 17, ///< LarkNesLeft
HidAppletFooterUiType_LarkNesRight = 18, ///< LarkNesRight HidAppletFooterUiType_LarkNesRight = 18, ///< LarkNesRight
HidAppletFooterUiType_Lucia = 19, ///< Lucia HidAppletFooterUiType_Lucia = 19, ///< Lucia
HidAppletFooterUiType_Verification = 20 , ///< Verification HidAppletFooterUiType_Verification = 20, ///< Verification
} HidAppletFooterUiType; } HidAppletFooterUiType;
/// NpadInterfaceType /// NpadInterfaceType
@ -722,7 +722,7 @@ typedef struct HidNpadHandheldLarkState {
JoystickPosition joysticks[JOYSTICK_NUM_STICKS]; JoystickPosition joysticks[JOYSTICK_NUM_STICKS];
u32 attributes; ///< Bitfield of \ref HidNpadAttribute. u32 attributes; ///< Bitfield of \ref HidNpadAttribute.
HidNpadLarkType lark_type_l_and_main; ///< \ref HidNpadLarkType LarkTypeLAndMain HidNpadLarkType lark_type_l_and_main; ///< \ref HidNpadLarkType LarkTypeLAndMain
u32 lark_type_r; ///< \ref HidNpadLarkType LarkTypeR HidNpadLarkType lark_type_r; ///< \ref HidNpadLarkType LarkTypeR
u32 pad; u32 pad;
} HidNpadHandheldLarkState; } HidNpadHandheldLarkState;

4
nx/source/services/hid.c
View File

@ -258,7 +258,7 @@ void hidScanInput(void) {
} }
g_controllerP1AutoID = CONTROLLER_HANDHELD; g_controllerP1AutoID = CONTROLLER_HANDHELD;
if (g_controllerEntries[CONTROLLER_PLAYER_1].attributes & NpadAttribute_IsConnected) if (g_controllerEntries[CONTROLLER_PLAYER_1].attributes & HidNpadAttribute_IsConnected)
g_controllerP1AutoID = CONTROLLER_PLAYER_1; g_controllerP1AutoID = CONTROLLER_PLAYER_1;
rwlockWriteUnlock(&g_hidLock); rwlockWriteUnlock(&g_hidLock);
@ -706,7 +706,7 @@ bool hidIsControllerConnected(HidControllerID id) {
if (id < 0 || id > 9) return 0; if (id < 0 || id > 9) return 0;
rwlockReadLock(&g_hidLock); rwlockReadLock(&g_hidLock);
bool flag = (g_controllerEntries[id].attributes & NpadAttribute_IsConnected) != 0; bool flag = (g_controllerEntries[id].attributes & HidNpadAttribute_IsConnected) != 0;
rwlockReadUnlock(&g_hidLock); rwlockReadUnlock(&g_hidLock);
return flag; return flag;
} }