Skip to content

Commit

Permalink
Force Raw HID interface number to 1 always (qmk#1669)
Browse files Browse the repository at this point in the history
  • Loading branch information
Wilba6582 authored and skullydazed committed Sep 6, 2017
1 parent 323fa19 commit 85c3c59
Showing 1 changed file with 13 additions and 10 deletions.
23 changes: 13 additions & 10 deletions tmk_core/protocol/lufa/descriptor.h
Original file line number Diff line number Diff line change
Expand Up @@ -133,10 +133,19 @@ typedef struct
/* index of interface */
#define KEYBOARD_INTERFACE 0

// 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 RAW_INTERFACE KEYBOARD_INTERFACE
#endif

#ifdef MOUSE_ENABLE
# define MOUSE_INTERFACE (KEYBOARD_INTERFACE + 1)
# define MOUSE_INTERFACE (RAW_INTERFACE + 1)
#else
# define MOUSE_INTERFACE KEYBOARD_INTERFACE
# define MOUSE_INTERFACE RAW_INTERFACE
#endif

#ifdef EXTRAKEY_ENABLE
Expand All @@ -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
Expand Down

0 comments on commit 85c3c59

Please sign in to comment.