From 52e928df0e15698738048a296dc5cbc29800a238 Mon Sep 17 00:00:00 2001 From: shinyquagsire23 Date: Fri, 19 Jan 2018 21:46:52 -0700 Subject: [PATCH] hid: circlePosition -> joystickPosition --- nx/include/switch/services/hid.h | 8 ++++---- nx/source/services/hid.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nx/include/switch/services/hid.h b/nx/include/switch/services/hid.h index 4136afb8..47bd7792 100644 --- a/nx/include/switch/services/hid.h +++ b/nx/include/switch/services/hid.h @@ -313,11 +313,11 @@ typedef struct touchPosition u32 angle; } touchPosition; -typedef struct circlePosition +typedef struct joystickPosition { s32 dx; s32 dy; -} circlePosition; +} joystickPosition; #define JOYSTICK_MAX (0x8000) #define JOYSTICK_MIN (-0x8000) @@ -480,7 +480,7 @@ typedef struct HidControllerInputEntry u64 timestamp; u64 timestamp_2; u64 buttons; - circlePosition 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(circlePosition *pos, HidControllerID id, HidControllerJoystick stick); +void hidJoystickRead(joystickPosition *pos, HidControllerID id, HidControllerJoystick stick); diff --git a/nx/source/services/hid.c b/nx/source/services/hid.c index 39983ea0..83f0ef0e 100644 --- a/nx/source/services/hid.c +++ b/nx/source/services/hid.c @@ -327,7 +327,7 @@ void hidTouchRead(touchPosition *pos, u32 point_id) { } } -void hidJoystickRead(circlePosition *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) {