From 8e0c514044213be4f0787e7ce2926fb8cf08c80c Mon Sep 17 00:00:00 2001 From: fincs Date: Wed, 25 Nov 2020 16:46:57 +0100 Subject: [PATCH] hid: Added pre-made HidNpadStyleSet values for common style sets --- nx/include/switch/services/hid.h | 3 +++ nx/source/services/hid.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/nx/include/switch/services/hid.h b/nx/include/switch/services/hid.h index 2221a9ef..348de2ab 100644 --- a/nx/include/switch/services/hid.h +++ b/nx/include/switch/services/hid.h @@ -242,6 +242,9 @@ typedef enum { HidNpadStyleTag_Npad10 = BIT(10), HidNpadStyleTag_NpadSystemExt = BIT(29), ///< Generic external controller HidNpadStyleTag_NpadSystem = BIT(30), ///< Generic controller + + HidNpadStyleSet_NpadFullCtrl = HidNpadStyleTag_NpadFullKey | HidNpadStyleTag_NpadHandheld | HidNpadStyleTag_NpadJoyDual, ///< Style set comprising Npad styles containing the full set of controls {FullKey, Handheld, JoyDual} + HidNpadStyleSet_NpadStandard = HidNpadStyleSet_NpadFullCtrl | HidNpadStyleTag_NpadJoyLeft | HidNpadStyleTag_NpadJoyRight, ///< Style set comprising all standard Npad styles {FullKey, Handheld, JoyDual, JoyLeft, JoyRight} } HidNpadStyleTag; /// HidColorAttribute diff --git a/nx/source/services/hid.c b/nx/source/services/hid.c index 47b3bb07..673f754a 100644 --- a/nx/source/services/hid.c +++ b/nx/source/services/hid.c @@ -127,7 +127,7 @@ void hidScanInput(void) { hidInitializeMouse(); _hidReset(); - rc = hidSetSupportedNpadStyleSet(HidNpadStyleTag_NpadFullKey | HidNpadStyleTag_NpadHandheld | HidNpadStyleTag_NpadJoyDual | HidNpadStyleTag_NpadJoyLeft | HidNpadStyleTag_NpadJoyRight | HidNpadStyleTag_NpadSystemExt | HidNpadStyleTag_NpadSystem); + rc = hidSetSupportedNpadStyleSet(HidNpadStyleSet_NpadStandard | HidNpadStyleTag_NpadSystemExt | HidNpadStyleTag_NpadSystem); if (R_FAILED(rc)) diagAbortWithResult(rc); static const HidNpadIdType idbuf[] = {