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

Added partial support for hid SixAxisSensor. Moved some hid ipc code into a single func for using cmds with an input u32. Moved handle-generation code from hidInitializeVibrationDevices into a new func, with some improvements + support for SixAxisSensor.

Browse Source
This commit is contained in:
yellows8 2018-09-26 22:28:40 -04:00
parent 3bd7ca5f7e
commit 1267019d83
2 changed files with 57 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -625,3 +625,12 @@ Result hidIsVibrationPermitted(bool *flag);
/// Send VibrationValues[index] to VibrationDeviceHandles[index], where count is the number of entries in the VibrationDeviceHandles/VibrationValues arrays.
Result hidSendVibrationValues(u32 *VibrationDeviceHandles, HidVibrationValue *VibrationValues, size_t count);
/// Gets SixAxisSensorHandles. total_handles==2 can only be used with TYPE_JOYCON_PAIR.
Result hidGetSixAxisSensorHandles(u32 *SixAxisSensorHandles, size_t total_handles, HidControllerID id, HidControllerType type);
/// Starts the SixAxisSensor for the specified handle.
Result hidStartSixAxisSensor(u32 SixAxisSensorHandle);
/// Stops the SixAxisSensor for the specified handle.
Result hidStopSixAxisSensor(u32 SixAxisSensorHandle);

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

@ -481,7 +481,7 @@ static Result _hidGetSharedMemoryHandle(Service* srv, Handle* handle_out) {
return rc;
}
Result hidSetNpadJoyAssignmentModeSingleByDefault(HidControllerID id) {
static Result _hidCmdWithInputU32(u64 cmd_id, u32 inputval) {
Result rc;
u64 AppletResourceUserId;
@ -495,7 +495,7 @@ Result hidSetNpadJoyAssignmentModeSingleByDefault(HidControllerID id) {
struct {
u64 magic;
u64 cmd_id;
u32 id;
u32 val;
u64 AppletResourceUserId;
} *raw;
@ -504,8 +504,8 @@ Result hidSetNpadJoyAssignmentModeSingleByDefault(HidControllerID id) {
raw = ipcPrepareHeader(&c, sizeof(*raw));
raw->magic = SFCI_MAGIC;
raw->cmd_id = 122;
raw->id = id;
raw->cmd_id = cmd_id;
raw->val = inputval;
raw->AppletResourceUserId = AppletResourceUserId;
rc = serviceIpcDispatch(&g_hidSrv);
@ -525,48 +525,12 @@ Result hidSetNpadJoyAssignmentModeSingleByDefault(HidControllerID id) {
return rc;
}
Result hidSetNpadJoyAssignmentModeSingleByDefault(HidControllerID id) {
return _hidCmdWithInputU32(122, id);
}
Result hidSetNpadJoyAssignmentModeDual(HidControllerID id) {
Result rc;
u64 AppletResourceUserId;
rc = appletGetAppletResourceUserId(&AppletResourceUserId);
if (R_FAILED(rc))
AppletResourceUserId = 0;
IpcCommand c;
ipcInitialize(&c);
struct {
u64 magic;
u64 cmd_id;
u32 id;
u64 AppletResourceUserId;
} *raw;
ipcSendPid(&c);
raw = ipcPrepareHeader(&c, sizeof(*raw));
raw->magic = SFCI_MAGIC;
raw->cmd_id = 124;
raw->id = id;
raw->AppletResourceUserId = AppletResourceUserId;
rc = serviceIpcDispatch(&g_hidSrv);
if (R_SUCCEEDED(rc)) {
IpcParsedCommand r;
ipcParse(&r);
struct {
u64 magic;
u64 result;
} *resp = r.Raw;
rc = resp->result;
}
return rc;
return _hidCmdWithInputU32(124, id);
}
Result hidMergeSingleJoyAsDualJoy(HidControllerID id0, HidControllerID id1) {
@ -924,14 +888,12 @@ Result hidSendVibrationValues(u32 *VibrationDeviceHandles, HidVibrationValue *Vi
return rc;
}
Result hidInitializeVibrationDevices(u32 *VibrationDeviceHandles, size_t total_handles, HidControllerID id, HidControllerType type) {
static Result _hidGetDeviceHandles(u32 devicetype, u32 *DeviceHandles, size_t total_handles, HidControllerID id, HidControllerType type) {
Result rc=0;
Service srv;
u32 tmp_type = type & 0xff;
u32 tmp_id = id;
size_t i;
if (total_handles == 0 || total_handles > 2)
if (total_handles == 0 || total_handles > 2 || devicetype > 1)
return MAKERESULT(Module_Libnx, LibnxError_BadInput);
if (tmp_id == CONTROLLER_HANDHELD)
@ -951,28 +913,48 @@ Result hidInitializeVibrationDevices(u32 *VibrationDeviceHandles, size_t total_h
}
else if (tmp_type & TYPE_JOYCON_RIGHT) {
tmp_type = 7;
tmp_type |= 0x010000;
tmp_type |= 0x010000;//TODO: Does SixAxis need this?
}
//The HidControllerID enum doesn't have bit29/bit30 checked by official sw, for tmp_type 0x20/0x21.
//Official sw checks for these bits but libnx hid.h doesn't have these currently.
else if (tmp_type & BIT(29)) {
tmp_type = 0x20;
}
else if (tmp_type & BIT(30)) {
tmp_type = 0x21;
}
else {
return MAKERESULT(Module_Libnx, LibnxError_BadInput);
}
VibrationDeviceHandles[0] = tmp_type | (tmp_id & 0xff)<<8;
DeviceHandles[0] = tmp_type | (tmp_id & 0xff)<<8;
if (devicetype==1 && (tmp_type==3 || tmp_type==4))
DeviceHandles[0] |= 0x020000;
if (total_handles > 1) {
tmp_type &= 0xff;
if (tmp_type!=6 && tmp_type!=7) {
VibrationDeviceHandles[1] = VibrationDeviceHandles[0] | 0x010000;
if (devicetype==0 && (tmp_type!=6 && tmp_type!=7)) {
DeviceHandles[1] = DeviceHandles[0] | 0x010000;
}
else if (devicetype==1 && tmp_type==5) {
DeviceHandles[1] = DeviceHandles[0] | 0x010000;
}
else {
return MAKERESULT(Module_Libnx, LibnxError_BadInput);
}
}
return rc;
}
Result hidInitializeVibrationDevices(u32 *VibrationDeviceHandles, size_t total_handles, HidControllerID id, HidControllerType type) {
Result rc=0;
Service srv;
size_t i;
rc = _hidGetDeviceHandles(0, VibrationDeviceHandles, total_handles, id, type);
if (R_FAILED(rc)) return rc;
for (i=0; i<total_handles; i++) {
rc = _hidCreateActiveVibrationDeviceList(&srv);
if (R_FAILED(rc))
@ -988,3 +970,15 @@ Result hidInitializeVibrationDevices(u32 *VibrationDeviceHandles, size_t total_h
return rc;
}
Result hidGetSixAxisSensorHandles(u32 *SixAxisSensorHandles, size_t total_handles, HidControllerID id, HidControllerType type) {
return _hidGetDeviceHandles(1, SixAxisSensorHandles, total_handles, id, type);
}
Result hidStartSixAxisSensor(u32 SixAxisSensorHandle) {
return _hidCmdWithInputU32(66, SixAxisSensorHandle);
}
Result hidStopSixAxisSensor(u32 SixAxisSensorHandle) {
return _hidCmdWithInputU32(67, SixAxisSensorHandle);
}