rename descriptor type, hid descriptor type

8 files changed, 22 insertions, 22 deletions

diff --git a/tests/test/host/ehci/test_ehci_usbh_hcd_integration.c b/tests/test/host/ehci/test_ehci_usbh_hcd_integration.c
index 44cea9ab1..cf5669487 100644
--- a/tests/test/host/ehci/test_ehci_usbh_hcd_integration.c
+++ b/tests/test/host/ehci/test_ehci_usbh_hcd_integration.c
@@ -152,7 +152,7 @@ void test_bulk_pipe_close(void)
   tusb_descriptor_endpoint_t const desc_ept_bulk_in =
   {
       .bLength          = sizeof(tusb_descriptor_endpoint_t),
-      .bDescriptorType  = TUSB_DESC_ENDPOINT,
+      .bDescriptorType  = TUSB_DESC_TYPE_ENDPOINT,
       .bEndpointAddress = 0x81,
       .bmAttributes     = { .xfer = TUSB_XFER_BULK },
       .wMaxPacketSize   = 512,
diff --git a/tests/test/host/ehci/test_pipe_bulk_open.c b/tests/test/host/ehci/test_pipe_bulk_open.c
index 75eb16574..4ddc519aa 100644
--- a/tests/test/host/ehci/test_pipe_bulk_open.c
+++ b/tests/test/host/ehci/test_pipe_bulk_open.c
@@ -110,7 +110,7 @@ void verify_open_qhd(ehci_qhd_t *p_qhd, uint8_t endpoint_addr, uint16_t max_pack
 tusb_descriptor_endpoint_t const desc_ept_bulk_in =
 {
     .bLength          = sizeof(tusb_descriptor_endpoint_t),
-    .bDescriptorType  = TUSB_DESC_ENDPOINT,
+    .bDescriptorType  = TUSB_DESC_TYPE_ENDPOINT,
     .bEndpointAddress = 0x81,
     .bmAttributes     = { .xfer = TUSB_XFER_BULK },
     .wMaxPacketSize   = 512,
diff --git a/tests/test/host/ehci/test_pipe_bulk_xfer.c b/tests/test/host/ehci/test_pipe_bulk_xfer.c
index e92544cdc..ccf30d724 100644
--- a/tests/test/host/ehci/test_pipe_bulk_xfer.c
+++ b/tests/test/host/ehci/test_pipe_bulk_xfer.c
@@ -67,7 +67,7 @@ static pipe_handle_t pipe_hdl_bulk;
 tusb_descriptor_endpoint_t const desc_ept_bulk_in =
 {
     .bLength          = sizeof(tusb_descriptor_endpoint_t),
-    .bDescriptorType  = TUSB_DESC_ENDPOINT,
+    .bDescriptorType  = TUSB_DESC_TYPE_ENDPOINT,
     .bEndpointAddress = 0x81,
     .bmAttributes     = { .xfer = TUSB_XFER_BULK },
     .wMaxPacketSize   = 512,
@@ -77,7 +77,7 @@ tusb_descriptor_endpoint_t const desc_ept_bulk_in =
 tusb_descriptor_endpoint_t const desc_ept_bulk_out =
 {
     .bLength          = sizeof(tusb_descriptor_endpoint_t),
-    .bDescriptorType  = TUSB_DESC_ENDPOINT,
+    .bDescriptorType  = TUSB_DESC_TYPE_ENDPOINT,
     .bEndpointAddress = 0x01,
     .bmAttributes     = { .xfer = TUSB_XFER_BULK },
     .wMaxPacketSize   = 512,
diff --git a/tests/test/host/ehci/test_pipe_control_xfer.c b/tests/test/host/ehci/test_pipe_control_xfer.c
index 605fd9107..266cf0ef2 100644
--- a/tests/test/host/ehci/test_pipe_control_xfer.c
+++ b/tests/test/host/ehci/test_pipe_control_xfer.c
@@ -107,7 +107,7 @@ tusb_std_request_t request_get_dev_desc =
 {
     .bmRequestType = { .direction = TUSB_DIR_DEV_TO_HOST, .type = TUSB_REQUEST_TYPE_STANDARD, .recipient = TUSB_REQUEST_RECIPIENT_DEVICE },
     .bRequest = TUSB_REQUEST_GET_DESCRIPTOR,
-    .wValue   = (TUSB_DESC_DEVICE << 8),
+    .wValue   = (TUSB_DESC_TYPE_DEVICE << 8),
     .wLength  = 18
 };
 
diff --git a/tests/test/host/ehci/test_pipe_interrupt_open.c b/tests/test/host/ehci/test_pipe_interrupt_open.c
index 172ac6f43..946d8f0c8 100644
--- a/tests/test/host/ehci/test_pipe_interrupt_open.c
+++ b/tests/test/host/ehci/test_pipe_interrupt_open.c
@@ -116,7 +116,7 @@ void verify_open_qhd(ehci_qhd_t *p_qhd, uint8_t endpoint_addr, uint16_t max_pack
 tusb_descriptor_endpoint_t const desc_ept_interrupt_out =
 {
     .bLength          = sizeof(tusb_descriptor_endpoint_t),
-    .bDescriptorType  = TUSB_DESC_ENDPOINT,
+    .bDescriptorType  = TUSB_DESC_TYPE_ENDPOINT,
     .bEndpointAddress = 0x02,
     .bmAttributes     = { .xfer = TUSB_XFER_INTERRUPT },
     .wMaxPacketSize   = 16,
diff --git a/tests/test/host/ehci/test_pipe_interrupt_xfer.c b/tests/test/host/ehci/test_pipe_interrupt_xfer.c
index 1abb00e24..f72b5d3ae 100644
--- a/tests/test/host/ehci/test_pipe_interrupt_xfer.c
+++ b/tests/test/host/ehci/test_pipe_interrupt_xfer.c
@@ -67,7 +67,7 @@ static pipe_handle_t pipe_hdl_interrupt;
 static tusb_descriptor_endpoint_t const desc_ept_interrupt_in =
 {
     .bLength          = sizeof(tusb_descriptor_endpoint_t),
-    .bDescriptorType  = TUSB_DESC_ENDPOINT,
+    .bDescriptorType  = TUSB_DESC_TYPE_ENDPOINT,
     .bEndpointAddress = 0x81,
     .bmAttributes     = { .xfer = TUSB_XFER_INTERRUPT },
     .wMaxPacketSize   = 8,
@@ -77,7 +77,7 @@ static tusb_descriptor_endpoint_t const desc_ept_interrupt_in =
 static tusb_descriptor_endpoint_t const desc_ept_interupt_out =
 {
     .bLength          = sizeof(tusb_descriptor_endpoint_t),
-    .bDescriptorType  = TUSB_DESC_ENDPOINT,
+    .bDescriptorType  = TUSB_DESC_TYPE_ENDPOINT,
     .bEndpointAddress = 0x01,
     .bmAttributes     = { .xfer = TUSB_XFER_INTERRUPT },
     .wMaxPacketSize   = 64,
diff --git a/tests/test/host/ehci/test_pipe_isochronous_open.c b/tests/test/host/ehci/test_pipe_isochronous_open.c
index be1b7dfb4..b2ebbf944 100644
--- a/tests/test/host/ehci/test_pipe_isochronous_open.c
+++ b/tests/test/host/ehci/test_pipe_isochronous_open.c
@@ -85,7 +85,7 @@ void tearDown(void)
 tusb_descriptor_endpoint_t const desc_ept_iso_in =
 {
     .bLength          = sizeof(tusb_descriptor_endpoint_t),
-    .bDescriptorType  = TUSB_DESC_ENDPOINT,
+    .bDescriptorType  = TUSB_DESC_TYPE_ENDPOINT,
     .bEndpointAddress = 0x83,
     .bmAttributes     = { .xfer = TUSB_XFER_ISOCHRONOUS },
     .wMaxPacketSize   = 1024,
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,