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

Copy the HidControllerHeader for each controller into hid state. Added disabled hidGetControllerType().

Browse Source
This commit is contained in:
yellows8 2018-05-12 13:53:11 -04:00
parent d7cbc484ae
commit 3f75b79803
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,6 +17,7 @@ static SharedMemory g_hidSharedmem;
static HidTouchScreenEntry g_touchEntry; static HidTouchScreenEntry g_touchEntry;
static HidMouseEntry g_mouseEntry; static HidMouseEntry g_mouseEntry;
static HidKeyboardEntry g_keyboardEntry; static HidKeyboardEntry g_keyboardEntry;
static HidControllerHeader g_controllerHeaders[10];
static HidControllerInputEntry g_controllerEntries[10]; static HidControllerInputEntry g_controllerEntries[10];
static u64 g_mouseOld, g_mouseHeld, g_mouseDown, g_mouseUp; static u64 g_mouseOld, g_mouseHeld, g_mouseDown, g_mouseUp;
@ -97,6 +98,7 @@ void hidReset(void)
memset(&g_touchEntry, 0, sizeof(HidTouchScreenEntry)); memset(&g_touchEntry, 0, sizeof(HidTouchScreenEntry));
memset(&g_mouseEntry, 0, sizeof(HidMouseEntry)); memset(&g_mouseEntry, 0, sizeof(HidMouseEntry));
memset(&g_keyboardEntry, 0, sizeof(HidKeyboardEntry)); memset(&g_keyboardEntry, 0, sizeof(HidKeyboardEntry));
memset(g_controllerHeaders, 0, sizeof(g_controllerHeaders));
memset(g_controllerEntries, 0, sizeof(g_controllerEntries)); memset(g_controllerEntries, 0, sizeof(g_controllerEntries));
g_mouseOld = g_mouseHeld = g_mouseDown = g_mouseUp = 0; g_mouseOld = g_mouseHeld = g_mouseDown = g_mouseUp = 0;
@ -204,6 +206,7 @@ void hidScanInput(void) {
for (int i = 0; i < 10; i++) { for (int i = 0; i < 10; i++) {
HidControllerLayout *currentLayout = &sharedMem->controllers[i].layouts[g_controllerLayout[i]]; HidControllerLayout *currentLayout = &sharedMem->controllers[i].layouts[g_controllerLayout[i]];
memcpy(&g_controllerHeaders[i], &sharedMem->controllers[i].header, sizeof(HidControllerHeader));
u64 latestControllerEntry = currentLayout->header.latestEntry; u64 latestControllerEntry = currentLayout->header.latestEntry;
HidControllerInputEntry *newInputEntry = &currentLayout->entries[latestControllerEntry]; HidControllerInputEntry *newInputEntry = &currentLayout->entries[latestControllerEntry];
if ((s64)(newInputEntry->timestamp - g_controllerTimestamps[i]) >= 0) { if ((s64)(newInputEntry->timestamp - g_controllerTimestamps[i]) >= 0) {
@ -224,6 +227,18 @@ void hidScanInput(void) {
rwlockWriteUnlock(&g_hidLock); rwlockWriteUnlock(&g_hidLock);
} }
//TODO: Why is this field in sharedmem zeros?
/*u32 hidGetControllerType(HidControllerID id) {
if (id==CONTROLLER_P1_AUTO) return hidGetControllerType(g_controllerP1AutoID);
if (id < 0 || id > 9) return 0;
rwlockReadLock(&g_hidLock);
u32 tmp = g_controllerHeaders[id].type;
rwlockReadUnlock(&g_hidLock);
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);
if (id < 0 || id > 9) return 0; if (id < 0 || id > 9) return 0;