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: Updated structs.

Browse Source
This commit is contained in:
yellows8 2020-11-23 00:07:02 -05:00 committed by fincs
parent dab3750c50
commit 5e03104d1d
No known key found for this signature in database
GPG Key ID: 62C7609ADA219C60
2 changed files with 41 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -842,8 +842,8 @@ typedef struct HidNfcXcdDeviceHandleState {
HidNfcXcdDeviceHandleStateImplAtomicStorage storage[2]; HidNfcXcdDeviceHandleStateImplAtomicStorage storage[2];
} HidNfcXcdDeviceHandleState; } HidNfcXcdDeviceHandleState;
/// HidNpad /// HidNpadInternalState
typedef struct HidNpad { typedef struct HidNpadInternalState {
u32 style_set; ///< Bitfield of \ref HidNpadStyleTag. u32 style_set; ///< Bitfield of \ref HidNpadStyleTag.
u32 joy_assignment_mode; ///< \ref HidNpadJoyAssignmentMode u32 joy_assignment_mode; ///< \ref HidNpadJoyAssignmentMode
HidNpadFullKeyColorState full_key_color; ///< \ref HidNpadFullKeyColorState HidNpadFullKeyColorState full_key_color; ///< \ref HidNpadFullKeyColorState
@ -863,17 +863,27 @@ typedef struct HidNpad {
struct { struct {
u32 applet_footer_ui_attribute; ///< Bitfield of AppletFooterUiAttribute. u32 applet_footer_ui_attribute; ///< Bitfield of AppletFooterUiAttribute.
u8 applet_footer_ui_type; ///< \ref HidAppletFooterUiType u8 applet_footer_ui_type; ///< \ref HidAppletFooterUiType
u8 unk_x41AD[0x5B]; u8 reserved_x41AD[0x5B];
}; };
}; };
u8 unk_x4208[0x20]; u8 reserved_x4208[0x20]; ///< Mutex on pre-10.0.0.
HidNpadGcTriggerLifo gc_trigger_lifo; HidNpadGcTriggerLifo gc_trigger_lifo;
u32 lark_type_l_and_main; ///< \ref HidNpadLarkType u32 lark_type_l_and_main; ///< \ref HidNpadLarkType
u32 lark_type_r; ///< \ref HidNpadLarkType u32 lark_type_r; ///< \ref HidNpadLarkType
u32 lucia_type; ///< \ref HidNpadLuciaType u32 lucia_type; ///< \ref HidNpadLuciaType
u32 unk_x43EC; u32 unk_x43EC;
u8 unk_x43F0[0xC10]; } HidNpadInternalState;
} HidNpad;
/// HidNpadSharedMemoryEntry
typedef struct HidNpadSharedMemoryEntry {
HidNpadInternalState internal_state;
u8 pad[0xC10];
} HidNpadSharedMemoryEntry;
/// HidNpadSharedMemoryFormat
typedef struct HidNpadSharedMemoryFormat {
HidNpadSharedMemoryEntry entries[10];
} HidNpadSharedMemoryFormat;
// End HidNpad // End HidNpad
@ -946,7 +956,7 @@ typedef struct HidSharedMemory {
u8 capture_button[0x200]; u8 capture_button[0x200];
u8 input_detector[0x800]; u8 input_detector[0x800];
u8 unique_pad[0x4000]; ///< [1.0.0-4.1.0] UniquePad u8 unique_pad[0x4000]; ///< [1.0.0-4.1.0] UniquePad
HidNpad npad[10]; HidNpadSharedMemoryFormat npad;
HidGestureSharedMemoryFormat gesture; HidGestureSharedMemoryFormat gesture;
HidConsoleSixAxisSensor console_six_axis_sensor; ///< [5.0.0+] ConsoleSixAxisSensor HidConsoleSixAxisSensor console_six_axis_sensor; ///< [5.0.0+] ConsoleSixAxisSensor
u8 unk_x3C220[0x3DE0]; u8 unk_x3C220[0x3DE0];

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

@ -265,17 +265,17 @@ void hidScanInput(void) {
rwlockWriteUnlock(&g_hidLock); rwlockWriteUnlock(&g_hidLock);
} }
static HidNpad* _hidGetNpadInternalState(HidNpadIdType id) { static HidNpadInternalState* _hidGetNpadInternalState(HidNpadIdType id) {
HidSharedMemory *sharedmem = (HidSharedMemory*)hidGetSharedmemAddr(); HidSharedMemory *sharedmem = (HidSharedMemory*)hidGetSharedmemAddr();
if (sharedmem == NULL) if (sharedmem == NULL)
diagAbortWithResult(MAKERESULT(Module_Libnx, LibnxError_NotInitialized)); diagAbortWithResult(MAKERESULT(Module_Libnx, LibnxError_NotInitialized));
if (id <= HidNpadIdType_No8) if (id <= HidNpadIdType_No8)
return &sharedmem->npad[id]; return &sharedmem->npad.entries[id].internal_state;
else if (id == HidNpadIdType_Handheld) else if (id == HidNpadIdType_Handheld)
return &sharedmem->npad[8]; return &sharedmem->npad.entries[8].internal_state;
else if (id == HidNpadIdType_Other) else if (id == HidNpadIdType_Other)
return &sharedmem->npad[9]; return &sharedmem->npad.entries[9].internal_state;
else else
diagAbortWithResult(MAKERESULT(Module_Libnx, LibnxError_BadInput)); diagAbortWithResult(MAKERESULT(Module_Libnx, LibnxError_BadInput));
} }
@ -285,7 +285,7 @@ u32 hidGetNpadStyleSet(HidNpadIdType id) {
} }
HidNpadJoyAssignmentMode hidGetNpadJoyAssignment(HidNpadIdType id) { HidNpadJoyAssignmentMode hidGetNpadJoyAssignment(HidNpadIdType id) {
HidNpad *npad = _hidGetNpadInternalState(id); HidNpadInternalState *npad = _hidGetNpadInternalState(id);
HidNpadJoyAssignmentMode tmp = atomic_load_explicit(&npad->joy_assignment_mode, memory_order_acquire); HidNpadJoyAssignmentMode tmp = atomic_load_explicit(&npad->joy_assignment_mode, memory_order_acquire);
if (tmp != HidNpadJoyAssignmentMode_Dual && tmp != HidNpadJoyAssignmentMode_Single) if (tmp != HidNpadJoyAssignmentMode_Dual && tmp != HidNpadJoyAssignmentMode_Single)
@ -296,7 +296,7 @@ HidNpadJoyAssignmentMode hidGetNpadJoyAssignment(HidNpadIdType id) {
Result hidGetNpadControllerColorSingle(HidNpadIdType id, HidNpadControllerColor *color) { Result hidGetNpadControllerColorSingle(HidNpadIdType id, HidNpadControllerColor *color) {
Result rc = 0; Result rc = 0;
HidNpad *npad = _hidGetNpadInternalState(id); HidNpadInternalState *npad = _hidGetNpadInternalState(id);
HidColorAttribute attribute = npad->full_key_color.attribute; HidColorAttribute attribute = npad->full_key_color.attribute;
if (attribute==HidColorAttribute_NoController) rc = MAKERESULT(202, 604); if (attribute==HidColorAttribute_NoController) rc = MAKERESULT(202, 604);
@ -311,7 +311,7 @@ Result hidGetNpadControllerColorSingle(HidNpadIdType id, HidNpadControllerColor
Result hidGetNpadControllerColorSplit(HidNpadIdType id, HidNpadControllerColor *color_left, HidNpadControllerColor *color_right) { Result hidGetNpadControllerColorSplit(HidNpadIdType id, HidNpadControllerColor *color_left, HidNpadControllerColor *color_right) {
Result rc = 0; Result rc = 0;
HidNpad *npad = _hidGetNpadInternalState(id); HidNpadInternalState *npad = _hidGetNpadInternalState(id);
HidColorAttribute attribute = npad->joy_color.attribute; HidColorAttribute attribute = npad->joy_color.attribute;
if (attribute==HidColorAttribute_NoController) rc = MAKERESULT(202, 604); if (attribute==HidColorAttribute_NoController) rc = MAKERESULT(202, 604);
@ -338,7 +338,7 @@ void hidGetNpadSystemButtonProperties(HidNpadIdType id, HidNpadSystemButtonPrope
*out = atomic_load_explicit(&_hidGetNpadInternalState(id)->system_button_properties, memory_order_acquire); *out = atomic_load_explicit(&_hidGetNpadInternalState(id)->system_button_properties, memory_order_acquire);
} }
static void _hidGetNpadPowerInfo(HidNpad *npad, HidPowerInfo *info, u32 powerInfo, u32 i) { static void _hidGetNpadPowerInfo(HidNpadInternalState *npad, HidPowerInfo *info, u32 powerInfo, u32 i) {
info->battery_level = atomic_load_explicit(&npad->battery_level[i], memory_order_acquire); info->battery_level = atomic_load_explicit(&npad->battery_level[i], memory_order_acquire);
if (info->battery_level > 4) info->battery_level = 4; // sdknso would Abort when this occurs. if (info->battery_level > 4) info->battery_level = 4; // sdknso would Abort when this occurs.
@ -347,7 +347,7 @@ static void _hidGetNpadPowerInfo(HidNpad *npad, HidPowerInfo *info, u32 powerInf
} }
void hidGetNpadPowerInfoSingle(HidNpadIdType id, HidPowerInfo *info) { void hidGetNpadPowerInfoSingle(HidNpadIdType id, HidPowerInfo *info) {
HidNpad *npad = _hidGetNpadInternalState(id); HidNpadInternalState *npad = _hidGetNpadInternalState(id);
HidNpadSystemProperties properties; HidNpadSystemProperties properties;
properties = atomic_load_explicit(&npad->system_properties, memory_order_acquire); properties = atomic_load_explicit(&npad->system_properties, memory_order_acquire);
@ -356,7 +356,7 @@ void hidGetNpadPowerInfoSingle(HidNpadIdType id, HidPowerInfo *info) {
} }
void hidGetNpadPowerInfoSplit(HidNpadIdType id, HidPowerInfo *info_left, HidPowerInfo *info_right) { void hidGetNpadPowerInfoSplit(HidNpadIdType id, HidPowerInfo *info_left, HidPowerInfo *info_right) {
HidNpad *npad = _hidGetNpadInternalState(id); HidNpadInternalState *npad = _hidGetNpadInternalState(id);
HidNpadSystemProperties properties; HidNpadSystemProperties properties;
properties = atomic_load_explicit(&npad->system_properties, memory_order_acquire); properties = atomic_load_explicit(&npad->system_properties, memory_order_acquire);
@ -455,14 +455,14 @@ void hidInitializeNpad(void) {
if (R_FAILED(rc)) diagAbortWithResult(rc); if (R_FAILED(rc)) diagAbortWithResult(rc);
} }
static size_t _hidGetNpadStates(HidNpad *npad, u32 layout, HidNpadCommonState *states, size_t count) { static size_t _hidGetNpadStates(HidNpadInternalState *npad, u32 layout, HidNpadCommonState *states, size_t count) {
HidNpadCommonLifo *states_buf = &npad->layouts[layout]; HidNpadCommonLifo *states_buf = &npad->layouts[layout];
if (count > 17) count = 17; if (count > 17) count = 17;
return _hidGetStates(&states_buf->header, states_buf->storage, 17, offsetof(HidNpadCommonStateAtomicStorage,state), offsetof(HidNpadCommonState,sampling_number), states, sizeof(HidNpadCommonState), count); return _hidGetStates(&states_buf->header, states_buf->storage, 17, offsetof(HidNpadCommonStateAtomicStorage,state), offsetof(HidNpadCommonState,sampling_number), states, sizeof(HidNpadCommonState), count);
} }
size_t hidGetNpadStatesFullKey(HidNpadIdType id, HidNpadFullKeyState *states, size_t count) { size_t hidGetNpadStatesFullKey(HidNpadIdType id, HidNpadFullKeyState *states, size_t count) {
HidNpad *npad = _hidGetNpadInternalState(id); HidNpadInternalState *npad = _hidGetNpadInternalState(id);
size_t total = _hidGetNpadStates(npad, 0, states, count); size_t total = _hidGetNpadStates(npad, 0, states, count);
// sdknso would handle button-bitmasking with ControlPadRestriction here. // sdknso would handle button-bitmasking with ControlPadRestriction here.
@ -471,7 +471,7 @@ size_t hidGetNpadStatesFullKey(HidNpadIdType id, HidNpadFullKeyState *states, si
} }
size_t hidGetNpadStatesHandheld(HidNpadIdType id, HidNpadHandheldState *states, size_t count) { size_t hidGetNpadStatesHandheld(HidNpadIdType id, HidNpadHandheldState *states, size_t count) {
HidNpad *npad = _hidGetNpadInternalState(id); HidNpadInternalState *npad = _hidGetNpadInternalState(id);
size_t total = _hidGetNpadStates(npad, 1, states, count); size_t total = _hidGetNpadStates(npad, 1, states, count);
// sdknso would handle button-bitmasking with ControlPadRestriction here. // sdknso would handle button-bitmasking with ControlPadRestriction here.
@ -480,7 +480,7 @@ size_t hidGetNpadStatesHandheld(HidNpadIdType id, HidNpadHandheldState *states,
} }
size_t hidGetNpadStatesJoyDual(HidNpadIdType id, HidNpadJoyDualState *states, size_t count) { size_t hidGetNpadStatesJoyDual(HidNpadIdType id, HidNpadJoyDualState *states, size_t count) {
HidNpad *npad = _hidGetNpadInternalState(id); HidNpadInternalState *npad = _hidGetNpadInternalState(id);
size_t total = _hidGetNpadStates(npad, 2, states, count); size_t total = _hidGetNpadStates(npad, 2, states, count);
// sdknso would handle button-bitmasking with ControlPadRestriction here. // sdknso would handle button-bitmasking with ControlPadRestriction here.
@ -489,7 +489,7 @@ size_t hidGetNpadStatesJoyDual(HidNpadIdType id, HidNpadJoyDualState *states, si
} }
size_t hidGetNpadStatesJoyLeft(HidNpadIdType id, HidNpadJoyLeftState *states, size_t count) { size_t hidGetNpadStatesJoyLeft(HidNpadIdType id, HidNpadJoyLeftState *states, size_t count) {
HidNpad *npad = _hidGetNpadInternalState(id); HidNpadInternalState *npad = _hidGetNpadInternalState(id);
size_t total = _hidGetNpadStates(npad, 3, states, count); size_t total = _hidGetNpadStates(npad, 3, states, count);
// sdknso would handle button-bitmasking with ControlPadRestriction here. // sdknso would handle button-bitmasking with ControlPadRestriction here.
@ -498,7 +498,7 @@ size_t hidGetNpadStatesJoyLeft(HidNpadIdType id, HidNpadJoyLeftState *states, si
} }
size_t hidGetNpadStatesJoyRight(HidNpadIdType id, HidNpadJoyRightState *states, size_t count) { size_t hidGetNpadStatesJoyRight(HidNpadIdType id, HidNpadJoyRightState *states, size_t count) {
HidNpad *npad = _hidGetNpadInternalState(id); HidNpadInternalState *npad = _hidGetNpadInternalState(id);
size_t total = _hidGetNpadStates(npad, 4, states, count); size_t total = _hidGetNpadStates(npad, 4, states, count);
// sdknso would handle button-bitmasking with ControlPadRestriction here. // sdknso would handle button-bitmasking with ControlPadRestriction here.
@ -510,7 +510,7 @@ size_t hidGetNpadStatesGc(HidNpadIdType id, HidNpadGcState *states, size_t count
HidNpadCommonState tmp_entries[17]; HidNpadCommonState tmp_entries[17];
HidNpadGcTriggerState tmp_entries_trigger[17]; HidNpadGcTriggerState tmp_entries_trigger[17];
HidNpad *npad = _hidGetNpadInternalState(id); HidNpadInternalState *npad = _hidGetNpadInternalState(id);
size_t total = _hidGetNpadStates(npad, 0, tmp_entries, count); size_t total = _hidGetNpadStates(npad, 0, tmp_entries, count);
size_t total2 = _hidGetStates(&npad->gc_trigger_lifo.header, npad->gc_trigger_lifo.storage, 17, offsetof(HidNpadGcTriggerStateAtomicStorage,state), offsetof(HidNpadGcTriggerState,sampling_number), tmp_entries_trigger, sizeof(HidNpadGcTriggerState), total); size_t total2 = _hidGetStates(&npad->gc_trigger_lifo.header, npad->gc_trigger_lifo.storage, 17, offsetof(HidNpadGcTriggerStateAtomicStorage,state), offsetof(HidNpadGcTriggerState,sampling_number), tmp_entries_trigger, sizeof(HidNpadGcTriggerState), total);
if (total2 < total) total = total2; if (total2 < total) total = total2;
@ -535,7 +535,7 @@ size_t hidGetNpadStatesGc(HidNpadIdType id, HidNpadGcState *states, size_t count
} }
size_t hidGetNpadStatesPalma(HidNpadIdType id, HidNpadPalmaState *states, size_t count) { size_t hidGetNpadStatesPalma(HidNpadIdType id, HidNpadPalmaState *states, size_t count) {
HidNpad *npad = _hidGetNpadInternalState(id); HidNpadInternalState *npad = _hidGetNpadInternalState(id);
size_t total = _hidGetNpadStates(npad, 5, states, count); size_t total = _hidGetNpadStates(npad, 5, states, count);
// sdknso doesn't handle ControlPadRestriction with this. // sdknso doesn't handle ControlPadRestriction with this.
@ -546,7 +546,7 @@ size_t hidGetNpadStatesPalma(HidNpadIdType id, HidNpadPalmaState *states, size_t
size_t hidGetNpadStatesLark(HidNpadIdType id, HidNpadLarkState *states, size_t count) { size_t hidGetNpadStatesLark(HidNpadIdType id, HidNpadLarkState *states, size_t count) {
HidNpadCommonState tmp_entries[17]; HidNpadCommonState tmp_entries[17];
HidNpad *npad = _hidGetNpadInternalState(id); HidNpadInternalState *npad = _hidGetNpadInternalState(id);
size_t total = _hidGetNpadStates(npad, 0, tmp_entries, count); size_t total = _hidGetNpadStates(npad, 0, tmp_entries, count);
memset(states, 0, sizeof(HidNpadLarkState) * total); memset(states, 0, sizeof(HidNpadLarkState) * total);
@ -573,7 +573,7 @@ size_t hidGetNpadStatesLark(HidNpadIdType id, HidNpadLarkState *states, size_t c
size_t hidGetNpadStatesHandheldLark(HidNpadIdType id, HidNpadHandheldLarkState *states, size_t count) { size_t hidGetNpadStatesHandheldLark(HidNpadIdType id, HidNpadHandheldLarkState *states, size_t count) {
HidNpadCommonState tmp_entries[17]; HidNpadCommonState tmp_entries[17];
HidNpad *npad = _hidGetNpadInternalState(id); HidNpadInternalState *npad = _hidGetNpadInternalState(id);
size_t total = _hidGetNpadStates(npad, 1, tmp_entries, count); size_t total = _hidGetNpadStates(npad, 1, tmp_entries, count);
memset(states, 0, sizeof(HidNpadHandheldLarkState) * total); memset(states, 0, sizeof(HidNpadHandheldLarkState) * total);
@ -603,7 +603,7 @@ size_t hidGetNpadStatesHandheldLark(HidNpadIdType id, HidNpadHandheldLarkState *
size_t hidGetNpadStatesLucia(HidNpadIdType id, HidNpadLuciaState *states, size_t count) { size_t hidGetNpadStatesLucia(HidNpadIdType id, HidNpadLuciaState *states, size_t count) {
HidNpadCommonState tmp_entries[17]; HidNpadCommonState tmp_entries[17];
HidNpad *npad = _hidGetNpadInternalState(id); HidNpadInternalState *npad = _hidGetNpadInternalState(id);
size_t total = _hidGetNpadStates(npad, 0, tmp_entries, count); size_t total = _hidGetNpadStates(npad, 0, tmp_entries, count);
memset(states, 0, sizeof(HidNpadLuciaState) * total); memset(states, 0, sizeof(HidNpadLuciaState) * total);
@ -628,7 +628,7 @@ size_t hidGetNpadStatesLucia(HidNpadIdType id, HidNpadLuciaState *states, size_t
} }
size_t hidGetNpadStatesSystemExt(HidNpadIdType id, HidNpadSystemExtState *states, size_t count) { size_t hidGetNpadStatesSystemExt(HidNpadIdType id, HidNpadSystemExtState *states, size_t count) {
HidNpad *npad = _hidGetNpadInternalState(id); HidNpadInternalState *npad = _hidGetNpadInternalState(id);
size_t total = _hidGetNpadStates(npad, 6, states, count); size_t total = _hidGetNpadStates(npad, 6, states, count);
// sdknso would handle button-bitmasking with ControlPadRestriction here. // sdknso would handle button-bitmasking with ControlPadRestriction here.
@ -637,7 +637,7 @@ size_t hidGetNpadStatesSystemExt(HidNpadIdType id, HidNpadSystemExtState *states
} }
size_t hidGetNpadStatesSystem(HidNpadIdType id, HidNpadSystemState *states, size_t count) { size_t hidGetNpadStatesSystem(HidNpadIdType id, HidNpadSystemState *states, size_t count) {
HidNpad *npad = _hidGetNpadInternalState(id); HidNpadInternalState *npad = _hidGetNpadInternalState(id);
size_t total = _hidGetNpadStates(npad, 6, states, count); size_t total = _hidGetNpadStates(npad, 6, states, count);
for (size_t i=0; i<total; i++) { for (size_t i=0; i<total; i++) {
@ -696,7 +696,7 @@ size_t hidGetSixAxisSensorStates(HidSixAxisSensorHandle handle, HidSixAxisSensor
return 0; return 0;
} }
HidNpad *npad = _hidGetNpadInternalState(handle.npad_id_type); HidNpadInternalState *npad = _hidGetNpadInternalState(handle.npad_id_type);
size_t total = _hidGetStates(&npad->sixaxis[index].header, npad->sixaxis[index].storage, 17, offsetof(HidSixAxisSensorStateAtomicStorage,state), offsetof(HidSixAxisSensorState,sampling_number), states, sizeof(HidSixAxisSensorState), count); size_t total = _hidGetStates(&npad->sixaxis[index].header, npad->sixaxis[index].storage, 17, offsetof(HidSixAxisSensorStateAtomicStorage,state), offsetof(HidSixAxisSensorState,sampling_number), states, sizeof(HidSixAxisSensorState), count);
return total; return total;
} }