more rename

examples/device/device_virtual_com/src/tusb_descriptors.c

@@ -44,7 +44,7 @@
 tusb_descriptor_device_t const desc_device =
 {
     .bLength            = sizeof(tusb_descriptor_device_t),
-    .bDescriptorType    = TUSB_DESC_TYPE_DEVICE,
+    .bDescriptorType    = TUSB_DESC_DEVICE,
     .bcdUSB             = 0x0200,
 
     // Use Interface Association Descriptor (IAD) for CDC
@@ -74,7 +74,7 @@ app_descriptor_configuration_t const desc_configuration =
     .configuration =
     {
         .bLength             = sizeof(tusb_descriptor_configuration_t),
-        .bDescriptorType     = TUSB_DESC_TYPE_CONFIGURATION,
+        .bDescriptorType     = TUSB_DESC_CONFIGURATION,
 
         .wTotalLength        = sizeof(app_descriptor_configuration_t),
         .bNumInterfaces      = TOTAL_INTEFACES,
@@ -89,7 +89,7 @@ app_descriptor_configuration_t const desc_configuration =
     .cdc_iad =
     {
         .bLength           = sizeof(tusb_descriptor_interface_association_t),
-        .bDescriptorType   = TUSB_DESC_TYPE_INTERFACE_ASSOCIATION,
+        .bDescriptorType   = TUSB_DESC_INTERFACE_ASSOCIATION,
 
         .bFirstInterface   = INTERFACE_NO_CDC,
         .bInterfaceCount   = 2,
@@ -104,7 +104,7 @@ app_descriptor_configuration_t const desc_configuration =
     .cdc_comm_interface =
     {
         .bLength            = sizeof(tusb_descriptor_interface_t),
-        .bDescriptorType    = TUSB_DESC_TYPE_INTERFACE,
+        .bDescriptorType    = TUSB_DESC_INTERFACE,
         .bInterfaceNumber   = INTERFACE_NO_CDC,
         .bAlternateSetting  = 0,
         .bNumEndpoints      = 1,
@@ -117,7 +117,7 @@ app_descriptor_configuration_t const desc_configuration =
     .cdc_header =
     {
         .bLength            = sizeof(cdc_desc_func_header_t),
-        .bDescriptorType    = TUSB_DESC_TYPE_INTERFACE_CLASS_SPECIFIC,
+        .bDescriptorType    = TUSB_DESC_CLASS_SPECIFIC,
         .bDescriptorSubType = CDC_FUNC_DESC_HEADER,
         .bcdCDC             = 0x0120
     },
@@ -125,7 +125,7 @@ app_descriptor_configuration_t const desc_configuration =
     .cdc_call =
     {
         .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,
         .bmCapabilities     = { 0 },
         .bDataInterface     = INTERFACE_NO_CDC+1,
@@ -134,7 +134,7 @@ app_descriptor_configuration_t const desc_configuration =
     .cdc_acm =
     {
         .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,
         .bmCapabilities     = { // 0x02
             .support_line_request = 1,
@@ -144,7 +144,7 @@ app_descriptor_configuration_t const desc_configuration =
     .cdc_union =
     {
         .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,
         .bControlInterface        = INTERFACE_NO_CDC,
         .bSubordinateInterface    = INTERFACE_NO_CDC+1,
@@ -153,7 +153,7 @@ app_descriptor_configuration_t const desc_configuration =
     .cdc_endpoint_notification =
     {
         .bLength          = sizeof(tusb_descriptor_endpoint_t),
-        .bDescriptorType  = TUSB_DESC_TYPE_ENDPOINT,
+        .bDescriptorType  = TUSB_DESC_ENDPOINT,
         .bEndpointAddress = CDC_EDPT_NOTIFICATION_ADDR,
         .bmAttributes     = { .xfer = TUSB_XFER_INTERRUPT },
         .wMaxPacketSize   = { .size = 0x08 },
@@ -164,7 +164,7 @@ app_descriptor_configuration_t const desc_configuration =
     .cdc_data_interface =
     {
         .bLength            = sizeof(tusb_descriptor_interface_t),
-        .bDescriptorType    = TUSB_DESC_TYPE_INTERFACE,
+        .bDescriptorType    = TUSB_DESC_INTERFACE,
         .bInterfaceNumber   = INTERFACE_NO_CDC+1,
         .bAlternateSetting  = 0x00,
         .bNumEndpoints      = 2,
@@ -177,7 +177,7 @@ app_descriptor_configuration_t const desc_configuration =
     .cdc_endpoint_out =
     {
         .bLength          = sizeof(tusb_descriptor_endpoint_t),
-        .bDescriptorType  = TUSB_DESC_TYPE_ENDPOINT,
+        .bDescriptorType  = TUSB_DESC_ENDPOINT,
         .bEndpointAddress = CDC_EDPT_DATA_OUT_ADDR,
         .bmAttributes     = { .xfer = TUSB_XFER_BULK },
         .wMaxPacketSize   = { .size = CDC_EDPT_DATA_PACKETSIZE },
@@ -187,7 +187,7 @@ app_descriptor_configuration_t const desc_configuration =
     .cdc_endpoint_in =
     {
         .bLength          = sizeof(tusb_descriptor_endpoint_t),
-        .bDescriptorType  = TUSB_DESC_TYPE_ENDPOINT,
+        .bDescriptorType  = TUSB_DESC_ENDPOINT,
         .bEndpointAddress = CDC_EDPT_DATA_IN_ADDR,
         .bmAttributes     = { .xfer = TUSB_XFER_BULK },
         .wMaxPacketSize   = { .size = CDC_EDPT_DATA_PACKETSIZE },
@@ -205,42 +205,42 @@ app_descriptor_configuration_t const desc_configuration =
 uint16_t const * const string_descriptor_arr [] =
 {
     [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
     },
 
     [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
     },
 
     [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
     },
 
     [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
     },
 
     [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
     },
 
     [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
     },
 
     [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
     },
 
     [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
     }
 };

hw/mcu/nxp/lpc11uxx/hal_mcu/hal_lpc11uxx.c

@@ -36,7 +36,7 @@
 */
 /**************************************************************************/
 
-#include "common/common.h"
+#include "common/tusb_common.h"
 #include "hal.h"
 
 #if TUSB_CFG_MCU == MCU_LPC11UXX

hw/mcu/nxp/lpc13uxx/hal_mcu/hal_lpc13uxx.c

@@ -36,7 +36,7 @@
 */
 /**************************************************************************/
 
-#include "common/common.h"
+#include "common/tusb_common.h"
 #include "hal.h"
 
 #if TUSB_CFG_MCU == MCU_LPC13UXX

hw/mcu/nxp/lpc175x_6x/hal_mcu/hal_lpc175x_6x.c

@@ -36,7 +36,7 @@
 */
 /**************************************************************************/
 
-#include "common/common.h"
+#include "common/tusb_common.h"
 #include "hal_usb.h"
 
 #if TUSB_CFG_MCU == MCU_LPC175X_6X

hw/mcu/nxp/lpc43xx/tusb_port/dcd_lpc43xx.c

@@ -43,7 +43,7 @@
 //--------------------------------------------------------------------+
 // INCLUDE
 //--------------------------------------------------------------------+
-#include "common/common.h"
+#include "common/tusb_common.h"
 #include "tusb_hal.h"
 #include "osal/osal.h"
 #include "common/timeout_timer.h"

tinyusb/class/cdc/cdc.h

@@ -44,7 +44,7 @@
 #ifndef _TUSB_CDC_H__
 #define _TUSB_CDC_H__
 
-#include "common/common.h"
+#include "common/tusb_common.h"
 
 #ifdef __cplusplus
  extern "C" {

tinyusb/class/cdc/cdc_device.c

@@ -44,7 +44,7 @@
 //--------------------------------------------------------------------+
 // INCLUDE
 //--------------------------------------------------------------------+
-#include "common/common.h"
+#include <common/tusb_common.h>
 #include "cdc_device.h"
 
 //--------------------------------------------------------------------+

tinyusb/class/cdc/cdc_device.h

@@ -39,7 +39,7 @@
 #ifndef _TUSB_CDC_DEVICE_H_
 #define _TUSB_CDC_DEVICE_H_
 
-#include "common/common.h"
+#include "common/tusb_common.h"
 #include "device/usbd.h"
 #include "cdc.h"
 

tinyusb/class/cdc/cdc_host.c

@@ -45,7 +45,7 @@
 //--------------------------------------------------------------------+
 // INCLUDE
 //--------------------------------------------------------------------+
-#include "common/common.h"
+#include "common/tusb_common.h"
 #include "cdc_host.h"
 
 //--------------------------------------------------------------------+

tinyusb/class/cdc/cdc_host.h

@@ -40,7 +40,7 @@
 #ifndef _TUSB_CDC_HOST_H_
 #define _TUSB_CDC_HOST_H_
 
-#include "common/common.h"
+#include "common/tusb_common.h"
 #include "host/usbh.h"
 #include "cdc.h"
 

tinyusb/class/cdc/cdc_rndis_host.c

@@ -45,7 +45,7 @@
 //--------------------------------------------------------------------+
 // INCLUDE
 //--------------------------------------------------------------------+
-#include "common/common.h"
+#include "common/tusb_common.h"
 #include "cdc_host.h"
 #include "cdc_rndis_host.h"
 

tinyusb/class/cdc/cdc_rndis_host.h

@@ -43,7 +43,7 @@
 #ifndef _TUSB_CDC_RNDIS_HOST_H_
 #define _TUSB_CDC_RNDIS_HOST_H_
 
-#include "common/common.h"
+#include "common/tusb_common.h"
 #include "host/usbh.h"
 #include "cdc_rndis.h"
 

tinyusb/class/custom_class.h

@@ -43,7 +43,7 @@
 #ifndef _TUSB_CUSTOM_CLASS_H_
 #define _TUSB_CUSTOM_CLASS_H_
 
-#include "common/common.h"
+#include "common/tusb_common.h"
 #include "host/usbh.h"
 
 #ifdef __cplusplus

tinyusb/class/custom_class_host.c

@@ -45,7 +45,7 @@
 //--------------------------------------------------------------------+
 // INCLUDE
 //--------------------------------------------------------------------+
-#include "common/common.h"
+#include "common/tusb_common.h"
 #include "custom_class.h"
 
 //--------------------------------------------------------------------+

tinyusb/class/hid/hid.h

@@ -43,7 +43,7 @@
 #ifndef _TUSB_HID_H_
 #define _TUSB_HID_H_
 
-#include "common/common.h"
+#include "common/tusb_common.h"
 
 #ifdef __cplusplus
  extern "C" {

tinyusb/class/hid/hid_device.c

@@ -44,7 +44,7 @@
 //--------------------------------------------------------------------+
 // INCLUDE
 //--------------------------------------------------------------------+
-#include "common/common.h"
+#include "common/tusb_common.h"
 #include "hid_device.h"
 
 //--------------------------------------------------------------------+

tinyusb/class/hid/hid_device.h

@@ -39,7 +39,7 @@
 #ifndef _TUSB_HID_DEVICE_H_
 #define _TUSB_HID_DEVICE_H_
 
-#include "common/common.h"
+#include "common/tusb_common.h"
 #include "device/usbd.h"
 #include "hid.h"
 

tinyusb/class/hid/hid_host.c

@@ -44,7 +44,7 @@
 //--------------------------------------------------------------------+
 // INCLUDE
 //--------------------------------------------------------------------+
-#include "common/common.h"
+#include "common/tusb_common.h"
 #include "hid_host.h"
 
 //--------------------------------------------------------------------+

tinyusb/class/hid/hid_host.h

@@ -42,7 +42,7 @@
 #ifndef _TUSB_HID_HOST_H_
 #define _TUSB_HID_HOST_H_
 
-#include "common/common.h"
+#include "common/tusb_common.h"
 #include "host/usbh.h"
 #include "hid.h"
 

tinyusb/class/msc/msc.h

@@ -46,7 +46,7 @@
 #ifndef _TUSB_MSC_H_
 #define _TUSB_MSC_H_
 
-#include "common/common.h"
+#include <common/tusb_common.h>
 
 #ifdef __cplusplus
  extern "C" {

tinyusb/class/msc/msc_device.c

@@ -44,7 +44,7 @@
 //--------------------------------------------------------------------+
 // INCLUDE
 //--------------------------------------------------------------------+
-#include "common/common.h"
+#include <common/tusb_common.h>
 #include "msc_device.h"
 
 //--------------------------------------------------------------------+

tinyusb/class/msc/msc_device.h

@@ -39,7 +39,7 @@
 #ifndef _TUSB_MSC_DEVICE_H_
 #define _TUSB_MSC_DEVICE_H_
 
-#include "common/common.h"
+#include <common/tusb_common.h>
 #include "device/usbd.h"
 #include "msc.h"
 

tinyusb/class/msc/msc_host.c

@@ -45,7 +45,7 @@
 //--------------------------------------------------------------------+
 // INCLUDE
 //--------------------------------------------------------------------+
-#include "common/common.h"
+#include "common/tusb_common.h"
 #include "msc_host.h"
 
 //--------------------------------------------------------------------+

tinyusb/class/msc/msc_host.h

@@ -39,7 +39,7 @@
 #ifndef _TUSB_MSC_HOST_H_
 #define _TUSB_MSC_HOST_H_
 
-#include "common/common.h"
+#include "common/tusb_common.h"
 #include "host/usbh.h"
 #include "msc.h"
 

tinyusb/device/dcd_lpc175x_6x.h

@@ -43,7 +43,7 @@
 #ifndef _TUSB_DCD_LPC175X_6X_H_
 #define _TUSB_DCD_LPC175X_6X_H_
 
-#include "common/common.h"
+#include <common/tusb_common.h>
 
 #ifdef __cplusplus
  extern "C" {

tinyusb/device/dcd_lpc_11uxx_13uxx.c

@@ -48,7 +48,7 @@
 //--------------------------------------------------------------------+
 // INCLUDE
 //--------------------------------------------------------------------+
-#include "common/common.h"
+#include "common/tusb_common.h"
 #include "hal/hal.h"
 #include "osal/osal.h"
 #include "common/timeout_timer.h"

tinyusb/device/usbd.h

@@ -49,7 +49,7 @@
 //--------------------------------------------------------------------+
 // INCLUDE
 //--------------------------------------------------------------------+
-#include "common/common.h"
+#include <common/tusb_common.h>
 #include "osal/osal.h"
 #include "tusb_dcd.h"
 

tinyusb/host/ehci/ehci.c

@@ -36,7 +36,7 @@
 */
 /**************************************************************************/
 
-#include "common/common.h"
+#include "common/tusb_common.h"
 
 #if MODE_HOST_SUPPORTED && (TUSB_CFG_MCU == MCU_LPC43XX || TUSB_CFG_MCU == MCU_LPC18XX)
 //--------------------------------------------------------------------+

tinyusb/host/ehci/ehci.h

@@ -45,7 +45,7 @@
 #ifndef _TUSB_EHCI_H_
 #define _TUSB_EHCI_H_
 
-#include "common/common.h"
+#include "common/tusb_common.h"
 #include "../hcd.h"
 
 /* Abbreviation

tinyusb/host/hcd.h

@@ -47,7 +47,7 @@
  extern "C" {
 #endif
 
-#include "common/common.h"
+#include <common/tusb_common.h>
 
 #if MODE_HOST_SUPPORTED
 // Max number of endpoints per device

tinyusb/host/hub.h

@@ -48,7 +48,7 @@
 #ifndef _TUSB_HUB_H_
 #define _TUSB_HUB_H_
 
-#include "common/common.h"
+#include <common/tusb_common.h>
 #include "usbh.h"
 
 #ifdef __cplusplus

tinyusb/host/ohci/ohci.c

@@ -36,7 +36,7 @@
 */
 /**************************************************************************/
 
-#include "common/common.h"
+#include <common/tusb_common.h>
 
 #if MODE_HOST_SUPPORTED && (TUSB_CFG_MCU == MCU_LPC175X_6X)
 //--------------------------------------------------------------------+

tinyusb/host/ohci/ohci.h

@@ -49,7 +49,7 @@
  extern "C" {
 #endif
 
-#include "common/common.h"
+#include "common/tusb_common.h"
 
 //--------------------------------------------------------------------+
 // OHCI CONFIGURATION & CONSTANTS

tinyusb/host/usbh.c

@@ -36,7 +36,7 @@
 */
 /**************************************************************************/
 
-#include "common/common.h"
+#include "common/tusb_common.h"
 
 #if MODE_HOST_SUPPORTED
 

tinyusb/host/usbh_hcd.h

@@ -49,7 +49,7 @@
 //--------------------------------------------------------------------+
 // INCLUDE
 //--------------------------------------------------------------------+
-#include "common/common.h"
+#include "common/tusb_common.h"
 #include "osal/osal.h"
 
 #ifdef _TEST_

tinyusb/host/usbh_hub.h

@@ -45,7 +45,7 @@
 //--------------------------------------------------------------------+
 // INCLUDE
 //--------------------------------------------------------------------+
-#include "common/common.h"
+#include "common/tusb_common.h"
 
 #ifdef __cplusplus
  extern "C" {

tinyusb/osal/osal.h

@@ -54,7 +54,7 @@
 /** @} */
 
 #include "tusb_option.h"
-#include "common/common.h"
+#include "common/tusb_common.h"
 
 
 #if TUSB_CFG_OS == TUSB_OS_NONE

tinyusb/osal/osal_common.h

@@ -46,7 +46,7 @@
  extern "C" {
 #endif
 
-#include "common/common.h"
+#include <common/tusb_common.h>
 
 enum
 {

tinyusb/tusb.h

@@ -46,7 +46,7 @@
 //--------------------------------------------------------------------+
 // INCLUDE
 //--------------------------------------------------------------------+
-#include "common/common.h"
+#include "common/tusb_common.h"
 #include "tusb_hal.h"
 #include "osal/osal.h"