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

hid: Uncomment function that works now

Browse Source
This commit is contained in:
Vicki Pfau 2018-09-28 19:48:49 -07:00 committed by yellows8
parent 8add42378b
commit 7a952ab39b
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -606,6 +606,8 @@ void* hidGetSharedmemAddr(void);
void hidSetControllerLayout(HidControllerID id, HidControllerLayoutType layoutType); void hidSetControllerLayout(HidControllerID id, HidControllerLayoutType layoutType);
HidControllerLayoutType hidGetControllerLayout(HidControllerID id); HidControllerLayoutType hidGetControllerLayout(HidControllerID id);
HidControllerType hidGetControllerType(HidControllerID id);
void hidScanInput(void); void hidScanInput(void);
u64 hidKeysHeld(HidControllerID id); u64 hidKeysHeld(HidControllerID id);

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

@ -269,8 +269,7 @@ void hidScanInput(void) {
rwlockWriteUnlock(&g_hidLock); rwlockWriteUnlock(&g_hidLock);
} }
//TODO: Why is this field in sharedmem zeros? HidControllerType hidGetControllerType(HidControllerID id) {
/*u32 hidGetControllerType(HidControllerID id) {
if (id==CONTROLLER_P1_AUTO) return hidGetControllerType(g_controllerP1AutoID); if (id==CONTROLLER_P1_AUTO) return hidGetControllerType(g_controllerP1AutoID);
if (id < 0 || id > 9) return 0; if (id < 0 || id > 9) return 0;
@ -279,7 +278,7 @@ void hidScanInput(void) {
rwlockReadUnlock(&g_hidLock); rwlockReadUnlock(&g_hidLock);
return tmp; return tmp;
}*/ }
u64 hidKeysHeld(HidControllerID id) { u64 hidKeysHeld(HidControllerID id) {
if (id==CONTROLLER_P1_AUTO) return hidKeysHeld(g_controllerP1AutoID); if (id==CONTROLLER_P1_AUTO) return hidKeysHeld(g_controllerP1AutoID);