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

hid: Added hidGetSixAxisSensorStates.

Browse Source 
Internal improvements, etc.
This commit is contained in:
yellows8 2020-11-19 01:07:24 -05:00 committed by fincs
parent 16ff35faea
commit e32acbeb9f
No known key found for this signature in database
GPG Key ID: 62C7609ADA219C60
2 changed files with 63 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -655,13 +655,18 @@ typedef struct HidNpadGcTriggerStateEntry {
HidNpadGcTriggerState state;
} HidNpadGcTriggerStateEntry;
/// HidSixAxisSensorState
typedef struct HidSixAxisSensorState {
u64 unk_1;
u64 timestamp;
SixAxisSensorValues values;
u64 unk_3;
} HidSixAxisSensorState;
/// HidNpadSixAxisSensorState
typedef struct HidNpadSixAxisSensorState {
u64 timestamp;
u64 unk_1;
u64 timestamp_2;
SixAxisSensorValues values;
u64 unk_3;
HidSixAxisSensorState state;
} HidNpadSixAxisSensorState;
/// HidControllerSixAxisLayout
@ -920,6 +925,8 @@ size_t hidGetNpadStatesLucia(HidNpadIdType id, HidNpadLuciaState *states, size_t
size_t hidGetNpadStatesSystemExt(HidNpadIdType id, HidNpadSystemExtState *states, size_t count);
size_t hidGetNpadStatesSystem(HidNpadIdType id, HidNpadSystemState *states, size_t count);
size_t hidGetSixAxisSensorStates(HidSixAxisSensorHandle handle, HidSixAxisSensorState *states, size_t count);
bool hidIsControllerConnected(HidControllerID id);
u64 hidKeysHeld(HidControllerID id);

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

@ -47,6 +47,8 @@ static Result _hidDeactivateNpad(void);
static Result _hidSetDualModeAll(void);
static u8 _hidGetSixAxisSensorHandleNpadStyleIndex(HidSixAxisSensorHandle handle);
NX_GENERATE_SERVICE_GUARD(hid);
Result _hidInitialize(void) {
@ -417,7 +419,7 @@ u8 hidGetAppletFooterUiTypes(HidNpadIdType id) {
return atomic_load_explicit(&_hidGetNpadInternalState(id)->applet_footer_ui_type, memory_order_acquire);
}
static size_t _hidGetStates(HidCommonStateHeader *header, void* in_states, void* states, size_t entrysize, size_t count) {
static size_t _hidGetStates(HidCommonStateHeader *header, void* in_states, size_t sampling_number_offset, void* states, size_t entrysize, size_t count) {
s32 total_entries = (s32)atomic_load_explicit(&header->max_entry, memory_order_acquire);
if (total_entries < 0) total_entries = 0;
if (total_entries > count) total_entries = count;
@ -435,7 +437,7 @@ static size_t _hidGetStates(HidCommonStateHeader *header, void* in_states, void*
memcpy(out_state, &state_entry->state, entrysize);
timestamp1 = atomic_load_explicit(&state_entry->timestamp, memory_order_acquire);
if (timestamp0 != timestamp1 || (i>0 && *((u64*)out_state) - *((u64*)out_state_prev) != 1)) {
if (timestamp0 != timestamp1 || (i>0 && *((u64*)((uintptr_t)out_state+sampling_number_offset)) - *((u64*)((uintptr_t)out_state_prev+sampling_number_offset)) != 1)) {
s32 tmpcount = (s32)atomic_load_explicit(&header->max_entry, memory_order_acquire);
tmpcount = total_entries < tmpcount ? tmpcount : total_entries;
total_entries = tmpcount < count ? tmpcount : count;
@ -451,7 +453,7 @@ static size_t _hidGetStates(HidCommonStateHeader *header, void* in_states, void*
static size_t _hidGetNpadStates(HidNpad *npad, u32 layout, HidNpadStateEntry *states, size_t count) {
HidControllerLayout *states_buf = &npad->layouts[layout];
if (count > 17) count = 17;
return _hidGetStates(&states_buf->header, states_buf->entries, states, sizeof(HidNpadStateEntry), count);
return _hidGetStates(&states_buf->header, states_buf->entries, 0, states, sizeof(HidNpadStateEntry), count);
}
size_t hidGetNpadStatesFullKey(HidNpadIdType id, HidNpadFullKeyState *states, size_t count) {
@ -505,7 +507,7 @@ size_t hidGetNpadStatesGc(HidNpadIdType id, HidNpadGcState *states, size_t count
HidNpad *npad = _hidGetNpadInternalState(id);
size_t total = _hidGetNpadStates(npad, 0, tmp_entries, count);
size_t total2 = _hidGetStates(&npad->npad_gc_trigger_header, npad->npad_gc_trigger_state, tmp_entries_trigger, sizeof(HidNpadGcTriggerState), total);
size_t total2 = _hidGetStates(&npad->npad_gc_trigger_header, npad->npad_gc_trigger_state, 0, tmp_entries_trigger, sizeof(HidNpadGcTriggerState), total);
if (total2 < total) total = total2;
memset(states, 0, sizeof(HidNpadGcState) * total);
@ -655,6 +657,45 @@ size_t hidGetNpadStatesSystem(HidNpadIdType id, HidNpadSystemState *states, size
return total;
}
size_t hidGetSixAxisSensorStates(HidSixAxisSensorHandle handle, HidSixAxisSensorState *states, size_t count) {
u32 index=0;
switch(_hidGetSixAxisSensorHandleNpadStyleIndex(handle)) {
default:
diagAbortWithResult(MAKERESULT(Module_Libnx, LibnxError_ShouldNotHappen));
case 0: // NpadFullKey/NpadPalma
case 5: // NpadGc (not actually returned by GetHandles, NpadFullKey is used instead)
index = 0;
break;
case 1: // NpadHandheld/NpadHandheldLark
index = 1;
break;
case 2: // NpadJoyDual
if (handle.idx==0) index = 2;
else if (handle.idx==1) index = 3;
else diagAbortWithResult(MAKERESULT(Module_Libnx, LibnxError_ShouldNotHappen));
break;
case 3: // NpadJoyLeft
index = 4;
break;
case 4: // NpadJoyRight
index = 5;
break;
case 29: // System(Ext) (not actually returned by GetHandles)
case 30:
return 0;
}
HidNpad *npad = _hidGetNpadInternalState(handle.npad_id_type);
size_t total = _hidGetStates(&npad->sixaxis[index].header, npad->sixaxis[index].entries, sizeof(u64), states, sizeof(HidSixAxisSensorState), count);
return total;
}
bool hidIsControllerConnected(HidControllerID id) {
if (id==CONTROLLER_P1_AUTO)
return hidIsControllerConnected(g_controllerP1AutoID);
@ -872,10 +913,10 @@ u32 hidSixAxisSensorValuesRead(SixAxisSensorValues *values, HidControllerID id,
u64 timestamp = 0;
for (i = 0; i < num_entries; i++) {
if (timestamp && g_sixaxisLayouts[id].entries[entry].timestamp - timestamp != 1)
if (timestamp && g_sixaxisLayouts[id].entries[entry].state.timestamp - timestamp != 1)
break;
memcpy(&values[i], &g_sixaxisLayouts[id].entries[entry].values, sizeof(SixAxisSensorValues));
timestamp = g_sixaxisLayouts[id].entries[entry].timestamp;
memcpy(&values[i], &g_sixaxisLayouts[id].entries[entry].state.values, sizeof(SixAxisSensorValues));
timestamp = g_sixaxisLayouts[id].entries[entry].state.timestamp;
entry++;
if (entry > g_sixaxisLayouts[id].header.max_entry)
@ -1251,6 +1292,10 @@ static HidSixAxisSensorHandle _hidMakeSixAxisSensorHandle(u8 npad_style_index, u
return (HidSixAxisSensorHandle){.npad_style_index = npad_style_index, .npad_id_type = npad_id_type, .idx = idx, .pad = 0};
}
static u8 _hidGetSixAxisSensorHandleNpadStyleIndex(HidSixAxisSensorHandle handle) {
return handle.npad_style_index - 3;
}
static Result _hidGetVibrationDeviceHandles(HidVibrationDeviceHandle *handles, s32 total_handles, HidNpadIdType id, HidNpadStyleTag style) {
Result rc=0;
s32 max_handles=1;