diff options
| author | hathach <[email protected]> | 2013-07-03 10:53:16 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2013-07-03 10:53:16 +0700 |
| commit | b3f98bc15a47bea88806cbfdc899d46efe40d921 (patch) | |
| tree | 30cfadb9e0cb4bf128bbdd2dd544e61ef8a259f8 /tests | |
| parent | 539c7cdbe16d7805eac053a6779f509a4c9b4c68 (diff) | |
rename cdc descriptor type
add tusbh_cdc_mounted_isr & tusbh_cdc_unmounted_isr
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/lpc18xx_43xx/test/host/cdc/descriptor_cdc.c | 6 | ||||
| -rw-r--r-- | tests/lpc18xx_43xx/test/host/cdc/descriptor_cdc.h | 6 | ||||
| -rw-r--r-- | tests/lpc18xx_43xx/test/host/cdc/test_cdc_host.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/tests/lpc18xx_43xx/test/host/cdc/descriptor_cdc.c b/tests/lpc18xx_43xx/test/host/cdc/descriptor_cdc.c index df82f9ce3..16af1db27 100644 --- a/tests/lpc18xx_43xx/test/host/cdc/descriptor_cdc.c +++ b/tests/lpc18xx_43xx/test/host/cdc/descriptor_cdc.c @@ -90,7 +90,7 @@ const cdc_configuration_desc_t cdc_config_descriptor = .cdc_header = { - .bLength = sizeof(tusb_cdc_func_header_t), + .bLength = sizeof(cdc_desc_func_header_t), .bDescriptorType = TUSB_DESC_TYPE_INTERFACE_CLASS_SPECIFIC, .bDescriptorSubType = CDC_FUNC_DESC_HEADER, .bcdCDC = 0x0120 @@ -98,7 +98,7 @@ const cdc_configuration_desc_t cdc_config_descriptor = .cdc_acm = { - .bLength = sizeof(tusb_cdc_func_abstract_control_management_t), + .bLength = sizeof(cdc_desc_func_abstract_control_management_t), .bDescriptorType = TUSB_DESC_TYPE_INTERFACE_CLASS_SPECIFIC, .bDescriptorSubType = CDC_FUNC_DESC_ABSTRACT_CONTROL_MANAGEMENT, .bmCapabilities = { // 0x06 @@ -109,7 +109,7 @@ const cdc_configuration_desc_t cdc_config_descriptor = .cdc_union = { - .bLength = sizeof(tusb_cdc_func_union_t), // plus number of + .bLength = sizeof(cdc_desc_func_union_t), // plus number of .bDescriptorType = TUSB_DESC_TYPE_INTERFACE_CLASS_SPECIFIC, .bDescriptorSubType = CDC_FUNC_DESC_UNION, .bControlInterface = 1, diff --git a/tests/lpc18xx_43xx/test/host/cdc/descriptor_cdc.h b/tests/lpc18xx_43xx/test/host/cdc/descriptor_cdc.h index b21d64acc..618896e1d 100644 --- a/tests/lpc18xx_43xx/test/host/cdc/descriptor_cdc.h +++ b/tests/lpc18xx_43xx/test/host/cdc/descriptor_cdc.h @@ -61,9 +61,9 @@ typedef struct //CDC Control Interface tusb_descriptor_interface_t cdc_comm_interface; - tusb_cdc_func_header_t cdc_header; - tusb_cdc_func_abstract_control_management_t cdc_acm; - tusb_cdc_func_union_t cdc_union; + cdc_desc_func_header_t cdc_header; + cdc_desc_func_abstract_control_management_t cdc_acm; + cdc_desc_func_union_t cdc_union; tusb_descriptor_endpoint_t cdc_endpoint_notification; //CDC Data Interface diff --git a/tests/lpc18xx_43xx/test/host/cdc/test_cdc_host.c b/tests/lpc18xx_43xx/test/host/cdc/test_cdc_host.c index ffb1dc296..bff058b2e 100644 --- a/tests/lpc18xx_43xx/test/host/cdc/test_cdc_host.c +++ b/tests/lpc18xx_43xx/test/host/cdc/test_cdc_host.c @@ -117,8 +117,8 @@ void test_cdch_open_length_check(void) { const uint16_t expected_length = //------------- Comm Interface -------------// - sizeof(tusb_descriptor_interface_t) + sizeof(tusb_cdc_func_header_t) + - sizeof(tusb_cdc_func_abstract_control_management_t) + sizeof(tusb_cdc_func_union_t) + + sizeof(tusb_descriptor_interface_t) + sizeof(cdc_desc_func_header_t) + + sizeof(cdc_desc_func_abstract_control_management_t) + sizeof(cdc_desc_func_union_t) + sizeof(tusb_descriptor_endpoint_t) + //------------- Data Interface -------------// sizeof(tusb_descriptor_interface_t) + 2*sizeof(tusb_descriptor_endpoint_t); |