mirror of
https://github.com/hathach/tinyusb.git
synced 2025-01-31 05:52:55 +08:00
house keeping
This commit is contained in:
parent
229a7a23b8
commit
c5d8d16858
@ -44,7 +44,7 @@
|
|||||||
tusb_descriptor_device_t const desc_device =
|
tusb_descriptor_device_t const desc_device =
|
||||||
{
|
{
|
||||||
.bLength = sizeof(tusb_descriptor_device_t),
|
.bLength = sizeof(tusb_descriptor_device_t),
|
||||||
.bDescriptorType = TUSB_DESC_TYPE_DEVICE,
|
.bDescriptorType = TUSB_DESC_DEVICE,
|
||||||
.bcdUSB = 0x0200,
|
.bcdUSB = 0x0200,
|
||||||
|
|
||||||
// Use Interface Association Descriptor (IAD) for CDC
|
// Use Interface Association Descriptor (IAD) for CDC
|
||||||
@ -74,7 +74,7 @@ app_descriptor_configuration_t const desc_configuration =
|
|||||||
.configuration =
|
.configuration =
|
||||||
{
|
{
|
||||||
.bLength = sizeof(tusb_descriptor_configuration_t),
|
.bLength = sizeof(tusb_descriptor_configuration_t),
|
||||||
.bDescriptorType = TUSB_DESC_TYPE_CONFIGURATION,
|
.bDescriptorType = TUSB_DESC_CONFIGURATION,
|
||||||
|
|
||||||
.wTotalLength = sizeof(app_descriptor_configuration_t),
|
.wTotalLength = sizeof(app_descriptor_configuration_t),
|
||||||
.bNumInterfaces = TOTAL_INTEFACES,
|
.bNumInterfaces = TOTAL_INTEFACES,
|
||||||
@ -89,7 +89,7 @@ app_descriptor_configuration_t const desc_configuration =
|
|||||||
.cdc_iad =
|
.cdc_iad =
|
||||||
{
|
{
|
||||||
.bLength = sizeof(tusb_descriptor_interface_association_t),
|
.bLength = sizeof(tusb_descriptor_interface_association_t),
|
||||||
.bDescriptorType = TUSB_DESC_TYPE_INTERFACE_ASSOCIATION,
|
.bDescriptorType = TUSB_DESC_INTERFACE_ASSOCIATION,
|
||||||
|
|
||||||
.bFirstInterface = INTERFACE_NO_CDC,
|
.bFirstInterface = INTERFACE_NO_CDC,
|
||||||
.bInterfaceCount = 2,
|
.bInterfaceCount = 2,
|
||||||
@ -104,7 +104,7 @@ app_descriptor_configuration_t const desc_configuration =
|
|||||||
.cdc_comm_interface =
|
.cdc_comm_interface =
|
||||||
{
|
{
|
||||||
.bLength = sizeof(tusb_descriptor_interface_t),
|
.bLength = sizeof(tusb_descriptor_interface_t),
|
||||||
.bDescriptorType = TUSB_DESC_TYPE_INTERFACE,
|
.bDescriptorType = TUSB_DESC_INTERFACE,
|
||||||
.bInterfaceNumber = INTERFACE_NO_CDC,
|
.bInterfaceNumber = INTERFACE_NO_CDC,
|
||||||
.bAlternateSetting = 0,
|
.bAlternateSetting = 0,
|
||||||
.bNumEndpoints = 1,
|
.bNumEndpoints = 1,
|
||||||
@ -117,7 +117,7 @@ app_descriptor_configuration_t const desc_configuration =
|
|||||||
.cdc_header =
|
.cdc_header =
|
||||||
{
|
{
|
||||||
.bLength = sizeof(cdc_desc_func_header_t),
|
.bLength = sizeof(cdc_desc_func_header_t),
|
||||||
.bDescriptorType = TUSB_DESC_TYPE_INTERFACE_CLASS_SPECIFIC,
|
.bDescriptorType = TUSB_DESC_CLASS_SPECIFIC,
|
||||||
.bDescriptorSubType = CDC_FUNC_DESC_HEADER,
|
.bDescriptorSubType = CDC_FUNC_DESC_HEADER,
|
||||||
.bcdCDC = 0x0120
|
.bcdCDC = 0x0120
|
||||||
},
|
},
|
||||||
@ -125,7 +125,7 @@ app_descriptor_configuration_t const desc_configuration =
|
|||||||
.cdc_call =
|
.cdc_call =
|
||||||
{
|
{
|
||||||
.bLength = sizeof(cdc_desc_func_call_management_t),
|
.bLength = sizeof(cdc_desc_func_call_management_t),
|
||||||
.bDescriptorType = TUSB_DESC_TYPE_INTERFACE_CLASS_SPECIFIC,
|
.bDescriptorType = TUSB_DESC_CLASS_SPECIFIC,
|
||||||
.bDescriptorSubType = CDC_FUNC_DESC_CALL_MANAGEMENT,
|
.bDescriptorSubType = CDC_FUNC_DESC_CALL_MANAGEMENT,
|
||||||
.bmCapabilities = { 0 },
|
.bmCapabilities = { 0 },
|
||||||
.bDataInterface = INTERFACE_NO_CDC+1,
|
.bDataInterface = INTERFACE_NO_CDC+1,
|
||||||
@ -134,7 +134,7 @@ app_descriptor_configuration_t const desc_configuration =
|
|||||||
.cdc_acm =
|
.cdc_acm =
|
||||||
{
|
{
|
||||||
.bLength = sizeof(cdc_desc_func_abstract_control_management_t),
|
.bLength = sizeof(cdc_desc_func_abstract_control_management_t),
|
||||||
.bDescriptorType = TUSB_DESC_TYPE_INTERFACE_CLASS_SPECIFIC,
|
.bDescriptorType = TUSB_DESC_CLASS_SPECIFIC,
|
||||||
.bDescriptorSubType = CDC_FUNC_DESC_ABSTRACT_CONTROL_MANAGEMENT,
|
.bDescriptorSubType = CDC_FUNC_DESC_ABSTRACT_CONTROL_MANAGEMENT,
|
||||||
.bmCapabilities = { // 0x02
|
.bmCapabilities = { // 0x02
|
||||||
.support_line_request = 1,
|
.support_line_request = 1,
|
||||||
@ -144,7 +144,7 @@ app_descriptor_configuration_t const desc_configuration =
|
|||||||
.cdc_union =
|
.cdc_union =
|
||||||
{
|
{
|
||||||
.bLength = sizeof(cdc_desc_func_union_t), // plus number of
|
.bLength = sizeof(cdc_desc_func_union_t), // plus number of
|
||||||
.bDescriptorType = TUSB_DESC_TYPE_INTERFACE_CLASS_SPECIFIC,
|
.bDescriptorType = TUSB_DESC_CLASS_SPECIFIC,
|
||||||
.bDescriptorSubType = CDC_FUNC_DESC_UNION,
|
.bDescriptorSubType = CDC_FUNC_DESC_UNION,
|
||||||
.bControlInterface = INTERFACE_NO_CDC,
|
.bControlInterface = INTERFACE_NO_CDC,
|
||||||
.bSubordinateInterface = INTERFACE_NO_CDC+1,
|
.bSubordinateInterface = INTERFACE_NO_CDC+1,
|
||||||
@ -153,7 +153,7 @@ app_descriptor_configuration_t const desc_configuration =
|
|||||||
.cdc_endpoint_notification =
|
.cdc_endpoint_notification =
|
||||||
{
|
{
|
||||||
.bLength = sizeof(tusb_descriptor_endpoint_t),
|
.bLength = sizeof(tusb_descriptor_endpoint_t),
|
||||||
.bDescriptorType = TUSB_DESC_TYPE_ENDPOINT,
|
.bDescriptorType = TUSB_DESC_ENDPOINT,
|
||||||
.bEndpointAddress = CDC_EDPT_NOTIFICATION_ADDR,
|
.bEndpointAddress = CDC_EDPT_NOTIFICATION_ADDR,
|
||||||
.bmAttributes = { .xfer = TUSB_XFER_INTERRUPT },
|
.bmAttributes = { .xfer = TUSB_XFER_INTERRUPT },
|
||||||
.wMaxPacketSize = { .size = 0x08 },
|
.wMaxPacketSize = { .size = 0x08 },
|
||||||
@ -164,7 +164,7 @@ app_descriptor_configuration_t const desc_configuration =
|
|||||||
.cdc_data_interface =
|
.cdc_data_interface =
|
||||||
{
|
{
|
||||||
.bLength = sizeof(tusb_descriptor_interface_t),
|
.bLength = sizeof(tusb_descriptor_interface_t),
|
||||||
.bDescriptorType = TUSB_DESC_TYPE_INTERFACE,
|
.bDescriptorType = TUSB_DESC_INTERFACE,
|
||||||
.bInterfaceNumber = INTERFACE_NO_CDC+1,
|
.bInterfaceNumber = INTERFACE_NO_CDC+1,
|
||||||
.bAlternateSetting = 0x00,
|
.bAlternateSetting = 0x00,
|
||||||
.bNumEndpoints = 2,
|
.bNumEndpoints = 2,
|
||||||
@ -177,7 +177,7 @@ app_descriptor_configuration_t const desc_configuration =
|
|||||||
.cdc_endpoint_out =
|
.cdc_endpoint_out =
|
||||||
{
|
{
|
||||||
.bLength = sizeof(tusb_descriptor_endpoint_t),
|
.bLength = sizeof(tusb_descriptor_endpoint_t),
|
||||||
.bDescriptorType = TUSB_DESC_TYPE_ENDPOINT,
|
.bDescriptorType = TUSB_DESC_ENDPOINT,
|
||||||
.bEndpointAddress = CDC_EDPT_DATA_OUT_ADDR,
|
.bEndpointAddress = CDC_EDPT_DATA_OUT_ADDR,
|
||||||
.bmAttributes = { .xfer = TUSB_XFER_BULK },
|
.bmAttributes = { .xfer = TUSB_XFER_BULK },
|
||||||
.wMaxPacketSize = { .size = CDC_EDPT_DATA_PACKETSIZE },
|
.wMaxPacketSize = { .size = CDC_EDPT_DATA_PACKETSIZE },
|
||||||
@ -187,7 +187,7 @@ app_descriptor_configuration_t const desc_configuration =
|
|||||||
.cdc_endpoint_in =
|
.cdc_endpoint_in =
|
||||||
{
|
{
|
||||||
.bLength = sizeof(tusb_descriptor_endpoint_t),
|
.bLength = sizeof(tusb_descriptor_endpoint_t),
|
||||||
.bDescriptorType = TUSB_DESC_TYPE_ENDPOINT,
|
.bDescriptorType = TUSB_DESC_ENDPOINT,
|
||||||
.bEndpointAddress = CDC_EDPT_DATA_IN_ADDR,
|
.bEndpointAddress = CDC_EDPT_DATA_IN_ADDR,
|
||||||
.bmAttributes = { .xfer = TUSB_XFER_BULK },
|
.bmAttributes = { .xfer = TUSB_XFER_BULK },
|
||||||
.wMaxPacketSize = { .size = CDC_EDPT_DATA_PACKETSIZE },
|
.wMaxPacketSize = { .size = CDC_EDPT_DATA_PACKETSIZE },
|
||||||
@ -205,42 +205,42 @@ app_descriptor_configuration_t const desc_configuration =
|
|||||||
uint16_t const * const string_descriptor_arr [] =
|
uint16_t const * const string_descriptor_arr [] =
|
||||||
{
|
{
|
||||||
[0] = (uint16_t []) { // supported language
|
[0] = (uint16_t []) { // supported language
|
||||||
ENDIAN_BE16_FROM( STRING_LEN_UNICODE(1), TUSB_DESC_TYPE_STRING ),
|
ENDIAN_BE16_FROM( STRING_LEN_UNICODE(1), TUSB_DESC_STRING ),
|
||||||
0x0409 // English
|
0x0409 // English
|
||||||
},
|
},
|
||||||
|
|
||||||
[1] = (uint16_t []) { // manufacturer
|
[1] = (uint16_t []) { // manufacturer
|
||||||
ENDIAN_BE16_FROM( STRING_LEN_UNICODE(11), TUSB_DESC_TYPE_STRING),
|
ENDIAN_BE16_FROM( STRING_LEN_UNICODE(11), TUSB_DESC_STRING),
|
||||||
't', 'i', 'n', 'y', 'u', 's', 'b', '.', 'o', 'r', 'g' // len = 11
|
't', 'i', 'n', 'y', 'u', 's', 'b', '.', 'o', 'r', 'g' // len = 11
|
||||||
},
|
},
|
||||||
|
|
||||||
[2] = (uint16_t []) { // product
|
[2] = (uint16_t []) { // product
|
||||||
ENDIAN_BE16_FROM( STRING_LEN_UNICODE(14), TUSB_DESC_TYPE_STRING),
|
ENDIAN_BE16_FROM( STRING_LEN_UNICODE(14), TUSB_DESC_STRING),
|
||||||
't', 'i', 'n', 'y', 'u', 's', 'b', ' ', 'd', 'e', 'v', 'i', 'c', 'e' // len = 14
|
't', 'i', 'n', 'y', 'u', 's', 'b', ' ', 'd', 'e', 'v', 'i', 'c', 'e' // len = 14
|
||||||
},
|
},
|
||||||
|
|
||||||
[3] = (uint16_t []) { // serials
|
[3] = (uint16_t []) { // serials
|
||||||
ENDIAN_BE16_FROM( STRING_LEN_UNICODE(4), TUSB_DESC_TYPE_STRING),
|
ENDIAN_BE16_FROM( STRING_LEN_UNICODE(4), TUSB_DESC_STRING),
|
||||||
'1', '2', '3', '4' // len = 4
|
'1', '2', '3', '4' // len = 4
|
||||||
},
|
},
|
||||||
|
|
||||||
[4] = (uint16_t []) { // CDC Interface
|
[4] = (uint16_t []) { // CDC Interface
|
||||||
ENDIAN_BE16_FROM( STRING_LEN_UNICODE(3), TUSB_DESC_TYPE_STRING),
|
ENDIAN_BE16_FROM( STRING_LEN_UNICODE(3), TUSB_DESC_STRING),
|
||||||
'c', 'd', 'c' // len = 3
|
'c', 'd', 'c' // len = 3
|
||||||
},
|
},
|
||||||
|
|
||||||
[5] = (uint16_t []) { // Keyboard Interface
|
[5] = (uint16_t []) { // Keyboard Interface
|
||||||
ENDIAN_BE16_FROM( STRING_LEN_UNICODE(5), TUSB_DESC_TYPE_STRING),
|
ENDIAN_BE16_FROM( STRING_LEN_UNICODE(5), TUSB_DESC_STRING),
|
||||||
'm', 'o', 'u', 's', 'e' // len = 5
|
'm', 'o', 'u', 's', 'e' // len = 5
|
||||||
},
|
},
|
||||||
|
|
||||||
[6] = (uint16_t []) { // Keyboard Interface
|
[6] = (uint16_t []) { // Keyboard Interface
|
||||||
ENDIAN_BE16_FROM( STRING_LEN_UNICODE(8), TUSB_DESC_TYPE_STRING),
|
ENDIAN_BE16_FROM( STRING_LEN_UNICODE(8), TUSB_DESC_STRING),
|
||||||
'k', 'e', 'y', 'b', 'o', 'a', 'r', 'd' // len = 8
|
'k', 'e', 'y', 'b', 'o', 'a', 'r', 'd' // len = 8
|
||||||
},
|
},
|
||||||
|
|
||||||
[7] = (uint16_t []) { // MSC Interface
|
[7] = (uint16_t []) { // MSC Interface
|
||||||
ENDIAN_BE16_FROM( STRING_LEN_UNICODE(3), TUSB_DESC_TYPE_STRING),
|
ENDIAN_BE16_FROM( STRING_LEN_UNICODE(3), TUSB_DESC_STRING),
|
||||||
'm', 's', 'c' // len = 3
|
'm', 's', 'c' // len = 3
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
Loading…
x
Reference in New Issue
Block a user