summaryrefslogtreecommitdiff
path: root/tests/test/support
diff options
context:
space:
mode:
authorhathach <[email protected]>2013-05-25 17:19:18 +0700
committerhathach <[email protected]>2013-05-25 17:19:18 +0700
commited217948b8a25a7c4b7929775079ea8b9086305b (patch)
treef615c3755c7e2c681f8f2669bb3c1458911626c6 /tests/test/support
parentae02263d817a7b2f37c7e9c5026fd067b9d75fcc (diff)
rename descriptor type, hid descriptor type
Diffstat (limited to 'tests/test/support')
-rw-r--r--tests/test/support/descriptor_test.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/tests/test/support/descriptor_test.c b/tests/test/support/descriptor_test.c
index 59f07fce5..a972da03e 100644
--- a/tests/test/support/descriptor_test.c
+++ b/tests/test/support/descriptor_test.c
@@ -122,7 +122,7 @@ TUSB_CFG_ATTR_USBRAM ATTR_ALIGNED(4)
tusb_descriptor_device_t const desc_device =
{
.bLength = sizeof(tusb_descriptor_device_t),
- .bDescriptorType = TUSB_DESC_DEVICE,
+ .bDescriptorType = TUSB_DESC_TYPE_DEVICE,
.bcdUSB = 0x0200,
.bDeviceClass = 0x00,
.bDeviceSubClass = 0x00,
@@ -148,7 +148,7 @@ const app_configuration_desc_t desc_configuration =
.configuration =
{
.bLength = sizeof(tusb_descriptor_configuration_t),
- .bDescriptorType = TUSB_DESC_CONFIGURATION,
+ .bDescriptorType = TUSB_DESC_TYPE_CONFIGURATION,
.wTotalLength = sizeof(app_configuration_desc_t) - 1, // exclude termination
.bNumInterfaces = 1,
@@ -163,7 +163,7 @@ const app_configuration_desc_t desc_configuration =
.keyboard_interface =
{
.bLength = sizeof(tusb_descriptor_interface_t),
- .bDescriptorType = TUSB_DESC_INTERFACE,
+ .bDescriptorType = TUSB_DESC_TYPE_INTERFACE,
.bInterfaceNumber = 1,
.bAlternateSetting = 0x00,
.bNumEndpoints = 1,
@@ -176,18 +176,18 @@ const app_configuration_desc_t desc_configuration =
.keyboard_hid =
{
.bLength = sizeof(tusb_hid_descriptor_hid_t),
- .bDescriptorType = HID_DESC_HID,
+ .bDescriptorType = HID_DESC_TYPE_HID,
.bcdHID = 0x0111,
.bCountryCode = HID_Local_NotSupported,
.bNumDescriptors = 1,
- .bReportType = HID_DESC_REPORT,
+ .bReportType = HID_DESC_TYPE_REPORT,
.wReportLength = sizeof(keyboard_report_descriptor)
},
.keyboard_endpoint =
{
.bLength = sizeof(tusb_descriptor_endpoint_t),
- .bDescriptorType = TUSB_DESC_ENDPOINT,
+ .bDescriptorType = TUSB_DESC_TYPE_ENDPOINT,
.bEndpointAddress = 0x81,
.bmAttributes = { .xfer = TUSB_XFER_INTERRUPT },
.wMaxPacketSize = 0x08,
@@ -198,7 +198,7 @@ const app_configuration_desc_t desc_configuration =
.mouse_interface =
{
.bLength = sizeof(tusb_descriptor_interface_t),
- .bDescriptorType = TUSB_DESC_INTERFACE,
+ .bDescriptorType = TUSB_DESC_TYPE_INTERFACE,
.bInterfaceNumber = 2,
.bAlternateSetting = 0x00,
.bNumEndpoints = 1,
@@ -211,18 +211,18 @@ const app_configuration_desc_t desc_configuration =
.mouse_hid =
{
.bLength = sizeof(tusb_hid_descriptor_hid_t),
- .bDescriptorType = HID_DESC_HID,
+ .bDescriptorType = HID_DESC_TYPE_HID,
.bcdHID = 0x0111,
.bCountryCode = HID_Local_NotSupported,
.bNumDescriptors = 1,
- .bReportType = HID_DESC_REPORT,
+ .bReportType = HID_DESC_TYPE_REPORT,
.wReportLength = sizeof(mouse_report_descriptor)
},
.mouse_endpoint =
{
.bLength = sizeof(tusb_descriptor_endpoint_t),
- .bDescriptorType = TUSB_DESC_ENDPOINT,
+ .bDescriptorType = TUSB_DESC_TYPE_ENDPOINT,
.bEndpointAddress = 0x82,
.bmAttributes = { .xfer = TUSB_XFER_INTERRUPT },
.wMaxPacketSize = 0x08,
@@ -233,7 +233,7 @@ const app_configuration_desc_t desc_configuration =
.msc_interface =
{
.bLength = sizeof(tusb_descriptor_interface_t),
- .bDescriptorType = TUSB_DESC_INTERFACE,
+ .bDescriptorType = TUSB_DESC_TYPE_INTERFACE,
.bInterfaceNumber = 3,
.bAlternateSetting = 0x00,
.bNumEndpoints = 2,
@@ -246,7 +246,7 @@ const app_configuration_desc_t desc_configuration =
.msc_endpoint_in =
{
.bLength = sizeof(tusb_descriptor_endpoint_t),
- .bDescriptorType = TUSB_DESC_ENDPOINT,
+ .bDescriptorType = TUSB_DESC_TYPE_ENDPOINT,
.bEndpointAddress = 0x83,
.bmAttributes = { .xfer = TUSB_XFER_BULK },
.wMaxPacketSize = 512,
@@ -256,7 +256,7 @@ const app_configuration_desc_t desc_configuration =
.msc_endpoint_out =
{
.bLength = sizeof(tusb_descriptor_endpoint_t),
- .bDescriptorType = TUSB_DESC_ENDPOINT,
+ .bDescriptorType = TUSB_DESC_TYPE_ENDPOINT,
.bEndpointAddress = 0x03,
.bmAttributes = { .xfer = TUSB_XFER_BULK },
.wMaxPacketSize = 512,