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

hid: move official/libnx controller converters to hid.h

Browse Source
This commit is contained in:
averne 2019-01-27 00:24:11 +01:00 committed by fincs
parent fea5cf13b0
commit bfa678be8a
3 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -600,6 +600,18 @@ typedef struct HidVibrationValue
float freq_high; ///< High Band frequency in Hz. float freq_high; ///< High Band frequency in Hz.
} HidVibrationValue; } HidVibrationValue;
static inline u32 _hidControllerIDToOfficial(HidControllerID id) {
if (id < CONTROLLER_HANDHELD) return id;
if (id == CONTROLLER_HANDHELD) return 0x20;
return 0x10;//For CONTROLLER_UNKNOWN and invalid values return this.
}
static inline HidControllerID _hidOfficialToControllerID(u64 id) {
if (id < 8) return id;
if (id == 0x20) return CONTROLLER_HANDHELD;
return CONTROLLER_UNKNOWN;
}
Result hidInitialize(void); Result hidInitialize(void);
void hidExit(void); void hidExit(void);
void hidReset(void); void hidReset(void);

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

@ -154,12 +154,6 @@ void hidReset(void)
rwlockWriteUnlock(&g_hidLock); rwlockWriteUnlock(&g_hidLock);
} }
static u32 _hidControllerIDToOfficial(HidControllerID id) {
if (id < CONTROLLER_HANDHELD) return id;
if (id == CONTROLLER_HANDHELD) return 0x20;
return 0x10;//For CONTROLLER_UNKNOWN and invalid values return this.
}
Service* hidGetSessionService(void) { Service* hidGetSessionService(void) {
return &g_hidSrv; return &g_hidSrv;
} }

12
nx/source/services/nfpu.c
View File

@ -106,18 +106,6 @@ static Result _nfpuCreateInterface(void) {
return rc; return rc;
} }
static u32 _hidControllerIDToOfficial(HidControllerID id) {
if (id < CONTROLLER_HANDHELD) return id;
if (id == CONTROLLER_HANDHELD) return 0x20;
return 0x10;
}
static HidControllerID _hidOfficialToControllerID(u64 id) {
if (id < 8) return id;
if (id == 0x20) return CONTROLLER_HANDHELD;
return CONTROLLER_UNKNOWN;
}
static Result _nfpuInterfaceCmdNoInOut(u64 cmd_id) { static Result _nfpuInterfaceCmdNoInOut(u64 cmd_id) {
IpcCommand c; IpcCommand c;
ipcInitialize(&c); ipcInitialize(&c);