|
|
@@ -40,6 +40,8 @@
|
|
|
#include "report.h"
|
|
|
#include "usb_descriptor.h"
|
|
|
|
|
|
+// clang-format off
|
|
|
+
|
|
|
/*
|
|
|
* HID report descriptors
|
|
|
*/
|
|
|
@@ -49,46 +51,46 @@ const USB_Descriptor_HIDReport_Datatype_t PROGMEM SharedReport[] = {
|
|
|
#else
|
|
|
const USB_Descriptor_HIDReport_Datatype_t PROGMEM KeyboardReport[] = {
|
|
|
#endif
|
|
|
- HID_RI_USAGE_PAGE(8, 0x01), // Generic Desktop
|
|
|
- HID_RI_USAGE(8, 0x06), // Keyboard
|
|
|
- HID_RI_COLLECTION(8, 0x01), // Application
|
|
|
+ HID_RI_USAGE_PAGE(8, 0x01), // Generic Desktop
|
|
|
+ HID_RI_USAGE(8, 0x06), // Keyboard
|
|
|
+ HID_RI_COLLECTION(8, 0x01), // Application
|
|
|
#ifdef KEYBOARD_SHARED_EP
|
|
|
- HID_RI_REPORT_ID(8, REPORT_ID_KEYBOARD),
|
|
|
+ HID_RI_REPORT_ID(8, REPORT_ID_KEYBOARD),
|
|
|
#endif
|
|
|
- // Modifiers (8 bits)
|
|
|
- HID_RI_USAGE_PAGE(8, 0x07), // Keyboard/Keypad
|
|
|
- HID_RI_USAGE_MINIMUM(8, 0xE0), // Keyboard Left Control
|
|
|
- HID_RI_USAGE_MAXIMUM(8, 0xE7), // Keyboard Right GUI
|
|
|
- HID_RI_LOGICAL_MINIMUM(8, 0x00),
|
|
|
- HID_RI_LOGICAL_MAXIMUM(8, 0x01),
|
|
|
- HID_RI_REPORT_COUNT(8, 0x08),
|
|
|
- HID_RI_REPORT_SIZE(8, 0x01),
|
|
|
- HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
|
|
|
- // Reserved (1 byte)
|
|
|
- HID_RI_REPORT_COUNT(8, 0x01),
|
|
|
- HID_RI_REPORT_SIZE(8, 0x08),
|
|
|
- HID_RI_INPUT(8, HID_IOF_CONSTANT),
|
|
|
- // Keycodes (6 bytes)
|
|
|
- HID_RI_USAGE_PAGE(8, 0x07), // Keyboard/Keypad
|
|
|
- HID_RI_USAGE_MINIMUM(8, 0x00),
|
|
|
- HID_RI_USAGE_MAXIMUM(8, 0xFF),
|
|
|
- HID_RI_LOGICAL_MINIMUM(8, 0x00),
|
|
|
- HID_RI_LOGICAL_MAXIMUM(16, 0x00FF),
|
|
|
- HID_RI_REPORT_COUNT(8, 0x06),
|
|
|
- HID_RI_REPORT_SIZE(8, 0x08),
|
|
|
- HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_ARRAY | HID_IOF_ABSOLUTE),
|
|
|
-
|
|
|
- // Status LEDs (5 bits)
|
|
|
- HID_RI_USAGE_PAGE(8, 0x08), // LED
|
|
|
- HID_RI_USAGE_MINIMUM(8, 0x01), // Num Lock
|
|
|
- HID_RI_USAGE_MAXIMUM(8, 0x05), // Kana
|
|
|
- HID_RI_REPORT_COUNT(8, 0x05),
|
|
|
- HID_RI_REPORT_SIZE(8, 0x01),
|
|
|
- HID_RI_OUTPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE | HID_IOF_NON_VOLATILE),
|
|
|
- // LED padding (3 bits)
|
|
|
- HID_RI_REPORT_COUNT(8, 0x01),
|
|
|
- HID_RI_REPORT_SIZE(8, 0x03),
|
|
|
- HID_RI_OUTPUT(8, HID_IOF_CONSTANT),
|
|
|
+ // Modifiers (8 bits)
|
|
|
+ HID_RI_USAGE_PAGE(8, 0x07), // Keyboard/Keypad
|
|
|
+ HID_RI_USAGE_MINIMUM(8, 0xE0), // Keyboard Left Control
|
|
|
+ HID_RI_USAGE_MAXIMUM(8, 0xE7), // Keyboard Right GUI
|
|
|
+ HID_RI_LOGICAL_MINIMUM(8, 0x00),
|
|
|
+ HID_RI_LOGICAL_MAXIMUM(8, 0x01),
|
|
|
+ HID_RI_REPORT_COUNT(8, 0x08),
|
|
|
+ HID_RI_REPORT_SIZE(8, 0x01),
|
|
|
+ HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
|
|
|
+ // Reserved (1 byte)
|
|
|
+ HID_RI_REPORT_COUNT(8, 0x01),
|
|
|
+ HID_RI_REPORT_SIZE(8, 0x08),
|
|
|
+ HID_RI_INPUT(8, HID_IOF_CONSTANT),
|
|
|
+ // Keycodes (6 bytes)
|
|
|
+ HID_RI_USAGE_PAGE(8, 0x07), // Keyboard/Keypad
|
|
|
+ HID_RI_USAGE_MINIMUM(8, 0x00),
|
|
|
+ HID_RI_USAGE_MAXIMUM(8, 0xFF),
|
|
|
+ HID_RI_LOGICAL_MINIMUM(8, 0x00),
|
|
|
+ HID_RI_LOGICAL_MAXIMUM(16, 0x00FF),
|
|
|
+ HID_RI_REPORT_COUNT(8, 0x06),
|
|
|
+ HID_RI_REPORT_SIZE(8, 0x08),
|
|
|
+ HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_ARRAY | HID_IOF_ABSOLUTE),
|
|
|
+
|
|
|
+ // Status LEDs (5 bits)
|
|
|
+ HID_RI_USAGE_PAGE(8, 0x08), // LED
|
|
|
+ HID_RI_USAGE_MINIMUM(8, 0x01), // Num Lock
|
|
|
+ HID_RI_USAGE_MAXIMUM(8, 0x05), // Kana
|
|
|
+ HID_RI_REPORT_COUNT(8, 0x05),
|
|
|
+ HID_RI_REPORT_SIZE(8, 0x01),
|
|
|
+ HID_RI_OUTPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE | HID_IOF_NON_VOLATILE),
|
|
|
+ // LED padding (3 bits)
|
|
|
+ HID_RI_REPORT_COUNT(8, 0x01),
|
|
|
+ HID_RI_REPORT_SIZE(8, 0x03),
|
|
|
+ HID_RI_OUTPUT(8, HID_IOF_CONSTANT),
|
|
|
HID_RI_END_COLLECTION(0),
|
|
|
#ifndef KEYBOARD_SHARED_EP
|
|
|
};
|
|
|
@@ -101,54 +103,54 @@ const USB_Descriptor_HIDReport_Datatype_t PROGMEM MouseReport[] = {
|
|
|
const USB_Descriptor_HIDReport_Datatype_t PROGMEM SharedReport[] = {
|
|
|
# define SHARED_REPORT_STARTED
|
|
|
# endif
|
|
|
- HID_RI_USAGE_PAGE(8, 0x01), // Generic Desktop
|
|
|
- HID_RI_USAGE(8, 0x02), // Mouse
|
|
|
- HID_RI_COLLECTION(8, 0x01), // Application
|
|
|
+ HID_RI_USAGE_PAGE(8, 0x01), // Generic Desktop
|
|
|
+ HID_RI_USAGE(8, 0x02), // Mouse
|
|
|
+ HID_RI_COLLECTION(8, 0x01), // Application
|
|
|
# ifdef MOUSE_SHARED_EP
|
|
|
- HID_RI_REPORT_ID(8, REPORT_ID_MOUSE),
|
|
|
+ HID_RI_REPORT_ID(8, REPORT_ID_MOUSE),
|
|
|
# endif
|
|
|
- HID_RI_USAGE(8, 0x01), // Pointer
|
|
|
- HID_RI_COLLECTION(8, 0x00), // Physical
|
|
|
- // Buttons (5 bits)
|
|
|
- HID_RI_USAGE_PAGE(8, 0x09), // Button
|
|
|
- HID_RI_USAGE_MINIMUM(8, 0x01), // Button 1
|
|
|
- HID_RI_USAGE_MAXIMUM(8, 0x05), // Button 5
|
|
|
- HID_RI_LOGICAL_MINIMUM(8, 0x00),
|
|
|
- HID_RI_LOGICAL_MAXIMUM(8, 0x01),
|
|
|
- HID_RI_REPORT_COUNT(8, 0x05),
|
|
|
- HID_RI_REPORT_SIZE(8, 0x01),
|
|
|
- HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
|
|
|
- // Button padding (3 bits)
|
|
|
- HID_RI_REPORT_COUNT(8, 0x01),
|
|
|
- HID_RI_REPORT_SIZE(8, 0x03),
|
|
|
- HID_RI_INPUT(8, HID_IOF_CONSTANT),
|
|
|
-
|
|
|
- // X/Y position (2 bytes)
|
|
|
- HID_RI_USAGE_PAGE(8, 0x01), // Generic Desktop
|
|
|
- HID_RI_USAGE(8, 0x30), // X
|
|
|
- HID_RI_USAGE(8, 0x31), // Y
|
|
|
- HID_RI_LOGICAL_MINIMUM(8, -127),
|
|
|
- HID_RI_LOGICAL_MAXIMUM(8, 127),
|
|
|
- HID_RI_REPORT_COUNT(8, 0x02),
|
|
|
- HID_RI_REPORT_SIZE(8, 0x08),
|
|
|
- HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_RELATIVE),
|
|
|
-
|
|
|
- // Vertical wheel (1 byte)
|
|
|
- HID_RI_USAGE(8, 0x38), // Wheel
|
|
|
- HID_RI_LOGICAL_MINIMUM(8, -127),
|
|
|
- HID_RI_LOGICAL_MAXIMUM(8, 127),
|
|
|
- HID_RI_REPORT_COUNT(8, 0x01),
|
|
|
- HID_RI_REPORT_SIZE(8, 0x08),
|
|
|
- HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_RELATIVE),
|
|
|
- // Horizontal wheel (1 byte)
|
|
|
- HID_RI_USAGE_PAGE(8, 0x0C), // Consumer
|
|
|
- HID_RI_USAGE(16, 0x0238), // AC Pan
|
|
|
- HID_RI_LOGICAL_MINIMUM(8, -127),
|
|
|
- HID_RI_LOGICAL_MAXIMUM(8, 127),
|
|
|
- HID_RI_REPORT_COUNT(8, 0x01),
|
|
|
- HID_RI_REPORT_SIZE(8, 0x08),
|
|
|
- HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_RELATIVE),
|
|
|
- HID_RI_END_COLLECTION(0),
|
|
|
+ HID_RI_USAGE(8, 0x01), // Pointer
|
|
|
+ HID_RI_COLLECTION(8, 0x00), // Physical
|
|
|
+ // Buttons (5 bits)
|
|
|
+ HID_RI_USAGE_PAGE(8, 0x09), // Button
|
|
|
+ HID_RI_USAGE_MINIMUM(8, 0x01), // Button 1
|
|
|
+ HID_RI_USAGE_MAXIMUM(8, 0x05), // Button 5
|
|
|
+ HID_RI_LOGICAL_MINIMUM(8, 0x00),
|
|
|
+ HID_RI_LOGICAL_MAXIMUM(8, 0x01),
|
|
|
+ HID_RI_REPORT_COUNT(8, 0x05),
|
|
|
+ HID_RI_REPORT_SIZE(8, 0x01),
|
|
|
+ HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
|
|
|
+ // Button padding (3 bits)
|
|
|
+ HID_RI_REPORT_COUNT(8, 0x01),
|
|
|
+ HID_RI_REPORT_SIZE(8, 0x03),
|
|
|
+ HID_RI_INPUT(8, HID_IOF_CONSTANT),
|
|
|
+
|
|
|
+ // X/Y position (2 bytes)
|
|
|
+ HID_RI_USAGE_PAGE(8, 0x01), // Generic Desktop
|
|
|
+ HID_RI_USAGE(8, 0x30), // X
|
|
|
+ HID_RI_USAGE(8, 0x31), // Y
|
|
|
+ HID_RI_LOGICAL_MINIMUM(8, -127),
|
|
|
+ HID_RI_LOGICAL_MAXIMUM(8, 127),
|
|
|
+ HID_RI_REPORT_COUNT(8, 0x02),
|
|
|
+ HID_RI_REPORT_SIZE(8, 0x08),
|
|
|
+ HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_RELATIVE),
|
|
|
+
|
|
|
+ // Vertical wheel (1 byte)
|
|
|
+ HID_RI_USAGE(8, 0x38), // Wheel
|
|
|
+ HID_RI_LOGICAL_MINIMUM(8, -127),
|
|
|
+ HID_RI_LOGICAL_MAXIMUM(8, 127),
|
|
|
+ HID_RI_REPORT_COUNT(8, 0x01),
|
|
|
+ HID_RI_REPORT_SIZE(8, 0x08),
|
|
|
+ HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_RELATIVE),
|
|
|
+ // Horizontal wheel (1 byte)
|
|
|
+ HID_RI_USAGE_PAGE(8, 0x0C), // Consumer
|
|
|
+ HID_RI_USAGE(16, 0x0238), // AC Pan
|
|
|
+ HID_RI_LOGICAL_MINIMUM(8, -127),
|
|
|
+ HID_RI_LOGICAL_MAXIMUM(8, 127),
|
|
|
+ HID_RI_REPORT_COUNT(8, 0x01),
|
|
|
+ HID_RI_REPORT_SIZE(8, 0x08),
|
|
|
+ HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_RELATIVE),
|
|
|
+ HID_RI_END_COLLECTION(0),
|
|
|
HID_RI_END_COLLECTION(0),
|
|
|
# ifndef MOUSE_SHARED_EP
|
|
|
};
|
|
|
@@ -160,68 +162,68 @@ const USB_Descriptor_HIDReport_Datatype_t PROGMEM SharedReport[] = {
|
|
|
#endif
|
|
|
|
|
|
#ifdef EXTRAKEY_ENABLE
|
|
|
- HID_RI_USAGE_PAGE(8, 0x01), // Generic Desktop
|
|
|
- HID_RI_USAGE(8, 0x80), // System Control
|
|
|
- HID_RI_COLLECTION(8, 0x01), // Application
|
|
|
- HID_RI_REPORT_ID(8, REPORT_ID_SYSTEM),
|
|
|
- HID_RI_USAGE_MINIMUM(16, 0x0081), // System Power Down
|
|
|
- HID_RI_USAGE_MAXIMUM(16, 0x0083), // System Wake Up
|
|
|
- HID_RI_LOGICAL_MINIMUM(16, 0x0001),
|
|
|
- HID_RI_LOGICAL_MAXIMUM(16, 0x0003),
|
|
|
- HID_RI_REPORT_COUNT(8, 1),
|
|
|
- HID_RI_REPORT_SIZE(8, 16),
|
|
|
- HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_ARRAY | HID_IOF_ABSOLUTE),
|
|
|
+ HID_RI_USAGE_PAGE(8, 0x01), // Generic Desktop
|
|
|
+ HID_RI_USAGE(8, 0x80), // System Control
|
|
|
+ HID_RI_COLLECTION(8, 0x01), // Application
|
|
|
+ HID_RI_REPORT_ID(8, REPORT_ID_SYSTEM),
|
|
|
+ HID_RI_USAGE_MINIMUM(16, 0x0081), // System Power Down
|
|
|
+ HID_RI_USAGE_MAXIMUM(16, 0x0083), // System Wake Up
|
|
|
+ HID_RI_LOGICAL_MINIMUM(16, 0x0001),
|
|
|
+ HID_RI_LOGICAL_MAXIMUM(16, 0x0003),
|
|
|
+ HID_RI_REPORT_COUNT(8, 1),
|
|
|
+ HID_RI_REPORT_SIZE(8, 16),
|
|
|
+ HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_ARRAY | HID_IOF_ABSOLUTE),
|
|
|
HID_RI_END_COLLECTION(0),
|
|
|
|
|
|
- HID_RI_USAGE_PAGE(8, 0x0C), // Consumer
|
|
|
- HID_RI_USAGE(8, 0x01), // Consumer Control
|
|
|
- HID_RI_COLLECTION(8, 0x01), // Application
|
|
|
- HID_RI_REPORT_ID(8, REPORT_ID_CONSUMER),
|
|
|
- HID_RI_USAGE_MINIMUM(16, 0x0001), // Consumer Control
|
|
|
- HID_RI_USAGE_MAXIMUM(16, 0x029C), // AC Distribute Vertically
|
|
|
- HID_RI_LOGICAL_MINIMUM(16, 0x0001),
|
|
|
- HID_RI_LOGICAL_MAXIMUM(16, 0x029C),
|
|
|
- HID_RI_REPORT_COUNT(8, 1),
|
|
|
- HID_RI_REPORT_SIZE(8, 16),
|
|
|
- HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_ARRAY | HID_IOF_ABSOLUTE),
|
|
|
+ HID_RI_USAGE_PAGE(8, 0x0C), // Consumer
|
|
|
+ HID_RI_USAGE(8, 0x01), // Consumer Control
|
|
|
+ HID_RI_COLLECTION(8, 0x01), // Application
|
|
|
+ HID_RI_REPORT_ID(8, REPORT_ID_CONSUMER),
|
|
|
+ HID_RI_USAGE_MINIMUM(16, 0x0001), // Consumer Control
|
|
|
+ HID_RI_USAGE_MAXIMUM(16, 0x029C), // AC Distribute Vertically
|
|
|
+ HID_RI_LOGICAL_MINIMUM(16, 0x0001),
|
|
|
+ HID_RI_LOGICAL_MAXIMUM(16, 0x029C),
|
|
|
+ HID_RI_REPORT_COUNT(8, 1),
|
|
|
+ HID_RI_REPORT_SIZE(8, 16),
|
|
|
+ HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_ARRAY | HID_IOF_ABSOLUTE),
|
|
|
HID_RI_END_COLLECTION(0),
|
|
|
#endif
|
|
|
|
|
|
#ifdef NKRO_ENABLE
|
|
|
- HID_RI_USAGE_PAGE(8, 0x01), // Generic Desktop
|
|
|
- HID_RI_USAGE(8, 0x06), // Keyboard
|
|
|
- HID_RI_COLLECTION(8, 0x01), // Application
|
|
|
- HID_RI_REPORT_ID(8, REPORT_ID_NKRO),
|
|
|
- // Modifiers (8 bits)
|
|
|
- HID_RI_USAGE_PAGE(8, 0x07), // Keyboard/Keypad
|
|
|
- HID_RI_USAGE_MINIMUM(8, 0xE0), // Keyboard Left Control
|
|
|
- HID_RI_USAGE_MAXIMUM(8, 0xE7), // Keyboard Right GUI
|
|
|
- HID_RI_LOGICAL_MINIMUM(8, 0x00),
|
|
|
- HID_RI_LOGICAL_MAXIMUM(8, 0x01),
|
|
|
- HID_RI_REPORT_COUNT(8, 0x08),
|
|
|
- HID_RI_REPORT_SIZE(8, 0x01),
|
|
|
- HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
|
|
|
- // Keycodes
|
|
|
- HID_RI_USAGE_PAGE(8, 0x07), // Keyboard/Keypad
|
|
|
- HID_RI_USAGE_MINIMUM(8, 0x00),
|
|
|
- HID_RI_USAGE_MAXIMUM(8, KEYBOARD_REPORT_BITS * 8 - 1),
|
|
|
- HID_RI_LOGICAL_MINIMUM(8, 0x00),
|
|
|
- HID_RI_LOGICAL_MAXIMUM(8, 0x01),
|
|
|
- HID_RI_REPORT_COUNT(8, KEYBOARD_REPORT_BITS * 8),
|
|
|
- HID_RI_REPORT_SIZE(8, 0x01),
|
|
|
- HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
|
|
|
-
|
|
|
- // Status LEDs (5 bits)
|
|
|
- HID_RI_USAGE_PAGE(8, 0x08), // LED
|
|
|
- HID_RI_USAGE_MINIMUM(8, 0x01), // Num Lock
|
|
|
- HID_RI_USAGE_MAXIMUM(8, 0x05), // Kana
|
|
|
- HID_RI_REPORT_COUNT(8, 0x05),
|
|
|
- HID_RI_REPORT_SIZE(8, 0x01),
|
|
|
- HID_RI_OUTPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE | HID_IOF_NON_VOLATILE),
|
|
|
- // LED padding (3 bits)
|
|
|
- HID_RI_REPORT_COUNT(8, 0x01),
|
|
|
- HID_RI_REPORT_SIZE(8, 0x03),
|
|
|
- HID_RI_OUTPUT(8, HID_IOF_CONSTANT),
|
|
|
+ HID_RI_USAGE_PAGE(8, 0x01), // Generic Desktop
|
|
|
+ HID_RI_USAGE(8, 0x06), // Keyboard
|
|
|
+ HID_RI_COLLECTION(8, 0x01), // Application
|
|
|
+ HID_RI_REPORT_ID(8, REPORT_ID_NKRO),
|
|
|
+ // Modifiers (8 bits)
|
|
|
+ HID_RI_USAGE_PAGE(8, 0x07), // Keyboard/Keypad
|
|
|
+ HID_RI_USAGE_MINIMUM(8, 0xE0), // Keyboard Left Control
|
|
|
+ HID_RI_USAGE_MAXIMUM(8, 0xE7), // Keyboard Right GUI
|
|
|
+ HID_RI_LOGICAL_MINIMUM(8, 0x00),
|
|
|
+ HID_RI_LOGICAL_MAXIMUM(8, 0x01),
|
|
|
+ HID_RI_REPORT_COUNT(8, 0x08),
|
|
|
+ HID_RI_REPORT_SIZE(8, 0x01),
|
|
|
+ HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
|
|
|
+ // Keycodes
|
|
|
+ HID_RI_USAGE_PAGE(8, 0x07), // Keyboard/Keypad
|
|
|
+ HID_RI_USAGE_MINIMUM(8, 0x00),
|
|
|
+ HID_RI_USAGE_MAXIMUM(8, KEYBOARD_REPORT_BITS * 8 - 1),
|
|
|
+ HID_RI_LOGICAL_MINIMUM(8, 0x00),
|
|
|
+ HID_RI_LOGICAL_MAXIMUM(8, 0x01),
|
|
|
+ HID_RI_REPORT_COUNT(8, KEYBOARD_REPORT_BITS * 8),
|
|
|
+ HID_RI_REPORT_SIZE(8, 0x01),
|
|
|
+ HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
|
|
|
+
|
|
|
+ // Status LEDs (5 bits)
|
|
|
+ HID_RI_USAGE_PAGE(8, 0x08), // LED
|
|
|
+ HID_RI_USAGE_MINIMUM(8, 0x01), // Num Lock
|
|
|
+ HID_RI_USAGE_MAXIMUM(8, 0x05), // Kana
|
|
|
+ HID_RI_REPORT_COUNT(8, 0x05),
|
|
|
+ HID_RI_REPORT_SIZE(8, 0x01),
|
|
|
+ HID_RI_OUTPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE | HID_IOF_NON_VOLATILE),
|
|
|
+ // LED padding (3 bits)
|
|
|
+ HID_RI_REPORT_COUNT(8, 0x01),
|
|
|
+ HID_RI_REPORT_SIZE(8, 0x03),
|
|
|
+ HID_RI_OUTPUT(8, HID_IOF_CONSTANT),
|
|
|
HID_RI_END_COLLECTION(0),
|
|
|
#endif
|
|
|
#ifdef SHARED_EP_ENABLE
|
|
|
@@ -230,46 +232,48 @@ const USB_Descriptor_HIDReport_Datatype_t PROGMEM SharedReport[] = {
|
|
|
|
|
|
#ifdef RAW_ENABLE
|
|
|
const USB_Descriptor_HIDReport_Datatype_t PROGMEM RawReport[] = {
|
|
|
- HID_RI_USAGE_PAGE(16, 0xFF60), // Vendor Defined
|
|
|
- HID_RI_USAGE(8, 0x61), // Vendor Defined
|
|
|
- HID_RI_COLLECTION(8, 0x01), // Application
|
|
|
- // Data to host
|
|
|
- HID_RI_USAGE(8, 0x62), // Vendor Defined
|
|
|
- HID_RI_LOGICAL_MINIMUM(8, 0x00),
|
|
|
- HID_RI_LOGICAL_MAXIMUM(16, 0x00FF),
|
|
|
- HID_RI_REPORT_COUNT(8, RAW_EPSIZE),
|
|
|
- HID_RI_REPORT_SIZE(8, 0x08),
|
|
|
- HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
|
|
|
- // Data from host
|
|
|
- HID_RI_USAGE(8, 0x63), // Vendor Defined
|
|
|
- HID_RI_LOGICAL_MINIMUM(8, 0x00),
|
|
|
- HID_RI_LOGICAL_MAXIMUM(16, 0x00FF),
|
|
|
- HID_RI_REPORT_COUNT(8, RAW_EPSIZE),
|
|
|
- HID_RI_REPORT_SIZE(8, 0x08),
|
|
|
- HID_RI_OUTPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE | HID_IOF_NON_VOLATILE),
|
|
|
+ HID_RI_USAGE_PAGE(16, 0xFF60), // Vendor Defined
|
|
|
+ HID_RI_USAGE(8, 0x61), // Vendor Defined
|
|
|
+ HID_RI_COLLECTION(8, 0x01), // Application
|
|
|
+ // Data to host
|
|
|
+ HID_RI_USAGE(8, 0x62), // Vendor Defined
|
|
|
+ HID_RI_LOGICAL_MINIMUM(8, 0x00),
|
|
|
+ HID_RI_LOGICAL_MAXIMUM(16, 0x00FF),
|
|
|
+ HID_RI_REPORT_COUNT(8, RAW_EPSIZE),
|
|
|
+ HID_RI_REPORT_SIZE(8, 0x08),
|
|
|
+ HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
|
|
|
+
|
|
|
+ // Data from host
|
|
|
+ HID_RI_USAGE(8, 0x63), // Vendor Defined
|
|
|
+ HID_RI_LOGICAL_MINIMUM(8, 0x00),
|
|
|
+ HID_RI_LOGICAL_MAXIMUM(16, 0x00FF),
|
|
|
+ HID_RI_REPORT_COUNT(8, RAW_EPSIZE),
|
|
|
+ HID_RI_REPORT_SIZE(8, 0x08),
|
|
|
+ HID_RI_OUTPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE | HID_IOF_NON_VOLATILE),
|
|
|
HID_RI_END_COLLECTION(0),
|
|
|
};
|
|
|
#endif
|
|
|
|
|
|
#ifdef CONSOLE_ENABLE
|
|
|
const USB_Descriptor_HIDReport_Datatype_t PROGMEM ConsoleReport[] = {
|
|
|
- HID_RI_USAGE_PAGE(16, 0xFF31), // Vendor Defined (PJRC Teensy compatible)
|
|
|
- HID_RI_USAGE(8, 0x74), // Vendor Defined (PJRC Teensy compatible)
|
|
|
- HID_RI_COLLECTION(8, 0x01), // Application
|
|
|
- // Data to host
|
|
|
- HID_RI_USAGE(8, 0x75), // Vendor Defined
|
|
|
- HID_RI_LOGICAL_MINIMUM(8, 0x00),
|
|
|
- HID_RI_LOGICAL_MAXIMUM(16, 0x00FF),
|
|
|
- HID_RI_REPORT_COUNT(8, CONSOLE_EPSIZE),
|
|
|
- HID_RI_REPORT_SIZE(8, 0x08),
|
|
|
- HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
|
|
|
- // Data from host
|
|
|
- HID_RI_USAGE(8, 0x76), // Vendor Defined
|
|
|
- HID_RI_LOGICAL_MINIMUM(8, 0x00),
|
|
|
- HID_RI_LOGICAL_MAXIMUM(16, 0x00FF),
|
|
|
- HID_RI_REPORT_COUNT(8, CONSOLE_EPSIZE),
|
|
|
- HID_RI_REPORT_SIZE(8, 0x08),
|
|
|
- HID_RI_OUTPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE | HID_IOF_NON_VOLATILE),
|
|
|
+ HID_RI_USAGE_PAGE(16, 0xFF31), // Vendor Defined (PJRC Teensy compatible)
|
|
|
+ HID_RI_USAGE(8, 0x74), // Vendor Defined (PJRC Teensy compatible)
|
|
|
+ HID_RI_COLLECTION(8, 0x01), // Application
|
|
|
+ // Data to host
|
|
|
+ HID_RI_USAGE(8, 0x75), // Vendor Defined
|
|
|
+ HID_RI_LOGICAL_MINIMUM(8, 0x00),
|
|
|
+ HID_RI_LOGICAL_MAXIMUM(16, 0x00FF),
|
|
|
+ HID_RI_REPORT_COUNT(8, CONSOLE_EPSIZE),
|
|
|
+ HID_RI_REPORT_SIZE(8, 0x08),
|
|
|
+ HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
|
|
|
+
|
|
|
+ // Data from host
|
|
|
+ HID_RI_USAGE(8, 0x76), // Vendor Defined
|
|
|
+ HID_RI_LOGICAL_MINIMUM(8, 0x00),
|
|
|
+ HID_RI_LOGICAL_MAXIMUM(16, 0x00FF),
|
|
|
+ HID_RI_REPORT_COUNT(8, CONSOLE_EPSIZE),
|
|
|
+ HID_RI_REPORT_SIZE(8, 0x08),
|
|
|
+ HID_RI_OUTPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE | HID_IOF_NON_VOLATILE),
|
|
|
HID_RI_END_COLLECTION(0),
|
|
|
};
|
|
|
#endif
|
|
|
@@ -277,26 +281,33 @@ const USB_Descriptor_HIDReport_Datatype_t PROGMEM ConsoleReport[] = {
|
|
|
/*
|
|
|
* Device descriptor
|
|
|
*/
|
|
|
-const USB_Descriptor_Device_t PROGMEM DeviceDescriptor = {.Header = {.Size = sizeof(USB_Descriptor_Device_t), .Type = DTYPE_Device},
|
|
|
- .USBSpecification = VERSION_BCD(1, 1, 0),
|
|
|
+const USB_Descriptor_Device_t PROGMEM DeviceDescriptor = {
|
|
|
+ .Header = {
|
|
|
+ .Size = sizeof(USB_Descriptor_Device_t),
|
|
|
+ .Type = DTYPE_Device
|
|
|
+ },
|
|
|
+ .USBSpecification = VERSION_BCD(1, 1, 0),
|
|
|
+
|
|
|
#if VIRTSER_ENABLE
|
|
|
- .Class = USB_CSCP_IADDeviceClass,
|
|
|
- .SubClass = USB_CSCP_IADDeviceSubclass,
|
|
|
- .Protocol = USB_CSCP_IADDeviceProtocol,
|
|
|
+ .Class = USB_CSCP_IADDeviceClass,
|
|
|
+ .SubClass = USB_CSCP_IADDeviceSubclass,
|
|
|
+ .Protocol = USB_CSCP_IADDeviceProtocol,
|
|
|
#else
|
|
|
- .Class = USB_CSCP_NoDeviceClass,
|
|
|
- .SubClass = USB_CSCP_NoDeviceSubclass,
|
|
|
- .Protocol = USB_CSCP_NoDeviceProtocol,
|
|
|
+ .Class = USB_CSCP_NoDeviceClass,
|
|
|
+ .SubClass = USB_CSCP_NoDeviceSubclass,
|
|
|
+ .Protocol = USB_CSCP_NoDeviceProtocol,
|
|
|
#endif
|
|
|
- .Endpoint0Size = FIXED_CONTROL_ENDPOINT_SIZE,
|
|
|
- // Specified in config.h
|
|
|
- .VendorID = VENDOR_ID,
|
|
|
- .ProductID = PRODUCT_ID,
|
|
|
- .ReleaseNumber = DEVICE_VER,
|
|
|
- .ManufacturerStrIndex = 0x01,
|
|
|
- .ProductStrIndex = 0x02,
|
|
|
- .SerialNumStrIndex = 0x03,
|
|
|
- .NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS};
|
|
|
+
|
|
|
+ .Endpoint0Size = FIXED_CONTROL_ENDPOINT_SIZE,
|
|
|
+ // Specified in config.h
|
|
|
+ .VendorID = VENDOR_ID,
|
|
|
+ .ProductID = PRODUCT_ID,
|
|
|
+ .ReleaseNumber = DEVICE_VER,
|
|
|
+ .ManufacturerStrIndex = 0x01,
|
|
|
+ .ProductStrIndex = 0x02,
|
|
|
+ .SerialNumStrIndex = 0x03,
|
|
|
+ .NumberOfConfigurations = FIXED_NUM_CONFIGURATIONS
|
|
|
+};
|
|
|
|
|
|
#ifndef USB_MAX_POWER_CONSUMPTION
|
|
|
# define USB_MAX_POWER_CONSUMPTION 500
|
|
|
@@ -309,197 +320,540 @@ const USB_Descriptor_Device_t PROGMEM DeviceDescriptor = {.Header = {.
|
|
|
/*
|
|
|
* Configuration descriptors
|
|
|
*/
|
|
|
-const USB_Descriptor_Configuration_t PROGMEM
|
|
|
- ConfigurationDescriptor =
|
|
|
- {
|
|
|
- .Config = {.Header = {.Size = sizeof(USB_Descriptor_Configuration_Header_t), .Type = DTYPE_Configuration}, .TotalConfigurationSize = sizeof(USB_Descriptor_Configuration_t), .TotalInterfaces = TOTAL_INTERFACES, .ConfigurationNumber = 1, .ConfigurationStrIndex = NO_DESCRIPTOR, .ConfigAttributes = (USB_CONFIG_ATTR_RESERVED | USB_CONFIG_ATTR_REMOTEWAKEUP), .MaxPowerConsumption = USB_CONFIG_POWER_MA(USB_MAX_POWER_CONSUMPTION)},
|
|
|
-
|
|
|
+const USB_Descriptor_Configuration_t PROGMEM ConfigurationDescriptor = {
|
|
|
+ .Config = {
|
|
|
+ .Header = {
|
|
|
+ .Size = sizeof(USB_Descriptor_Configuration_Header_t),
|
|
|
+ .Type = DTYPE_Configuration
|
|
|
+ },
|
|
|
+ .TotalConfigurationSize = sizeof(USB_Descriptor_Configuration_t),
|
|
|
+ .TotalInterfaces = TOTAL_INTERFACES,
|
|
|
+ .ConfigurationNumber = 1,
|
|
|
+ .ConfigurationStrIndex = NO_DESCRIPTOR,
|
|
|
+ .ConfigAttributes = (USB_CONFIG_ATTR_RESERVED | USB_CONFIG_ATTR_REMOTEWAKEUP),
|
|
|
+ .MaxPowerConsumption = USB_CONFIG_POWER_MA(USB_MAX_POWER_CONSUMPTION)
|
|
|
+ },
|
|
|
#ifndef KEYBOARD_SHARED_EP
|
|
|
- /*
|
|
|
- * Keyboard
|
|
|
- */
|
|
|
- .Keyboard_Interface = {.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
|
|
|
- .InterfaceNumber = KEYBOARD_INTERFACE,
|
|
|
- .AlternateSetting = 0x00,
|
|
|
- .TotalEndpoints = 1,
|
|
|
- .Class = HID_CSCP_HIDClass,
|
|
|
- .SubClass = HID_CSCP_BootSubclass,
|
|
|
- .Protocol = HID_CSCP_KeyboardBootProtocol,
|
|
|
-
|
|
|
- .InterfaceStrIndex = NO_DESCRIPTOR},
|
|
|
- .Keyboard_HID = {.Header = {.Size = sizeof(USB_HID_Descriptor_HID_t), .Type = HID_DTYPE_HID}, .HIDSpec = VERSION_BCD(1, 1, 1), .CountryCode = 0x00, .TotalReportDescriptors = 1, .HIDReportType = HID_DTYPE_Report, .HIDReportLength = sizeof(KeyboardReport)},
|
|
|
- .Keyboard_INEndpoint = {.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint}, .EndpointAddress = (ENDPOINT_DIR_IN | KEYBOARD_IN_EPNUM), .Attributes = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA), .EndpointSize = KEYBOARD_EPSIZE, .PollingIntervalMS = USB_POLLING_INTERVAL_MS},
|
|
|
+ /*
|
|
|
+ * Keyboard
|
|
|
+ */
|
|
|
+ .Keyboard_Interface = {
|
|
|
+ .Header = {
|
|
|
+ .Size = sizeof(USB_Descriptor_Interface_t),
|
|
|
+ .Type = DTYPE_Interface
|
|
|
+ },
|
|
|
+ .InterfaceNumber = KEYBOARD_INTERFACE,
|
|
|
+ .AlternateSetting = 0x00,
|
|
|
+ .TotalEndpoints = 1,
|
|
|
+ .Class = HID_CSCP_HIDClass,
|
|
|
+ .SubClass = HID_CSCP_BootSubclass,
|
|
|
+ .Protocol = HID_CSCP_KeyboardBootProtocol,
|
|
|
+ .InterfaceStrIndex = NO_DESCRIPTOR
|
|
|
+ },
|
|
|
+ .Keyboard_HID = {
|
|
|
+ .Header = {
|
|
|
+ .Size = sizeof(USB_HID_Descriptor_HID_t),
|
|
|
+ .Type = HID_DTYPE_HID
|
|
|
+ },
|
|
|
+ .HIDSpec = VERSION_BCD(1, 1, 1),
|
|
|
+ .CountryCode = 0x00,
|
|
|
+ .TotalReportDescriptors = 1,
|
|
|
+ .HIDReportType = HID_DTYPE_Report,
|
|
|
+ .HIDReportLength = sizeof(KeyboardReport)
|
|
|
+ },
|
|
|
+ .Keyboard_INEndpoint = {
|
|
|
+ .Header = {
|
|
|
+ .Size = sizeof(USB_Descriptor_Endpoint_t),
|
|
|
+ .Type = DTYPE_Endpoint
|
|
|
+ },
|
|
|
+ .EndpointAddress = (ENDPOINT_DIR_IN | KEYBOARD_IN_EPNUM),
|
|
|
+ .Attributes = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
|
|
|
+ .EndpointSize = KEYBOARD_EPSIZE,
|
|
|
+ .PollingIntervalMS = USB_POLLING_INTERVAL_MS
|
|
|
+ },
|
|
|
#endif
|
|
|
|
|
|
#ifdef RAW_ENABLE
|
|
|
- /*
|
|
|
- * Raw HID
|
|
|
- */
|
|
|
- .Raw_Interface = {.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface}, .InterfaceNumber = RAW_INTERFACE, .AlternateSetting = 0x00, .TotalEndpoints = 2, .Class = HID_CSCP_HIDClass, .SubClass = HID_CSCP_NonBootSubclass, .Protocol = HID_CSCP_NonBootProtocol, .InterfaceStrIndex = NO_DESCRIPTOR},
|
|
|
- .Raw_HID = {.Header = {.Size = sizeof(USB_HID_Descriptor_HID_t), .Type = HID_DTYPE_HID}, .HIDSpec = VERSION_BCD(1, 1, 1), .CountryCode = 0x00, .TotalReportDescriptors = 1, .HIDReportType = HID_DTYPE_Report, .HIDReportLength = sizeof(RawReport)},
|
|
|
- .Raw_INEndpoint = {.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint}, .EndpointAddress = (ENDPOINT_DIR_IN | RAW_IN_EPNUM), .Attributes = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA), .EndpointSize = RAW_EPSIZE, .PollingIntervalMS = 0x01},
|
|
|
- .Raw_OUTEndpoint = {.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint}, .EndpointAddress = (ENDPOINT_DIR_OUT | RAW_OUT_EPNUM), .Attributes = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA), .EndpointSize = RAW_EPSIZE, .PollingIntervalMS = 0x01},
|
|
|
+ /*
|
|
|
+ * Raw HID
|
|
|
+ */
|
|
|
+ .Raw_Interface = {
|
|
|
+ .Header = {
|
|
|
+ .Size = sizeof(USB_Descriptor_Interface_t),
|
|
|
+ .Type = DTYPE_Interface
|
|
|
+ },
|
|
|
+ .InterfaceNumber = RAW_INTERFACE,
|
|
|
+ .AlternateSetting = 0x00,
|
|
|
+ .TotalEndpoints = 2,
|
|
|
+ .Class = HID_CSCP_HIDClass,
|
|
|
+ .SubClass = HID_CSCP_NonBootSubclass,
|
|
|
+ .Protocol = HID_CSCP_NonBootProtocol,
|
|
|
+ .InterfaceStrIndex = NO_DESCRIPTOR
|
|
|
+ },
|
|
|
+ .Raw_HID = {
|
|
|
+ .Header = {
|
|
|
+ .Size = sizeof(USB_HID_Descriptor_HID_t),
|
|
|
+ .Type = HID_DTYPE_HID
|
|
|
+ },
|
|
|
+ .HIDSpec = VERSION_BCD(1, 1, 1),
|
|
|
+ .CountryCode = 0x00,
|
|
|
+ .TotalReportDescriptors = 1,
|
|
|
+ .HIDReportType = HID_DTYPE_Report,
|
|
|
+ .HIDReportLength = sizeof(RawReport)
|
|
|
+ },
|
|
|
+ .Raw_INEndpoint = {
|
|
|
+ .Header = {
|
|
|
+ .Size = sizeof(USB_Descriptor_Endpoint_t),
|
|
|
+ .Type = DTYPE_Endpoint
|
|
|
+ },
|
|
|
+ .EndpointAddress = (ENDPOINT_DIR_IN | RAW_IN_EPNUM),
|
|
|
+ .Attributes = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
|
|
|
+ .EndpointSize = RAW_EPSIZE,
|
|
|
+ .PollingIntervalMS = 0x01
|
|
|
+ },
|
|
|
+ .Raw_OUTEndpoint = {
|
|
|
+ .Header = {
|
|
|
+ .Size = sizeof(USB_Descriptor_Endpoint_t),
|
|
|
+ .Type = DTYPE_Endpoint
|
|
|
+ },
|
|
|
+ .EndpointAddress = (ENDPOINT_DIR_OUT | RAW_OUT_EPNUM),
|
|
|
+ .Attributes = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
|
|
|
+ .EndpointSize = RAW_EPSIZE,
|
|
|
+ .PollingIntervalMS = 0x01
|
|
|
+ },
|
|
|
#endif
|
|
|
|
|
|
#if defined(MOUSE_ENABLE) && !defined(MOUSE_SHARED_EP)
|
|
|
- /*
|
|
|
- * Mouse
|
|
|
- */
|
|
|
- .Mouse_Interface = {.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface}, .InterfaceNumber = MOUSE_INTERFACE, .AlternateSetting = 0x00, .TotalEndpoints = 1, .Class = HID_CSCP_HIDClass, .SubClass = HID_CSCP_BootSubclass, .Protocol = HID_CSCP_MouseBootProtocol, .InterfaceStrIndex = NO_DESCRIPTOR},
|
|
|
- .Mouse_HID = {.Header = {.Size = sizeof(USB_HID_Descriptor_HID_t), .Type = HID_DTYPE_HID}, .HIDSpec = VERSION_BCD(1, 1, 1), .CountryCode = 0x00, .TotalReportDescriptors = 1, .HIDReportType = HID_DTYPE_Report, .HIDReportLength = sizeof(MouseReport)},
|
|
|
- .Mouse_INEndpoint = {.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint}, .EndpointAddress = (ENDPOINT_DIR_IN | MOUSE_IN_EPNUM), .Attributes = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA), .EndpointSize = MOUSE_EPSIZE, .PollingIntervalMS = USB_POLLING_INTERVAL_MS},
|
|
|
+ /*
|
|
|
+ * Mouse
|
|
|
+ */
|
|
|
+ .Mouse_Interface = {
|
|
|
+ .Header = {
|
|
|
+ .Size = sizeof(USB_Descriptor_Interface_t),
|
|
|
+ .Type = DTYPE_Interface
|
|
|
+ },
|
|
|
+ .InterfaceNumber = MOUSE_INTERFACE,
|
|
|
+ .AlternateSetting = 0x00,
|
|
|
+ .TotalEndpoints = 1,
|
|
|
+ .Class = HID_CSCP_HIDClass,
|
|
|
+ .SubClass = HID_CSCP_BootSubclass,
|
|
|
+ .Protocol = HID_CSCP_MouseBootProtocol,
|
|
|
+ .InterfaceStrIndex = NO_DESCRIPTOR
|
|
|
+ },
|
|
|
+ .Mouse_HID = {
|
|
|
+ .Header = {
|
|
|
+ .Size = sizeof(USB_HID_Descriptor_HID_t),
|
|
|
+ .Type = HID_DTYPE_HID
|
|
|
+ },
|
|
|
+ .HIDSpec = VERSION_BCD(1, 1, 1),
|
|
|
+ .CountryCode = 0x00,
|
|
|
+ .TotalReportDescriptors = 1,
|
|
|
+ .HIDReportType = HID_DTYPE_Report,
|
|
|
+ .HIDReportLength = sizeof(MouseReport)
|
|
|
+ },
|
|
|
+ .Mouse_INEndpoint = {
|
|
|
+ .Header = {
|
|
|
+ .Size = sizeof(USB_Descriptor_Endpoint_t),
|
|
|
+ .Type = DTYPE_Endpoint
|
|
|
+ },
|
|
|
+ .EndpointAddress = (ENDPOINT_DIR_IN | MOUSE_IN_EPNUM),
|
|
|
+ .Attributes = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
|
|
|
+ .EndpointSize = MOUSE_EPSIZE,
|
|
|
+ .PollingIntervalMS = USB_POLLING_INTERVAL_MS
|
|
|
+ },
|
|
|
#endif
|
|
|
|
|
|
#ifdef SHARED_EP_ENABLE
|
|
|
- /*
|
|
|
- * Shared
|
|
|
- */
|
|
|
- .Shared_Interface = {.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
|
|
|
- .InterfaceNumber = SHARED_INTERFACE,
|
|
|
- .AlternateSetting = 0x00,
|
|
|
- .TotalEndpoints = 1,
|
|
|
- .Class = HID_CSCP_HIDClass,
|
|
|
+ /*
|
|
|
+ * Shared
|
|
|
+ */
|
|
|
+ .Shared_Interface = {
|
|
|
+ .Header = {
|
|
|
+ .Size = sizeof(USB_Descriptor_Interface_t),
|
|
|
+ .Type = DTYPE_Interface
|
|
|
+ },
|
|
|
+ .InterfaceNumber = SHARED_INTERFACE,
|
|
|
+ .AlternateSetting = 0x00,
|
|
|
+ .TotalEndpoints = 1,
|
|
|
+ .Class = HID_CSCP_HIDClass,
|
|
|
# ifdef KEYBOARD_SHARED_EP
|
|
|
- .SubClass = HID_CSCP_BootSubclass,
|
|
|
- .Protocol = HID_CSCP_KeyboardBootProtocol,
|
|
|
+ .SubClass = HID_CSCP_BootSubclass,
|
|
|
+ .Protocol = HID_CSCP_KeyboardBootProtocol,
|
|
|
# else
|
|
|
- .SubClass = HID_CSCP_NonBootSubclass,
|
|
|
- .Protocol = HID_CSCP_NonBootProtocol,
|
|
|
+ .SubClass = HID_CSCP_NonBootSubclass,
|
|
|
+ .Protocol = HID_CSCP_NonBootProtocol,
|
|
|
# endif
|
|
|
- .InterfaceStrIndex = NO_DESCRIPTOR},
|
|
|
- .Shared_HID = {.Header = {.Size = sizeof(USB_HID_Descriptor_HID_t), .Type = HID_DTYPE_HID}, .HIDSpec = VERSION_BCD(1, 1, 1), .CountryCode = 0x00, .TotalReportDescriptors = 1, .HIDReportType = HID_DTYPE_Report, .HIDReportLength = sizeof(SharedReport)},
|
|
|
- .Shared_INEndpoint = {.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint}, .EndpointAddress = (ENDPOINT_DIR_IN | SHARED_IN_EPNUM), .Attributes = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA), .EndpointSize = SHARED_EPSIZE, .PollingIntervalMS = USB_POLLING_INTERVAL_MS},
|
|
|
+ .InterfaceStrIndex = NO_DESCRIPTOR
|
|
|
+ },
|
|
|
+ .Shared_HID = {
|
|
|
+ .Header = {
|
|
|
+ .Size = sizeof(USB_HID_Descriptor_HID_t),
|
|
|
+ .Type = HID_DTYPE_HID
|
|
|
+ },
|
|
|
+ .HIDSpec = VERSION_BCD(1, 1, 1),
|
|
|
+ .CountryCode = 0x00,
|
|
|
+ .TotalReportDescriptors = 1,
|
|
|
+ .HIDReportType = HID_DTYPE_Report,
|
|
|
+ .HIDReportLength = sizeof(SharedReport)
|
|
|
+ },
|
|
|
+ .Shared_INEndpoint = {
|
|
|
+ .Header = {
|
|
|
+ .Size = sizeof(USB_Descriptor_Endpoint_t),
|
|
|
+ .Type = DTYPE_Endpoint
|
|
|
+ },
|
|
|
+ .EndpointAddress = (ENDPOINT_DIR_IN | SHARED_IN_EPNUM),
|
|
|
+ .Attributes = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
|
|
|
+ .EndpointSize = SHARED_EPSIZE,
|
|
|
+ .PollingIntervalMS = USB_POLLING_INTERVAL_MS
|
|
|
+ },
|
|
|
#endif
|
|
|
|
|
|
#ifdef CONSOLE_ENABLE
|
|
|
- /*
|
|
|
- * Console
|
|
|
- */
|
|
|
- .Console_Interface = {.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface}, .InterfaceNumber = CONSOLE_INTERFACE, .AlternateSetting = 0x00, .TotalEndpoints = 2, .Class = HID_CSCP_HIDClass, .SubClass = HID_CSCP_NonBootSubclass, .Protocol = HID_CSCP_NonBootProtocol, .InterfaceStrIndex = NO_DESCRIPTOR},
|
|
|
- .Console_HID = {.Header = {.Size = sizeof(USB_HID_Descriptor_HID_t), .Type = HID_DTYPE_HID}, .HIDSpec = VERSION_BCD(1, 1, 1), .CountryCode = 0x00, .TotalReportDescriptors = 1, .HIDReportType = HID_DTYPE_Report, .HIDReportLength = sizeof(ConsoleReport)},
|
|
|
- .Console_INEndpoint = {.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint}, .EndpointAddress = (ENDPOINT_DIR_IN | CONSOLE_IN_EPNUM), .Attributes = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA), .EndpointSize = CONSOLE_EPSIZE, .PollingIntervalMS = 0x01},
|
|
|
- .Console_OUTEndpoint = {.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint}, .EndpointAddress = (ENDPOINT_DIR_OUT | CONSOLE_OUT_EPNUM), .Attributes = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA), .EndpointSize = CONSOLE_EPSIZE, .PollingIntervalMS = 0x01},
|
|
|
+ /*
|
|
|
+ * Console
|
|
|
+ */
|
|
|
+ .Console_Interface = {
|
|
|
+ .Header = {
|
|
|
+ .Size = sizeof(USB_Descriptor_Interface_t),
|
|
|
+ .Type = DTYPE_Interface
|
|
|
+ },
|
|
|
+ .InterfaceNumber = CONSOLE_INTERFACE,
|
|
|
+ .AlternateSetting = 0x00,
|
|
|
+ .TotalEndpoints = 2,
|
|
|
+ .Class = HID_CSCP_HIDClass,
|
|
|
+ .SubClass = HID_CSCP_NonBootSubclass,
|
|
|
+ .Protocol = HID_CSCP_NonBootProtocol,
|
|
|
+ .InterfaceStrIndex = NO_DESCRIPTOR
|
|
|
+ },
|
|
|
+ .Console_HID = {
|
|
|
+ .Header = {
|
|
|
+ .Size = sizeof(USB_HID_Descriptor_HID_t),
|
|
|
+ .Type = HID_DTYPE_HID
|
|
|
+ },
|
|
|
+ .HIDSpec = VERSION_BCD(1, 1, 1),
|
|
|
+ .CountryCode = 0x00,
|
|
|
+ .TotalReportDescriptors = 1,
|
|
|
+ .HIDReportType = HID_DTYPE_Report,
|
|
|
+ .HIDReportLength = sizeof(ConsoleReport)
|
|
|
+ },
|
|
|
+ .Console_INEndpoint = {
|
|
|
+ .Header = {
|
|
|
+ .Size = sizeof(USB_Descriptor_Endpoint_t),
|
|
|
+ .Type = DTYPE_Endpoint
|
|
|
+ },
|
|
|
+ .EndpointAddress = (ENDPOINT_DIR_IN | CONSOLE_IN_EPNUM),
|
|
|
+ .Attributes = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
|
|
|
+ .EndpointSize = CONSOLE_EPSIZE,
|
|
|
+ .PollingIntervalMS = 0x01
|
|
|
+ },
|
|
|
+ .Console_OUTEndpoint = {
|
|
|
+ .Header = {
|
|
|
+ .Size = sizeof(USB_Descriptor_Endpoint_t),
|
|
|
+ .Type = DTYPE_Endpoint
|
|
|
+ },
|
|
|
+ .EndpointAddress = (ENDPOINT_DIR_OUT | CONSOLE_OUT_EPNUM),
|
|
|
+ .Attributes = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
|
|
|
+ .EndpointSize = CONSOLE_EPSIZE,
|
|
|
+ .PollingIntervalMS = 0x01
|
|
|
+ },
|
|
|
#endif
|
|
|
|
|
|
#ifdef MIDI_ENABLE
|
|
|
- /*
|
|
|
- * MIDI
|
|
|
- */
|
|
|
- .Audio_Interface_Association =
|
|
|
- {
|
|
|
- .Header = {.Size = sizeof(USB_Descriptor_Interface_Association_t), .Type = DTYPE_InterfaceAssociation},
|
|
|
- .FirstInterfaceIndex = AC_INTERFACE,
|
|
|
- .TotalInterfaces = 2,
|
|
|
- .Class = AUDIO_CSCP_AudioClass,
|
|
|
- .SubClass = AUDIO_CSCP_ControlSubclass,
|
|
|
- .Protocol = AUDIO_CSCP_ControlProtocol,
|
|
|
- .IADStrIndex = NO_DESCRIPTOR,
|
|
|
- },
|
|
|
- .Audio_ControlInterface = {.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
|
|
|
-
|
|
|
- .InterfaceNumber = AC_INTERFACE,
|
|
|
- .AlternateSetting = 0,
|
|
|
- .TotalEndpoints = 0,
|
|
|
- .Class = AUDIO_CSCP_AudioClass,
|
|
|
- .SubClass = AUDIO_CSCP_ControlSubclass,
|
|
|
- .Protocol = AUDIO_CSCP_ControlProtocol,
|
|
|
- .InterfaceStrIndex = NO_DESCRIPTOR},
|
|
|
- .Audio_ControlInterface_SPC =
|
|
|
- {
|
|
|
- .Header = {.Size = sizeof(USB_Audio_Descriptor_Interface_AC_t), .Type = AUDIO_DTYPE_CSInterface},
|
|
|
- .Subtype = AUDIO_DSUBTYPE_CSInterface_Header,
|
|
|
- .ACSpecification = VERSION_BCD(1, 0, 0),
|
|
|
- .TotalLength = sizeof(USB_Audio_Descriptor_Interface_AC_t),
|
|
|
- .InCollection = 1,
|
|
|
- .InterfaceNumber = AS_INTERFACE,
|
|
|
- },
|
|
|
- .Audio_StreamInterface = {.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface},
|
|
|
-
|
|
|
- .InterfaceNumber = AS_INTERFACE,
|
|
|
- .AlternateSetting = 0,
|
|
|
- .TotalEndpoints = 2,
|
|
|
- .Class = AUDIO_CSCP_AudioClass,
|
|
|
- .SubClass = AUDIO_CSCP_MIDIStreamingSubclass,
|
|
|
- .Protocol = AUDIO_CSCP_StreamingProtocol,
|
|
|
- .InterfaceStrIndex = NO_DESCRIPTOR},
|
|
|
- .Audio_StreamInterface_SPC = {.Header = {.Size = sizeof(USB_MIDI_Descriptor_AudioInterface_AS_t), .Type = AUDIO_DTYPE_CSInterface}, .Subtype = AUDIO_DSUBTYPE_CSInterface_General, .AudioSpecification = VERSION_BCD(1, 0, 0), .TotalLength = offsetof(USB_Descriptor_Configuration_t, MIDI_Out_Jack_Endpoint_SPC) + sizeof(USB_MIDI_Descriptor_Jack_Endpoint_t) - offsetof(USB_Descriptor_Configuration_t, Audio_StreamInterface_SPC)},
|
|
|
- .MIDI_In_Jack_Emb = {.Header = {.Size = sizeof(USB_MIDI_Descriptor_InputJack_t), .Type = AUDIO_DTYPE_CSInterface}, .Subtype = AUDIO_DSUBTYPE_CSInterface_InputTerminal, .JackType = MIDI_JACKTYPE_Embedded, .JackID = 0x01, .JackStrIndex = NO_DESCRIPTOR},
|
|
|
- .MIDI_In_Jack_Ext = {.Header = {.Size = sizeof(USB_MIDI_Descriptor_InputJack_t), .Type = AUDIO_DTYPE_CSInterface}, .Subtype = AUDIO_DSUBTYPE_CSInterface_InputTerminal, .JackType = MIDI_JACKTYPE_External, .JackID = 0x02, .JackStrIndex = NO_DESCRIPTOR},
|
|
|
- .MIDI_Out_Jack_Emb = {.Header = {.Size = sizeof(USB_MIDI_Descriptor_OutputJack_t), .Type = AUDIO_DTYPE_CSInterface}, .Subtype = AUDIO_DSUBTYPE_CSInterface_OutputTerminal, .JackType = MIDI_JACKTYPE_Embedded, .JackID = 0x03, .NumberOfPins = 1, .SourceJackID = {0x02}, .SourcePinID = {0x01}, .JackStrIndex = NO_DESCRIPTOR},
|
|
|
- .MIDI_Out_Jack_Ext = {.Header = {.Size = sizeof(USB_MIDI_Descriptor_OutputJack_t), .Type = AUDIO_DTYPE_CSInterface}, .Subtype = AUDIO_DSUBTYPE_CSInterface_OutputTerminal, .JackType = MIDI_JACKTYPE_External, .JackID = 0x04, .NumberOfPins = 1, .SourceJackID = {0x01}, .SourcePinID = {0x01}, .JackStrIndex = NO_DESCRIPTOR},
|
|
|
- .MIDI_In_Jack_Endpoint = {.Endpoint = {.Header = {.Size = sizeof(USB_Audio_Descriptor_StreamEndpoint_Std_t), .Type = DTYPE_Endpoint}, .EndpointAddress = MIDI_STREAM_OUT_EPADDR, .Attributes = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA), .EndpointSize = MIDI_STREAM_EPSIZE, .PollingIntervalMS = 0x05},
|
|
|
-
|
|
|
- .Refresh = 0,
|
|
|
- .SyncEndpointNumber = 0},
|
|
|
- .MIDI_In_Jack_Endpoint_SPC = {.Header = {.Size = sizeof(USB_MIDI_Descriptor_Jack_Endpoint_t), .Type = AUDIO_DTYPE_CSEndpoint}, .Subtype = AUDIO_DSUBTYPE_CSEndpoint_General, .TotalEmbeddedJacks = 0x01, .AssociatedJackID = {0x01}},
|
|
|
- .MIDI_Out_Jack_Endpoint = {.Endpoint = {.Header = {.Size = sizeof(USB_Audio_Descriptor_StreamEndpoint_Std_t), .Type = DTYPE_Endpoint}, .EndpointAddress = MIDI_STREAM_IN_EPADDR, .Attributes = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA), .EndpointSize = MIDI_STREAM_EPSIZE, .PollingIntervalMS = 0x05},
|
|
|
-
|
|
|
- .Refresh = 0,
|
|
|
- .SyncEndpointNumber = 0},
|
|
|
- .MIDI_Out_Jack_Endpoint_SPC = {.Header = {.Size = sizeof(USB_MIDI_Descriptor_Jack_Endpoint_t), .Type = AUDIO_DTYPE_CSEndpoint}, .Subtype = AUDIO_DSUBTYPE_CSEndpoint_General, .TotalEmbeddedJacks = 0x01, .AssociatedJackID = {0x03}},
|
|
|
+ /*
|
|
|
+ * MIDI
|
|
|
+ */
|
|
|
+ .Audio_Interface_Association = {
|
|
|
+ .Header = {
|
|
|
+ .Size = sizeof(USB_Descriptor_Interface_Association_t),
|
|
|
+ .Type = DTYPE_InterfaceAssociation
|
|
|
+ },
|
|
|
+ .FirstInterfaceIndex = AC_INTERFACE,
|
|
|
+ .TotalInterfaces = 2,
|
|
|
+ .Class = AUDIO_CSCP_AudioClass,
|
|
|
+ .SubClass = AUDIO_CSCP_ControlSubclass,
|
|
|
+ .Protocol = AUDIO_CSCP_ControlProtocol,
|
|
|
+ .IADStrIndex = NO_DESCRIPTOR,
|
|
|
+ },
|
|
|
+ .Audio_ControlInterface = {
|
|
|
+ .Header = {
|
|
|
+ .Size = sizeof(USB_Descriptor_Interface_t),
|
|
|
+ .Type = DTYPE_Interface
|
|
|
+ },
|
|
|
+ .InterfaceNumber = AC_INTERFACE,
|
|
|
+ .AlternateSetting = 0,
|
|
|
+ .TotalEndpoints = 0,
|
|
|
+ .Class = AUDIO_CSCP_AudioClass,
|
|
|
+ .SubClass = AUDIO_CSCP_ControlSubclass,
|
|
|
+ .Protocol = AUDIO_CSCP_ControlProtocol,
|
|
|
+ .InterfaceStrIndex = NO_DESCRIPTOR
|
|
|
+ },
|
|
|
+ .Audio_ControlInterface_SPC = {
|
|
|
+ .Header = {
|
|
|
+ .Size = sizeof(USB_Audio_Descriptor_Interface_AC_t),
|
|
|
+ .Type = AUDIO_DTYPE_CSInterface
|
|
|
+ },
|
|
|
+ .Subtype = AUDIO_DSUBTYPE_CSInterface_Header,
|
|
|
+ .ACSpecification = VERSION_BCD(1, 0, 0),
|
|
|
+ .TotalLength = sizeof(USB_Audio_Descriptor_Interface_AC_t),
|
|
|
+ .InCollection = 1,
|
|
|
+ .InterfaceNumber = AS_INTERFACE,
|
|
|
+ },
|
|
|
+ .Audio_StreamInterface = {
|
|
|
+ .Header = {
|
|
|
+ .Size = sizeof(USB_Descriptor_Interface_t),
|
|
|
+ .Type = DTYPE_Interface
|
|
|
+ },
|
|
|
+ .InterfaceNumber = AS_INTERFACE,
|
|
|
+ .AlternateSetting = 0,
|
|
|
+ .TotalEndpoints = 2,
|
|
|
+ .Class = AUDIO_CSCP_AudioClass,
|
|
|
+ .SubClass = AUDIO_CSCP_MIDIStreamingSubclass,
|
|
|
+ .Protocol = AUDIO_CSCP_StreamingProtocol,
|
|
|
+ .InterfaceStrIndex = NO_DESCRIPTOR
|
|
|
+ },
|
|
|
+ .Audio_StreamInterface_SPC = {
|
|
|
+ .Header = {
|
|
|
+ .Size = sizeof(USB_MIDI_Descriptor_AudioInterface_AS_t),
|
|
|
+ .Type = AUDIO_DTYPE_CSInterface
|
|
|
+ },
|
|
|
+ .Subtype = AUDIO_DSUBTYPE_CSInterface_General,
|
|
|
+ .AudioSpecification = VERSION_BCD(1, 0, 0),
|
|
|
+ .TotalLength = offsetof(USB_Descriptor_Configuration_t, MIDI_Out_Jack_Endpoint_SPC) + sizeof(USB_MIDI_Descriptor_Jack_Endpoint_t) - offsetof(USB_Descriptor_Configuration_t, Audio_StreamInterface_SPC)
|
|
|
+ },
|
|
|
+ .MIDI_In_Jack_Emb = {
|
|
|
+ .Header = {
|
|
|
+ .Size = sizeof(USB_MIDI_Descriptor_InputJack_t),
|
|
|
+ .Type = AUDIO_DTYPE_CSInterface
|
|
|
+ },
|
|
|
+ .Subtype = AUDIO_DSUBTYPE_CSInterface_InputTerminal,
|
|
|
+ .JackType = MIDI_JACKTYPE_Embedded,
|
|
|
+ .JackID = 0x01,
|
|
|
+ .JackStrIndex = NO_DESCRIPTOR
|
|
|
+ },
|
|
|
+ .MIDI_In_Jack_Ext = {
|
|
|
+ .Header = {
|
|
|
+ .Size = sizeof(USB_MIDI_Descriptor_InputJack_t),
|
|
|
+ .Type = AUDIO_DTYPE_CSInterface
|
|
|
+ },
|
|
|
+ .Subtype = AUDIO_DSUBTYPE_CSInterface_InputTerminal,
|
|
|
+ .JackType = MIDI_JACKTYPE_External,
|
|
|
+ .JackID = 0x02,
|
|
|
+ .JackStrIndex = NO_DESCRIPTOR
|
|
|
+ },
|
|
|
+ .MIDI_Out_Jack_Emb = {
|
|
|
+ .Header = {
|
|
|
+ .Size = sizeof(USB_MIDI_Descriptor_OutputJack_t),
|
|
|
+ .Type = AUDIO_DTYPE_CSInterface
|
|
|
+ },
|
|
|
+ .Subtype = AUDIO_DSUBTYPE_CSInterface_OutputTerminal,
|
|
|
+ .JackType = MIDI_JACKTYPE_Embedded,
|
|
|
+ .JackID = 0x03,
|
|
|
+ .NumberOfPins = 1,
|
|
|
+ .SourceJackID = {0x02},
|
|
|
+ .SourcePinID = {0x01},
|
|
|
+ .JackStrIndex = NO_DESCRIPTOR
|
|
|
+ },
|
|
|
+ .MIDI_Out_Jack_Ext = {
|
|
|
+ .Header = {
|
|
|
+ .Size = sizeof(USB_MIDI_Descriptor_OutputJack_t),
|
|
|
+ .Type = AUDIO_DTYPE_CSInterface
|
|
|
+ },
|
|
|
+ .Subtype = AUDIO_DSUBTYPE_CSInterface_OutputTerminal,
|
|
|
+ .JackType = MIDI_JACKTYPE_External,
|
|
|
+ .JackID = 0x04,
|
|
|
+ .NumberOfPins = 1,
|
|
|
+ .SourceJackID = {0x01},
|
|
|
+ .SourcePinID = {0x01},
|
|
|
+ .JackStrIndex = NO_DESCRIPTOR
|
|
|
+ },
|
|
|
+ .MIDI_In_Jack_Endpoint = {
|
|
|
+ .Endpoint = {
|
|
|
+ .Header = {
|
|
|
+ .Size = sizeof(USB_Audio_Descriptor_StreamEndpoint_Std_t),
|
|
|
+ .Type = DTYPE_Endpoint
|
|
|
+ },
|
|
|
+ .EndpointAddress = MIDI_STREAM_OUT_EPADDR,
|
|
|
+ .Attributes = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
|
|
|
+ .EndpointSize = MIDI_STREAM_EPSIZE,
|
|
|
+ .PollingIntervalMS = 0x05
|
|
|
+ },
|
|
|
+ .Refresh = 0,
|
|
|
+ .SyncEndpointNumber = 0
|
|
|
+ },
|
|
|
+ .MIDI_In_Jack_Endpoint_SPC = {
|
|
|
+ .Header = {
|
|
|
+ .Size = sizeof(USB_MIDI_Descriptor_Jack_Endpoint_t),
|
|
|
+ .Type = AUDIO_DTYPE_CSEndpoint
|
|
|
+ },
|
|
|
+ .Subtype = AUDIO_DSUBTYPE_CSEndpoint_General,
|
|
|
+ .TotalEmbeddedJacks = 0x01,
|
|
|
+ .AssociatedJackID = {0x01}
|
|
|
+ },
|
|
|
+ .MIDI_Out_Jack_Endpoint = {
|
|
|
+ .Endpoint = {
|
|
|
+ .Header = {
|
|
|
+ .Size = sizeof(USB_Audio_Descriptor_StreamEndpoint_Std_t),
|
|
|
+ .Type = DTYPE_Endpoint
|
|
|
+ },
|
|
|
+ .EndpointAddress = MIDI_STREAM_IN_EPADDR,
|
|
|
+ .Attributes = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
|
|
|
+ .EndpointSize = MIDI_STREAM_EPSIZE,
|
|
|
+ .PollingIntervalMS = 0x05
|
|
|
+ },
|
|
|
+ .Refresh = 0,
|
|
|
+ .SyncEndpointNumber = 0
|
|
|
+ },
|
|
|
+ .MIDI_Out_Jack_Endpoint_SPC = {
|
|
|
+ .Header = {
|
|
|
+ .Size = sizeof(USB_MIDI_Descriptor_Jack_Endpoint_t),
|
|
|
+ .Type = AUDIO_DTYPE_CSEndpoint
|
|
|
+ },
|
|
|
+ .Subtype = AUDIO_DSUBTYPE_CSEndpoint_General,
|
|
|
+ .TotalEmbeddedJacks = 0x01,
|
|
|
+ .AssociatedJackID = {0x03}
|
|
|
+ },
|
|
|
#endif
|
|
|
|
|
|
#ifdef VIRTSER_ENABLE
|
|
|
- /*
|
|
|
- * Virtual Serial
|
|
|
- */
|
|
|
- .CDC_Interface_Association =
|
|
|
- {
|
|
|
- .Header = {.Size = sizeof(USB_Descriptor_Interface_Association_t), .Type = DTYPE_InterfaceAssociation},
|
|
|
- .FirstInterfaceIndex = CCI_INTERFACE,
|
|
|
- .TotalInterfaces = 2,
|
|
|
- .Class = CDC_CSCP_CDCClass,
|
|
|
- .SubClass = CDC_CSCP_ACMSubclass,
|
|
|
- .Protocol = CDC_CSCP_ATCommandProtocol,
|
|
|
- .IADStrIndex = NO_DESCRIPTOR,
|
|
|
- },
|
|
|
- .CDC_CCI_Interface = {.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface}, .InterfaceNumber = CCI_INTERFACE, .AlternateSetting = 0, .TotalEndpoints = 1, .Class = CDC_CSCP_CDCClass, .SubClass = CDC_CSCP_ACMSubclass, .Protocol = CDC_CSCP_ATCommandProtocol, .InterfaceStrIndex = NO_DESCRIPTOR},
|
|
|
- .CDC_Functional_Header =
|
|
|
- {
|
|
|
- .Header = {.Size = sizeof(USB_CDC_Descriptor_FunctionalHeader_t), .Type = CDC_DTYPE_CSInterface},
|
|
|
- .Subtype = 0x00,
|
|
|
- .CDCSpecification = VERSION_BCD(1, 1, 0),
|
|
|
- },
|
|
|
- .CDC_Functional_ACM =
|
|
|
- {
|
|
|
- .Header = {.Size = sizeof(USB_CDC_Descriptor_FunctionalACM_t), .Type = CDC_DTYPE_CSInterface},
|
|
|
- .Subtype = 0x02,
|
|
|
- .Capabilities = 0x02,
|
|
|
- },
|
|
|
- .CDC_Functional_Union =
|
|
|
- {
|
|
|
- .Header = {.Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t), .Type = CDC_DTYPE_CSInterface},
|
|
|
- .Subtype = 0x06,
|
|
|
- .MasterInterfaceNumber = CCI_INTERFACE,
|
|
|
- .SlaveInterfaceNumber = CDI_INTERFACE,
|
|
|
- },
|
|
|
- .CDC_NotificationEndpoint = {.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint}, .EndpointAddress = CDC_NOTIFICATION_EPADDR, .Attributes = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA), .EndpointSize = CDC_NOTIFICATION_EPSIZE, .PollingIntervalMS = 0xFF},
|
|
|
- .CDC_DCI_Interface = {.Header = {.Size = sizeof(USB_Descriptor_Interface_t), .Type = DTYPE_Interface}, .InterfaceNumber = CDI_INTERFACE, .AlternateSetting = 0, .TotalEndpoints = 2, .Class = CDC_CSCP_CDCDataClass, .SubClass = CDC_CSCP_NoDataSubclass, .Protocol = CDC_CSCP_NoDataProtocol, .InterfaceStrIndex = NO_DESCRIPTOR},
|
|
|
- .CDC_DataOutEndpoint = {.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint}, .EndpointAddress = CDC_OUT_EPADDR, .Attributes = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA), .EndpointSize = CDC_EPSIZE, .PollingIntervalMS = 0x05},
|
|
|
- .CDC_DataInEndpoint = {.Header = {.Size = sizeof(USB_Descriptor_Endpoint_t), .Type = DTYPE_Endpoint}, .EndpointAddress = CDC_IN_EPADDR, .Attributes = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA), .EndpointSize = CDC_EPSIZE, .PollingIntervalMS = 0x05},
|
|
|
+ /*
|
|
|
+ * Virtual Serial
|
|
|
+ */
|
|
|
+ .CDC_Interface_Association = {
|
|
|
+ .Header = {
|
|
|
+ .Size = sizeof(USB_Descriptor_Interface_Association_t),
|
|
|
+ .Type = DTYPE_InterfaceAssociation
|
|
|
+ },
|
|
|
+ .FirstInterfaceIndex = CCI_INTERFACE,
|
|
|
+ .TotalInterfaces = 2,
|
|
|
+ .Class = CDC_CSCP_CDCClass,
|
|
|
+ .SubClass = CDC_CSCP_ACMSubclass,
|
|
|
+ .Protocol = CDC_CSCP_ATCommandProtocol,
|
|
|
+ .IADStrIndex = NO_DESCRIPTOR,
|
|
|
+ },
|
|
|
+ .CDC_CCI_Interface = {
|
|
|
+ .Header = {
|
|
|
+ .Size = sizeof(USB_Descriptor_Interface_t),
|
|
|
+ .Type = DTYPE_Interface
|
|
|
+ },
|
|
|
+ .InterfaceNumber = CCI_INTERFACE,
|
|
|
+ .AlternateSetting = 0,
|
|
|
+ .TotalEndpoints = 1,
|
|
|
+ .Class = CDC_CSCP_CDCClass,
|
|
|
+ .SubClass = CDC_CSCP_ACMSubclass,
|
|
|
+ .Protocol = CDC_CSCP_ATCommandProtocol,
|
|
|
+ .InterfaceStrIndex = NO_DESCRIPTOR
|
|
|
+ },
|
|
|
+ .CDC_Functional_Header = {
|
|
|
+ .Header = {
|
|
|
+ .Size = sizeof(USB_CDC_Descriptor_FunctionalHeader_t),
|
|
|
+ .Type = CDC_DTYPE_CSInterface
|
|
|
+ },
|
|
|
+ .Subtype = 0x00,
|
|
|
+ .CDCSpecification = VERSION_BCD(1, 1, 0),
|
|
|
+ },
|
|
|
+ .CDC_Functional_ACM = {
|
|
|
+ .Header = {
|
|
|
+ .Size = sizeof(USB_CDC_Descriptor_FunctionalACM_t),
|
|
|
+ .Type = CDC_DTYPE_CSInterface
|
|
|
+ },
|
|
|
+ .Subtype = 0x02,
|
|
|
+ .Capabilities = 0x02,
|
|
|
+ },
|
|
|
+ .CDC_Functional_Union = {
|
|
|
+ .Header = {
|
|
|
+ .Size = sizeof(USB_CDC_Descriptor_FunctionalUnion_t),
|
|
|
+ .Type = CDC_DTYPE_CSInterface
|
|
|
+ },
|
|
|
+ .Subtype = 0x06,
|
|
|
+ .MasterInterfaceNumber = CCI_INTERFACE,
|
|
|
+ .SlaveInterfaceNumber = CDI_INTERFACE,
|
|
|
+ },
|
|
|
+ .CDC_NotificationEndpoint = {
|
|
|
+ .Header = {
|
|
|
+ .Size = sizeof(USB_Descriptor_Endpoint_t),
|
|
|
+ .Type = DTYPE_Endpoint
|
|
|
+ },
|
|
|
+ .EndpointAddress = CDC_NOTIFICATION_EPADDR,
|
|
|
+ .Attributes = (EP_TYPE_INTERRUPT | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
|
|
|
+ .EndpointSize = CDC_NOTIFICATION_EPSIZE,
|
|
|
+ .PollingIntervalMS = 0xFF
|
|
|
+ },
|
|
|
+ .CDC_DCI_Interface = {
|
|
|
+ .Header = {
|
|
|
+ .Size = sizeof(USB_Descriptor_Interface_t),
|
|
|
+ .Type = DTYPE_Interface
|
|
|
+ },
|
|
|
+ .InterfaceNumber = CDI_INTERFACE,
|
|
|
+ .AlternateSetting = 0,
|
|
|
+ .TotalEndpoints = 2,
|
|
|
+ .Class = CDC_CSCP_CDCDataClass,
|
|
|
+ .SubClass = CDC_CSCP_NoDataSubclass,
|
|
|
+ .Protocol = CDC_CSCP_NoDataProtocol,
|
|
|
+ .InterfaceStrIndex = NO_DESCRIPTOR
|
|
|
+ },
|
|
|
+ .CDC_DataOutEndpoint = {
|
|
|
+ .Header = {
|
|
|
+ .Size = sizeof(USB_Descriptor_Endpoint_t),
|
|
|
+ .Type = DTYPE_Endpoint
|
|
|
+ },
|
|
|
+ .EndpointAddress = CDC_OUT_EPADDR,
|
|
|
+ .Attributes = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
|
|
|
+ .EndpointSize = CDC_EPSIZE,
|
|
|
+ .PollingIntervalMS = 0x05
|
|
|
+ },
|
|
|
+ .CDC_DataInEndpoint = {
|
|
|
+ .Header = {
|
|
|
+ .Size = sizeof(USB_Descriptor_Endpoint_t),
|
|
|
+ .Type = DTYPE_Endpoint
|
|
|
+ },
|
|
|
+ .EndpointAddress = CDC_IN_EPADDR,
|
|
|
+ .Attributes = (EP_TYPE_BULK | ENDPOINT_ATTR_NO_SYNC | ENDPOINT_USAGE_DATA),
|
|
|
+ .EndpointSize = CDC_EPSIZE,
|
|
|
+ .PollingIntervalMS = 0x05
|
|
|
+ },
|
|
|
#endif
|
|
|
};
|
|
|
|
|
|
/*
|
|
|
* String descriptors
|
|
|
*/
|
|
|
-const USB_Descriptor_String_t PROGMEM LanguageString = {.Header = {.Size = USB_STRING_LEN(1), .Type = DTYPE_String}, .UnicodeString = {LANGUAGE_ID_ENG}};
|
|
|
+const USB_Descriptor_String_t PROGMEM LanguageString = {
|
|
|
+ .Header = {
|
|
|
+ .Size = USB_STRING_LEN(1),
|
|
|
+ .Type = DTYPE_String
|
|
|
+ },
|
|
|
+ .UnicodeString = {LANGUAGE_ID_ENG}
|
|
|
+};
|
|
|
|
|
|
-const USB_Descriptor_String_t PROGMEM ManufacturerString = {.Header = {.Size = USB_STRING_LEN(sizeof(STR(MANUFACTURER)) - 1), // Subtract 1 for null terminator
|
|
|
- .Type = DTYPE_String},
|
|
|
- .UnicodeString = LSTR(MANUFACTURER)};
|
|
|
+const USB_Descriptor_String_t PROGMEM ManufacturerString = {
|
|
|
+ .Header = {
|
|
|
+ .Size = USB_STRING_LEN(sizeof(STR(MANUFACTURER)) - 1), // Subtract 1 for null terminator
|
|
|
+ .Type = DTYPE_String
|
|
|
+ },
|
|
|
+ .UnicodeString = LSTR(MANUFACTURER)
|
|
|
+};
|
|
|
|
|
|
-const USB_Descriptor_String_t PROGMEM ProductString = {.Header = {.Size = USB_STRING_LEN(sizeof(STR(PRODUCT)) - 1), // Subtract 1 for null terminator
|
|
|
- .Type = DTYPE_String},
|
|
|
- .UnicodeString = LSTR(PRODUCT)};
|
|
|
+const USB_Descriptor_String_t PROGMEM ProductString = {
|
|
|
+ .Header = {
|
|
|
+ .Size = USB_STRING_LEN(sizeof(STR(PRODUCT)) - 1), // Subtract 1 for null terminator
|
|
|
+ .Type = DTYPE_String
|
|
|
+ },
|
|
|
+ .UnicodeString = LSTR(PRODUCT)
|
|
|
+};
|
|
|
|
|
|
#ifndef SERIAL_NUMBER
|
|
|
# define SERIAL_NUMBER 0
|
|
|
#endif
|
|
|
|
|
|
-const USB_Descriptor_String_t PROGMEM SerialNumberString = {.Header = {.Size = USB_STRING_LEN(sizeof(STR(SERIAL_NUMBER)) - 1), // Subtract 1 for null terminator
|
|
|
- .Type = DTYPE_String},
|
|
|
- .UnicodeString = LSTR(SERIAL_NUMBER)};
|
|
|
+const USB_Descriptor_String_t PROGMEM SerialNumberString = {
|
|
|
+ .Header = {
|
|
|
+ .Size = USB_STRING_LEN(sizeof(STR(SERIAL_NUMBER)) - 1), // Subtract 1 for null terminator
|
|
|
+ .Type = DTYPE_String
|
|
|
+ },
|
|
|
+ .UnicodeString = LSTR(SERIAL_NUMBER)
|
|
|
+};
|
|
|
+
|
|
|
+// clang-format on
|
|
|
|
|
|
/**
|
|
|
* This function is called by the library when in device mode, and must be overridden (see library "USB Descriptors"
|
fauxpark