|
@@ -354,19 +354,19 @@ const PROGMEM char usbDescriptorConfiguration[] = {
|
|
/* USB configuration descriptor */
|
|
/* USB configuration descriptor */
|
|
9, /* sizeof(usbDescriptorConfiguration): length of descriptor in bytes */
|
|
9, /* sizeof(usbDescriptorConfiguration): length of descriptor in bytes */
|
|
USBDESCR_CONFIG, /* descriptor type */
|
|
USBDESCR_CONFIG, /* descriptor type */
|
|
-# if defined (MOUSE_ENABLE) || defined(EXTRAKEY_ENABLE)
|
|
|
|
- 59, // 9 + (9 + 9 + 7) + (9 + 9 + 7)
|
|
|
|
-#else
|
|
|
|
- 34, // 9 + (9 + 9 + 7)
|
|
|
|
|
|
+# if defined(MOUSE_ENABLE) || defined(EXTRAKEY_ENABLE)
|
|
|
|
+ 59, // 9 + (9 + 9 + 7) + (9 + 9 + 7)
|
|
|
|
+# else
|
|
|
|
+ 34, // 9 + (9 + 9 + 7)
|
|
# endif
|
|
# endif
|
|
0,
|
|
0,
|
|
- // 18 + 7 * USB_CFG_HAVE_INTRIN_ENDPOINT + 7 * USB_CFG_HAVE_INTRIN_ENDPOINT3 + 9, 0,
|
|
|
|
- /* total length of data returned (including inlined descriptors) */
|
|
|
|
|
|
+// 18 + 7 * USB_CFG_HAVE_INTRIN_ENDPOINT + 7 * USB_CFG_HAVE_INTRIN_ENDPOINT3 + 9, 0,
|
|
|
|
+/* total length of data returned (including inlined descriptors) */
|
|
# if defined(MOUSE_ENABLE) || defined(EXTRAKEY_ENABLE)
|
|
# if defined(MOUSE_ENABLE) || defined(EXTRAKEY_ENABLE)
|
|
2, /* number of interfaces in this configuration */
|
|
2, /* number of interfaces in this configuration */
|
|
# else
|
|
# else
|
|
1,
|
|
1,
|
|
-#endif
|
|
|
|
|
|
+# endif
|
|
1, /* index of this configuration */
|
|
1, /* index of this configuration */
|
|
0, /* configuration name string index */
|
|
0, /* configuration name string index */
|
|
# if USB_CFG_IS_SELF_POWERED
|
|
# if USB_CFG_IS_SELF_POWERED
|
|
@@ -419,13 +419,13 @@ const PROGMEM char usbDescriptorConfiguration[] = {
|
|
0, /* PROTOCOL: none */
|
|
0, /* PROTOCOL: none */
|
|
0, /* string index for interface */
|
|
0, /* string index for interface */
|
|
/* HID descriptor */
|
|
/* HID descriptor */
|
|
- 9, /* sizeof(usbDescrHID): length of descriptor in bytes */
|
|
|
|
- USBDESCR_HID, /* descriptor type: HID */
|
|
|
|
- 0x01, 0x01, /* BCD representation of HID version */
|
|
|
|
- 0x00, /* target country code */
|
|
|
|
- 0x01, /* number of HID Report (or other HID class) Descriptor infos to follow */
|
|
|
|
- 0x22, /* descriptor type: report */
|
|
|
|
- sizeof(mouse_extra_hid_report), 0, /* total length of report descriptor */
|
|
|
|
|
|
+ 9, /* sizeof(usbDescrHID): length of descriptor in bytes */
|
|
|
|
+ USBDESCR_HID, /* descriptor type: HID */
|
|
|
|
+ 0x01, 0x01, /* BCD representation of HID version */
|
|
|
|
+ 0x00, /* target country code */
|
|
|
|
+ 0x01, /* number of HID Report (or other HID class) Descriptor infos to follow */
|
|
|
|
+ 0x22, /* descriptor type: report */
|
|
|
|
+ sizeof(mouse_extra_hid_report), 0, /* total length of report descriptor */
|
|
# if USB_CFG_HAVE_INTRIN_ENDPOINT3 /* endpoint descriptor for endpoint 3 */
|
|
# if USB_CFG_HAVE_INTRIN_ENDPOINT3 /* endpoint descriptor for endpoint 3 */
|
|
/* Endpoint descriptor */
|
|
/* Endpoint descriptor */
|
|
7, /* sizeof(usbDescrEndpoint) */
|
|
7, /* sizeof(usbDescrEndpoint) */
|