From 85c3c5926ca0d47e5c3a8c58a12947f2ea69cd30 Mon Sep 17 00:00:00 2001 From: Wilba6582 <Wilba6582@users.noreply.github.com> Date: Thu, 7 Sep 2017 03:33:00 +1000 Subject: [PATCH] Force Raw HID interface number to 1 always (#1669) --- tmk_core/protocol/lufa/descriptor.h | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/tmk_core/protocol/lufa/descriptor.h b/tmk_core/protocol/lufa/descriptor.h index 43001c9778..61c42c9dfc 100644 --- a/tmk_core/protocol/lufa/descriptor.h +++ b/tmk_core/protocol/lufa/descriptor.h @@ -133,10 +133,19 @@ typedef struct /* index of interface */ #define KEYBOARD_INTERFACE 0 -#ifdef MOUSE_ENABLE -# define MOUSE_INTERFACE (KEYBOARD_INTERFACE + 1) +// It is important that the Raw HID interface is at a constant +// interface number, to support Linux/OSX platforms and chrome.hid +// If Raw HID is enabled, let it be always 1. +#ifdef RAW_ENABLE +# define RAW_INTERFACE (KEYBOARD_INTERFACE + 1) #else -# define MOUSE_INTERFACE KEYBOARD_INTERFACE +# define RAW_INTERFACE KEYBOARD_INTERFACE +#endif + +#ifdef MOUSE_ENABLE +# define MOUSE_INTERFACE (RAW_INTERFACE + 1) +#else +# define MOUSE_INTERFACE RAW_INTERFACE #endif #ifdef EXTRAKEY_ENABLE @@ -145,16 +154,10 @@ typedef struct # define EXTRAKEY_INTERFACE MOUSE_INTERFACE #endif -#ifdef RAW_ENABLE -# define RAW_INTERFACE (EXTRAKEY_INTERFACE + 1) -#else -# define RAW_INTERFACE EXTRAKEY_INTERFACE -#endif - #ifdef CONSOLE_ENABLE -# define CONSOLE_INTERFACE (RAW_INTERFACE + 1) +# define CONSOLE_INTERFACE (EXTRAKEY_INTERFACE + 1) #else -# define CONSOLE_INTERFACE RAW_INTERFACE +# define CONSOLE_INTERFACE EXTRAKEY_INTERFACE #endif #ifdef NKRO_ENABLE