mika/libnx
1
0
Fork 0
mirror of https://github.com/switchbrew/libnx.git synced 2025-07-03 18:12:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

hid: joystickPosition -> JoystickPosition

Browse Source
This commit is contained in:
shinyquagsire23 2018-01-20 02:35:51 -07:00
parent 3d1a6882a7
commit 76b90cec7f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -313,11 +313,11 @@ typedef struct touchPosition
u32 angle;
} touchPosition;
typedef struct joystickPosition
typedef struct JoystickPosition
{
s32 dx;
s32 dy;
} joystickPosition;
} JoystickPosition;
#define JOYSTICK_MAX (0x8000)
#define JOYSTICK_MIN (-0x8000)
@ -480,7 +480,7 @@ typedef struct HidControllerInputEntry
u64 timestamp;
u64 timestamp_2;
u64 buttons;
joystickPosition joysticks[JOYSTICK_NUM_STICKS];
JoystickPosition joysticks[JOYSTICK_NUM_STICKS];
u64 connectionState;
} HidControllerInputEntry;
static_assert(sizeof(HidControllerInputEntry) == 0x30, "Hid controller input entry structure has incorrect size");
@ -555,4 +555,4 @@ bool hidKeyboardUp(HidKeyboardScancode key);
u32 hidTouchCount(void);
void hidTouchRead(touchPosition *pos, u32 point_id);
void hidJoystickRead(joystickPosition *pos, HidControllerID id, HidControllerJoystick stick);
void hidJoystickRead(JoystickPosition *pos, HidControllerID id, HidControllerJoystick stick);

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

@ -327,7 +327,7 @@ void hidTouchRead(touchPosition *pos, u32 point_id) {
}
}
void hidJoystickRead(joystickPosition *pos, HidControllerID id, HidControllerJoystick stick) {
void hidJoystickRead(JoystickPosition *pos, HidControllerID id, HidControllerJoystick stick) {
if (id == CONTROLLER_P1_AUTO) return hidJoystickRead(pos, g_controllerP1AutoID, stick);
if (pos) {