Merge pull request #27 from lactide/chibios_fixes

- usb specification 2.0: "Interfaces are numbered from zero to one less than the number of concurrent interfaces supported by the configuration", Section 9.2.3, page 244
- the offset to the nkro hid descriptor was incorrectly calculated.

Author: tmk

protocol/chibios/usb_main.c

@@ -363,7 +363,7 @@ static const USBDescriptor extra_hid_report_descriptor = {
 
 #ifdef NKRO_ENABLE
 #   define NKRO_HID_DESC_NUM            (EXTRA_HID_DESC_NUM + 1)
-#   define NKRO_HID_DESC_OFFSET         (9 + (9 + 9 + 7) * EXTRA_HID_DESC_NUM + 9)
+#   define NKRO_HID_DESC_OFFSET         (9 + (9 + 9 + 7) * NKRO_HID_DESC_NUM + 9)
 #else /* NKRO_ENABLE */
 #   define NKRO_HID_DESC_NUM            (EXTRA_HID_DESC_NUM + 0)
 #endif /* NKRO_ENABLE */

protocol/chibios/usb_main.h

@@ -52,10 +52,13 @@ void send_remote_wakeup(USBDriver *usbp);
 
 /* secondary keyboard */
 #ifdef NKRO_ENABLE
-#define NKRO_INTERFACE    4
-#define NKRO_ENDPOINT     5
+#define NKRO_INTERFACE    EXTRA_INTERFACE+1
+#define NKRO_ENDPOINT     EXTRA_ENDPOINT+1
 #define NKRO_EPSIZE       16
 #define NKRO_REPORT_KEYS  (NKRO_EPSIZE - 1)
+#else
+#define NKRO_INTERFACE    EXTRA_INTERFACE
+#define NKRO_ENDPOINT     EXTRA_ENDPOINT
 #endif
 
 /* extern report_keyboard_t keyboard_report_sent; */
@@ -78,12 +81,15 @@ void nkro_in_cb(USBDriver *usbp, usbep_t ep);
 
 #ifdef MOUSE_ENABLE
 
-#define MOUSE_INTERFACE         1
-#define MOUSE_ENDPOINT          2
+#define MOUSE_INTERFACE         (KBD_INTERFACE+1)
+#define MOUSE_ENDPOINT          (KBD_ENDPOINT+1)
 #define MOUSE_EPSIZE            8
 
 /* mouse IN request callback handler */
 void mouse_in_cb(USBDriver *usbp, usbep_t ep);
+#else
+#define MOUSE_INTERFACE         KBD_INTERFACE
+#define MOUSE_ENDPOINT          KBD_ENDPOINT
 #endif /* MOUSE_ENABLE */
 
 /* ---------------
@@ -93,8 +99,8 @@ void mouse_in_cb(USBDriver *usbp, usbep_t ep);
 
 #ifdef EXTRAKEY_ENABLE
 
-#define EXTRA_INTERFACE         3
-#define EXTRA_ENDPOINT          4
+#define EXTRA_INTERFACE        (CONSOLE_INTERFACE+1)
+#define EXTRA_ENDPOINT         (CONSOLE_ENDPOINT+1)
 #define EXTRA_EPSIZE            8
 
 /* extrakey IN request callback handler */
@@ -105,6 +111,9 @@ typedef struct {
   uint8_t report_id;
   uint16_t usage;
 } __attribute__ ((packed)) report_extra_t;
+#else
+#define EXTRA_INTERFACE        CONSOLE_INTERFACE
+#define EXTRA_ENDPOINT         CONSOLE_ENDPOINT
 #endif /* EXTRAKEY_ENABLE */
 
 /* --------------
@@ -114,8 +123,8 @@ typedef struct {
 
 #ifdef CONSOLE_ENABLE
 
-#define CONSOLE_INTERFACE      2
-#define CONSOLE_ENDPOINT       3
+#define CONSOLE_INTERFACE      (MOUSE_INTERFACE+1)
+#define CONSOLE_ENDPOINT       (MOUSE_ENDPOINT+1)
 #define CONSOLE_EPSIZE         16
 
 /* Number of IN reports that can be stored inside the output queue */
@@ -132,6 +141,9 @@ void console_flush_output(void);
 
 /* console IN request callback handler */
 void console_in_cb(USBDriver *usbp, usbep_t ep);
+#else
+#define CONSOLE_INTERFACE      MOUSE_INTERFACE
+#define CONSOLE_ENDPOINT       MOUSE_ENDPOINT
 #endif /* CONSOLE_ENABLE */
 
 void sendchar_pf(void *p, char c);