mika/libnx
1
0
Fork 0
mirror of https://github.com/switchbrew/libnx.git synced 2025-07-05 10:52:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed hid in sysmodules

Browse Source
This commit is contained in:
Jakob Dietrich 2018-07-21 15:57:10 +02:00
parent 2bcede91ba
commit 55932a0ed3
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,8 +49,9 @@ Result hidInitialize(void)
u64 AppletResourceUserId; u64 AppletResourceUserId;
rc = appletGetAppletResourceUserId(&AppletResourceUserId); rc = appletGetAppletResourceUserId(&AppletResourceUserId);
// If this failed (for example because we're a sysmodule) AppletResourceUserId stays zero
if (R_FAILED(rc)) if (R_FAILED(rc))
return rc; AppletResourceUserId = 0;
rc = smGetService(&g_hidSrv, "hid"); rc = smGetService(&g_hidSrv, "hid");
if (R_FAILED(rc)) if (R_FAILED(rc))
@ -481,7 +482,7 @@ Result hidSetNpadJoyAssignmentModeSingleByDefault(HidControllerID id) {
rc = appletGetAppletResourceUserId(&AppletResourceUserId); rc = appletGetAppletResourceUserId(&AppletResourceUserId);
if (R_FAILED(rc)) if (R_FAILED(rc))
return rc; AppletResourceUserId = 0;
IpcCommand c; IpcCommand c;
ipcInitialize(&c); ipcInitialize(&c);
@ -525,7 +526,7 @@ Result hidSetNpadJoyAssignmentModeDual(HidControllerID id) {
rc = appletGetAppletResourceUserId(&AppletResourceUserId); rc = appletGetAppletResourceUserId(&AppletResourceUserId);
if (R_FAILED(rc)) if (R_FAILED(rc))
return rc; AppletResourceUserId = 0;
IpcCommand c; IpcCommand c;
ipcInitialize(&c); ipcInitialize(&c);
@ -569,7 +570,7 @@ Result hidMergeSingleJoyAsDualJoy(HidControllerID id0, HidControllerID id1) {
rc = appletGetAppletResourceUserId(&AppletResourceUserId); rc = appletGetAppletResourceUserId(&AppletResourceUserId);
if (R_FAILED(rc)) if (R_FAILED(rc))
return rc; AppletResourceUserId = 0;
IpcCommand c; IpcCommand c;
ipcInitialize(&c); ipcInitialize(&c);
@ -720,7 +721,7 @@ Result hidSendVibrationValue(u32 *VibrationDeviceHandle, HidVibrationValue *Vibr
rc = appletGetAppletResourceUserId(&AppletResourceUserId); rc = appletGetAppletResourceUserId(&AppletResourceUserId);
if (R_FAILED(rc)) if (R_FAILED(rc))
return rc; AppletResourceUserId = 0;
IpcCommand c; IpcCommand c;
ipcInitialize(&c); ipcInitialize(&c);
@ -766,7 +767,7 @@ Result hidGetActualVibrationValue(u32 *VibrationDeviceHandle, HidVibrationValue
rc = appletGetAppletResourceUserId(&AppletResourceUserId); rc = appletGetAppletResourceUserId(&AppletResourceUserId);
if (R_FAILED(rc)) if (R_FAILED(rc))
return rc; AppletResourceUserId = 0;
IpcCommand c; IpcCommand c;
ipcInitialize(&c); ipcInitialize(&c);
@ -881,7 +882,7 @@ Result hidSendVibrationValues(u32 *VibrationDeviceHandles, HidVibrationValue *Vi
rc = appletGetAppletResourceUserId(&AppletResourceUserId); rc = appletGetAppletResourceUserId(&AppletResourceUserId);
if (R_FAILED(rc)) if (R_FAILED(rc))
return rc; AppletResourceUserId = 0;
IpcCommand c; IpcCommand c;
ipcInitialize(&c); ipcInitialize(&c);