diff options
| author | hathach <[email protected]> | 2018-04-12 13:23:52 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2018-04-12 13:23:52 +0700 |
| commit | 4b660175beea2c76a1a761e3840937d9784ab201 (patch) | |
| tree | 2d3b595aa8bf9e1ffcb7dd1feafd92275e92994e /tests | |
| parent | 3d31f921068d906f6f63f59a3b10784f28e97d4d (diff) | |
rename CFG_TUSB_DEVICE_* to CFG_TUD_*
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/lpc175x_6x/test/test_usbd.c | 12 | ||||
| -rw-r--r-- | tests/support/descriptor_test.h | 2 | ||||
| -rw-r--r-- | tests/support/tusb_config.h | 12 |
3 files changed, 13 insertions, 13 deletions
diff --git a/tests/lpc175x_6x/test/test_usbd.c b/tests/lpc175x_6x/test/test_usbd.c index 6ace0085b..5cb7c232d 100644 --- a/tests/lpc175x_6x/test/test_usbd.c +++ b/tests/lpc175x_6x/test/test_usbd.c @@ -128,26 +128,26 @@ void test_usbd_string_descriptor(void) //------------- manufacturer string descriptor -------------// - uint32_t const manufacturer_len = sizeof(CFG_TUSB_DEVICE_STRING_MANUFACTURER) - 1; + uint32_t const manufacturer_len = sizeof(CFG_TUD_STRING_MANUFACTURER) - 1; TEST_ASSERT_EQUAL(manufacturer_len*2 + 2, app_tusb_desc_strings.manufacturer.bLength); for(uint32_t i=0; i<manufacturer_len; i++) { - TEST_ASSERT_EQUAL(CFG_TUSB_DEVICE_STRING_MANUFACTURER[i], app_tusb_desc_strings.manufacturer.unicode_string[i]); + TEST_ASSERT_EQUAL(CFG_TUD_STRING_MANUFACTURER[i], app_tusb_desc_strings.manufacturer.unicode_string[i]); } //------------- product string descriptor -------------// - uint32_t const product_len = sizeof(CFG_TUSB_DEVICE_STRING_PRODUCT) - 1; + uint32_t const product_len = sizeof(CFG_TUD_STRING_PRODUCT) - 1; TEST_ASSERT_EQUAL(product_len*2 + 2, app_tusb_desc_strings.product.bLength); for(uint32_t i=0; i < product_len; i++) { - TEST_ASSERT_EQUAL(CFG_TUSB_DEVICE_STRING_PRODUCT[i], app_tusb_desc_strings.product.unicode_string[i]); + TEST_ASSERT_EQUAL(CFG_TUD_STRING_PRODUCT[i], app_tusb_desc_strings.product.unicode_string[i]); } //------------- serial string descriptor -------------// - uint32_t const serial_len = sizeof(CFG_TUSB_DEVICE_STRING_SERIAL) - 1; + uint32_t const serial_len = sizeof(CFG_TUD_STRING_SERIAL) - 1; TEST_ASSERT_EQUAL(serial_len*2 + 2, app_tusb_desc_strings.serial.bLength); for(uint32_t i=0; i<serial_len; i++) { - TEST_ASSERT_EQUAL(CFG_TUSB_DEVICE_STRING_SERIAL[i], app_tusb_desc_strings.serial.unicode_string[i]); + TEST_ASSERT_EQUAL(CFG_TUD_STRING_SERIAL[i], app_tusb_desc_strings.serial.unicode_string[i]); } } diff --git a/tests/support/descriptor_test.h b/tests/support/descriptor_test.h index a0455f4ba..4861c3f30 100644 --- a/tests/support/descriptor_test.h +++ b/tests/support/descriptor_test.h @@ -69,7 +69,7 @@ typedef struct tusb_desc_interface_assoc_t CDC_IAD; #endif -#if 0 //&& CFG_TUSB_DEVICE_CDC +#if 0 //&& CFG_TUD_CDC //CDC - Serial //CDC Control Interface tusb_desc_interface_t CDC_CCI_Interface; diff --git a/tests/support/tusb_config.h b/tests/support/tusb_config.h index 6ed735bc7..91902acff 100644 --- a/tests/support/tusb_config.h +++ b/tests/support/tusb_config.h @@ -70,14 +70,14 @@ //--------------------------------------------------------------------+
// DEVICE CONFIGURATION
//--------------------------------------------------------------------+
-#define CFG_TUSB_DEVICE_ENDOINT0_SIZE 64
+#define CFG_TUD_ENDOINT0_SIZE 64
//------------- CLASS -------------//
-#define CFG_TUSB_DEVICE_HID_KEYBOARD 1
-#define CFG_TUSB_DEVICE_HID_MOUSE 1
-#define CFG_TUSB_DEVICE_HID_GENERIC 0
-#define CFG_TUSB_DEVICE_MSC 1
-#define CFG_TUSB_DEVICE_CDC 1
+#define CFG_TUD_HID_KEYBOARD 1
+#define CFG_TUD_HID_MOUSE 1
+#define CFG_TUD_HID_GENERIC 0
+#define CFG_TUD_MSC 1
+#define CFG_TUD_CDC 1
//--------------------------------------------------------------------+
|