From e74c605a91cfb6386391752af103e71d7a6f164a Mon Sep 17 00:00:00 2001 From: yellows8 Date: Fri, 13 Nov 2020 15:17:13 -0500 Subject: [PATCH] hid: Fixed HidNpadInterfaceType. --- nx/include/switch/services/hid.h | 8 ++++---- nx/include/switch/services/hiddbg.h | 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 b179a4a0..690f8b53 100644 --- a/nx/include/switch/services/hid.h +++ b/nx/include/switch/services/hid.h @@ -375,10 +375,10 @@ typedef enum { /// NpadInterfaceType typedef enum { - NpadInterfaceType_Bluetooth = 1, ///< Bluetooth. - NpadInterfaceType_Rail = 2, ///< Rail. - NpadInterfaceType_USB = 3, ///< USB. - NpadInterfaceType_Unknown4 = 4, ///< Unknown. + HidNpadInterfaceType_Bluetooth = 1, ///< Bluetooth. + HidNpadInterfaceType_Rail = 2, ///< Rail. + HidNpadInterfaceType_USB = 3, ///< USB. + HidNpadInterfaceType_Unknown4 = 4, ///< Unknown. } HidNpadInterfaceType; /// XcdInterfaceType diff --git a/nx/include/switch/services/hiddbg.h b/nx/include/switch/services/hiddbg.h index 40193de5..8177c97e 100644 --- a/nx/include/switch/services/hiddbg.h +++ b/nx/include/switch/services/hiddbg.h @@ -20,7 +20,7 @@ typedef struct { /// HdlsDeviceInfo, for [9.0.0+]. Converted to/from \ref HiddbgHdlsDeviceInfoV7 on prior sysvers. typedef struct { u8 deviceType; ///< \ref HidDeviceType - u8 npadInterfaceType; ///< \ref HidNpadInterfaceType. Additional type field used with the above type field (only applies to ::HidDeviceType_JoyRight1, ::HidDeviceType_JoyLeft2, ::HidDeviceType_FullKey3, and ::HidDeviceType_System19), if the value doesn't match one of the following a default is used. ::HidDeviceType_FullKey3: ::NpadInterfaceType_USB indicates that the controller is connected via USB. :::HidDeviceType_System19: ::NpadInterfaceType_USB = unknown. When value is ::NpadInterfaceType_Rail, state is merged with an existing controller (with ::HidDeviceType_JoyRight1 / ::HidDeviceType_JoyLeft2). Otherwise, it's a dedicated controller. + u8 npadInterfaceType; ///< \ref HidNpadInterfaceType. Additional type field used with the above type field (only applies to ::HidDeviceType_JoyRight1, ::HidDeviceType_JoyLeft2, ::HidDeviceType_FullKey3, and ::HidDeviceType_System19), if the value doesn't match one of the following a default is used. ::HidDeviceType_FullKey3: ::HidNpadInterfaceType_USB indicates that the controller is connected via USB. :::HidDeviceType_System19: ::HidNpadInterfaceType_USB = unknown. When value is ::HidNpadInterfaceType_Rail, state is merged with an existing controller (with ::HidDeviceType_JoyRight1 / ::HidDeviceType_JoyLeft2). Otherwise, it's a dedicated controller. u8 pad[0x2]; ///< Padding. u32 singleColorBody; ///< RGBA Single Body Color. u32 singleColorButtons; ///< RGBA Single Buttons Color.