|
|
@@ -43,9 +43,9 @@ tusb_desc_device_t const desc_device =
|
|
|
.bLength = sizeof(tusb_desc_device_t),
|
|
|
.bDescriptorType = TUSB_DESC_DEVICE,
|
|
|
.bcdUSB = 0x0200,
|
|
|
- .bDeviceClass = 0x00,
|
|
|
- .bDeviceSubClass = 0x00,
|
|
|
- .bDeviceProtocol = 0x00,
|
|
|
+ .bDeviceClass = TUSB_CLASS_MISC,
|
|
|
+ .bDeviceSubClass = MISC_SUBCLASS_COMMON,
|
|
|
+ .bDeviceProtocol = MISC_PROTOCOL_IAD,
|
|
|
.bMaxPacketSize0 = CFG_TUD_ENDPOINT0_SIZE,
|
|
|
|
|
|
.idVendor = 0xCafe,
|
|
|
@@ -72,29 +72,27 @@ uint8_t const * tud_descriptor_device_cb(void)
|
|
|
|
|
|
enum
|
|
|
{
|
|
|
+ ITF_NUM_CDC_0 = 0,
|
|
|
+ ITF_NUM_CDC_0_DATA,
|
|
|
+ ITF_NUM_CDC_1,
|
|
|
+ ITF_NUM_CDC_1_DATA,
|
|
|
ITF_NUM_MSC,
|
|
|
ITF_NUM_TOTAL
|
|
|
};
|
|
|
|
|
|
-#define CONFIG_TOTAL_LEN (TUD_CONFIG_DESC_LEN + TUD_MSC_DESC_LEN)
|
|
|
+#define CONFIG_TOTAL_LEN (TUD_CONFIG_DESC_LEN + CFG_TUD_CDC *TUD_CDC_DESC_LEN + TUD_MSC_DESC_LEN)
|
|
|
|
|
|
-#if CFG_TUSB_MCU == OPT_MCU_LPC175X_6X || CFG_TUSB_MCU == OPT_MCU_LPC177X_8X || CFG_TUSB_MCU == OPT_MCU_LPC40XX
|
|
|
- // LPC 17xx and 40xx endpoint type (bulk/interrupt/iso) are fixed by its number
|
|
|
- // 0 control, 1 In, 2 Bulk, 3 Iso, 4 In, 5 Bulk etc ...
|
|
|
- #define EPNUM_MSC_OUT 0x02
|
|
|
- #define EPNUM_MSC_IN 0x82
|
|
|
|
|
|
-#elif CFG_TUSB_MCU == OPT_MCU_SAMG
|
|
|
- // SAMG doesn't support a same endpoint number with different direction IN and OUT
|
|
|
- // e.g EP1 OUT & EP1 IN cannot exist together
|
|
|
- #define EPNUM_MSC_OUT 0x01
|
|
|
- #define EPNUM_MSC_IN 0x82
|
|
|
+ #define EPNUM_MSC_OUT 0x05
|
|
|
+ #define EPNUM_MSC_IN 0x85
|
|
|
|
|
|
-#else
|
|
|
- #define EPNUM_MSC_OUT 0x01
|
|
|
- #define EPNUM_MSC_IN 0x81
|
|
|
+#define EPNUM_CDC_0_NOTIF 0x81
|
|
|
+#define EPNUM_CDC_0_OUT 0x02
|
|
|
+#define EPNUM_CDC_0_IN 0x82
|
|
|
|
|
|
-#endif
|
|
|
+#define EPNUM_CDC_1_NOTIF 0x83
|
|
|
+#define EPNUM_CDC_1_OUT 0x04
|
|
|
+#define EPNUM_CDC_1_IN 0x84
|
|
|
|
|
|
uint8_t const desc_fs_configuration[] =
|
|
|
{
|
|
|
@@ -102,7 +100,11 @@ uint8_t const desc_fs_configuration[] =
|
|
|
TUD_CONFIG_DESCRIPTOR(1, ITF_NUM_TOTAL, 0, CONFIG_TOTAL_LEN, TUSB_DESC_CONFIG_ATT_REMOTE_WAKEUP, 100),
|
|
|
|
|
|
// Interface number, string index, EP Out & EP In address, EP size
|
|
|
- TUD_MSC_DESCRIPTOR(ITF_NUM_MSC, 0, EPNUM_MSC_OUT, EPNUM_MSC_IN, 64),
|
|
|
+ TUD_MSC_DESCRIPTOR(ITF_NUM_MSC, 5, EPNUM_MSC_OUT, EPNUM_MSC_IN, 64),
|
|
|
+
|
|
|
+ // Interface number, string index, EP notification address and size, EP data address (out, in) and size.
|
|
|
+ TUD_CDC_DESCRIPTOR(ITF_NUM_CDC_0, 4, EPNUM_CDC_0_NOTIF, 8, EPNUM_CDC_0_OUT, EPNUM_CDC_0_IN, 64),
|
|
|
+ TUD_CDC_DESCRIPTOR(ITF_NUM_CDC_1, 4, EPNUM_CDC_1_NOTIF, 8, EPNUM_CDC_1_OUT, EPNUM_CDC_1_IN, 64),
|
|
|
};
|
|
|
|
|
|
#if TUD_OPT_HIGH_SPEED
|
|
|
@@ -112,7 +114,11 @@ uint8_t const desc_hs_configuration[] =
|
|
|
TUD_CONFIG_DESCRIPTOR(1, ITF_NUM_TOTAL, 0, CONFIG_TOTAL_LEN, TUSB_DESC_CONFIG_ATT_REMOTE_WAKEUP, 100),
|
|
|
|
|
|
// Interface number, string index, EP Out & EP In address, EP size
|
|
|
- TUD_MSC_DESCRIPTOR(ITF_NUM_MSC, 0, EPNUM_MSC_OUT, EPNUM_MSC_IN, 512),
|
|
|
+ TUD_MSC_DESCRIPTOR(ITF_NUM_MSC, 5, EPNUM_MSC_OUT, EPNUM_MSC_IN, 512),
|
|
|
+
|
|
|
+ // Interface number, string index, EP notification address and size, EP data address (out, in) and size.
|
|
|
+ TUD_CDC_DESCRIPTOR(ITF_NUM_CDC_0, 4, EPNUM_CDC_0_NOTIF, 8, EPNUM_CDC_0_OUT, EPNUM_CDC_0_IN, 512),
|
|
|
+ TUD_CDC_DESCRIPTOR(ITF_NUM_CDC_1, 5, EPNUM_CDC_1_NOTIF, 8, EPNUM_CDC_1_OUT, EPNUM_CDC_1_IN, 512),
|
|
|
};
|
|
|
#endif
|
|
|
|
|
|
@@ -134,52 +140,64 @@ uint8_t const * tud_descriptor_configuration_cb(uint8_t index)
|
|
|
//--------------------------------------------------------------------+
|
|
|
// String Descriptors
|
|
|
//--------------------------------------------------------------------+
|
|
|
-
|
|
|
+// String Descriptor Index
|
|
|
+enum {
|
|
|
+ STRID_LANGID = 0,
|
|
|
+ STRID_MANUFACTURER,
|
|
|
+ STRID_PRODUCT,
|
|
|
+ STRID_SERIAL,
|
|
|
+};
|
|
|
// array of pointer to string descriptors
|
|
|
char const* string_desc_arr [] =
|
|
|
{
|
|
|
(const char[]) { 0x09, 0x04 }, // 0: is supported language is English (0x0409)
|
|
|
"Sweproj", // 1: Manufacturer
|
|
|
"IDEUSB", // 2: Product
|
|
|
- "000001", // 3: Serials, should use chip ID
|
|
|
+ "000001", // 3: Serials, should use chip ID
|
|
|
+ "Sweproj CDC", // 4: CDC Interface
|
|
|
+ "Sweproj MSC", // 5: MSC Interface
|
|
|
};
|
|
|
|
|
|
-static uint16_t _desc_str[32];
|
|
|
+static uint16_t _desc_str[32+1];
|
|
|
|
|
|
// Invoked when received GET STRING DESCRIPTOR request
|
|
|
// Application return pointer to descriptor, whose contents must exist long enough for transfer to complete
|
|
|
-uint16_t const* tud_descriptor_string_cb(uint8_t index, uint16_t langid)
|
|
|
-{
|
|
|
+uint16_t const *tud_descriptor_string_cb(uint8_t index, uint16_t langid) {
|
|
|
(void) langid;
|
|
|
+ size_t chr_count;
|
|
|
+
|
|
|
+ switch ( index ) {
|
|
|
+ case STRID_LANGID:
|
|
|
+ memcpy(&_desc_str[1], string_desc_arr[0], 2);
|
|
|
+ chr_count = 1;
|
|
|
+ break;
|
|
|
|
|
|
- uint8_t chr_count;
|
|
|
+ case STRID_SERIAL:
|
|
|
+ chr_count = 16;
|
|
|
+ break;
|
|
|
|
|
|
- if ( index == 0)
|
|
|
- {
|
|
|
- memcpy(&_desc_str[1], string_desc_arr[0], 2);
|
|
|
- chr_count = 1;
|
|
|
- }else
|
|
|
- {
|
|
|
- // Note: the 0xEE index string is a Microsoft OS 1.0 Descriptors.
|
|
|
- // https://docs.microsoft.com/en-us/windows-hardware/drivers/usbcon/microsoft-defined-usb-descriptors
|
|
|
+ default:
|
|
|
+ // Note: the 0xEE index string is a Microsoft OS 1.0 Descriptors.
|
|
|
+ // https://docs.microsoft.com/en-us/windows-hardware/drivers/usbcon/microsoft-defined-usb-descriptors
|
|
|
|
|
|
- if ( !(index < sizeof(string_desc_arr)/sizeof(string_desc_arr[0])) ) return NULL;
|
|
|
+ if ( !(index < sizeof(string_desc_arr) / sizeof(string_desc_arr[0])) ) return NULL;
|
|
|
|
|
|
- const char* str = string_desc_arr[index];
|
|
|
+ const char *str = string_desc_arr[index];
|
|
|
|
|
|
- // Cap at max char
|
|
|
- chr_count = strlen(str);
|
|
|
- if ( chr_count > 31 ) chr_count = 31;
|
|
|
+ // Cap at max char
|
|
|
+ chr_count = strlen(str);
|
|
|
+ size_t const max_count = sizeof(_desc_str) / sizeof(_desc_str[0]) - 1; // -1 for string type
|
|
|
+ if ( chr_count > max_count ) chr_count = max_count;
|
|
|
|
|
|
- // Convert ASCII string into UTF-16
|
|
|
- for(uint8_t i=0; i<chr_count; i++)
|
|
|
- {
|
|
|
- _desc_str[1+i] = str[i];
|
|
|
- }
|
|
|
+ // Convert ASCII string into UTF-16
|
|
|
+ for ( size_t i = 0; i < chr_count; i++ ) {
|
|
|
+ _desc_str[1 + i] = str[i];
|
|
|
+ }
|
|
|
+ break;
|
|
|
}
|
|
|
|
|
|
// first byte is length (including header), second byte is string type
|
|
|
- _desc_str[0] = (TUSB_DESC_STRING << 8 ) | (2*chr_count + 2);
|
|
|
+ _desc_str[0] = (uint16_t) ((TUSB_DESC_STRING << 8) | (2 * chr_count + 2));
|
|
|
|
|
|
return _desc_str;
|
|
|
}
|
Per Mårtensson