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

hid: Use _hidActivateConsoleSixAxisSensor instead of _hidActivateSevenSixAxisSensor, and moved the code using this to near the start of hidInitializeSevenSixAxisSensor.

Browse Source
This commit is contained in:
yellows8 2019-11-18 12:38:12 -05:00
parent 167bd9e110
commit 2b6197a51a
No known key found for this signature in database
GPG Key ID: 0AF90DA3F1E60E43
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1078,8 +1078,8 @@ Result hidStopSixAxisSensor(u32 SixAxisSensorHandle) {
return rc; return rc;
} }
static Result _hidActivateSevenSixAxisSensor(void) { static Result _hidActivateConsoleSixAxisSensor(void) {
if (hosversionBefore(5,0,0)) if (hosversionBefore(3,0,0))
return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer); return MAKERESULT(Module_Libnx, LibnxError_IncompatSysVer);
return _hidCmdWithNoInput(303); return _hidCmdWithNoInput(303);
@ -1129,6 +1129,9 @@ Result hidInitializeSevenSixAxisSensor(void) {
if (g_sevenSixAxisSensorBuffer != NULL) if (g_sevenSixAxisSensorBuffer != NULL)
return MAKERESULT(Module_Libnx, LibnxError_AlreadyInitialized); return MAKERESULT(Module_Libnx, LibnxError_AlreadyInitialized);
rc = _hidActivateConsoleSixAxisSensor();
if (R_FAILED(rc)) return rc;
g_sevenSixAxisSensorBuffer = (u8*)memalign(0x1000, bufsize); g_sevenSixAxisSensorBuffer = (u8*)memalign(0x1000, bufsize);
if (g_sevenSixAxisSensorBuffer == NULL) if (g_sevenSixAxisSensorBuffer == NULL)
return MAKERESULT(Module_Libnx, LibnxError_OutOfMemory); return MAKERESULT(Module_Libnx, LibnxError_OutOfMemory);
@ -1139,12 +1142,6 @@ Result hidInitializeSevenSixAxisSensor(void) {
if (R_SUCCEEDED(rc)) rc = _hidInitializeSevenSixAxisSensor(&g_sevenSixAxisSensorTmem0, &g_sevenSixAxisSensorTmem1); if (R_SUCCEEDED(rc)) rc = _hidInitializeSevenSixAxisSensor(&g_sevenSixAxisSensorTmem0, &g_sevenSixAxisSensorTmem1);
if (R_SUCCEEDED(rc)) {
rc = _hidActivateSevenSixAxisSensor();
if (R_FAILED(rc)) hidFinalizeSevenSixAxisSensor();
return rc;
}
if (R_FAILED(rc)) { if (R_FAILED(rc)) {
tmemClose(&g_sevenSixAxisSensorTmem0); tmemClose(&g_sevenSixAxisSensorTmem0);
tmemClose(&g_sevenSixAxisSensorTmem1); tmemClose(&g_sevenSixAxisSensorTmem1);