mass rename TUSB_CFG to CFG_TUSB

4 files changed, 27 insertions, 27 deletions

diff --git a/tests/support/descriptor_test.c b/tests/support/descriptor_test.c
index d7e7d7521..0998db8b7 100644
--- a/tests/support/descriptor_test.c
+++ b/tests/support/descriptor_test.c
@@ -39,7 +39,7 @@
 #include "tusb_option.h"
 #include "descriptor_test.h"
 
-TUSB_CFG_ATTR_USBRAM ATTR_ALIGNED(4)
+CFG_TUSB_ATTR_USBRAM ATTR_ALIGNED(4)
 const uint8_t keyboard_report_descriptor[] = {
   HID_USAGE_PAGE ( HID_USAGE_PAGE_DESKTOP     ),
   HID_USAGE      ( HID_USAGE_DESKTOP_KEYBOARD ),
@@ -81,7 +81,7 @@ const uint8_t keyboard_report_descriptor[] = {
   HID_COLLECTION_END
 };
 
-TUSB_CFG_ATTR_USBRAM ATTR_ALIGNED(4)
+CFG_TUSB_ATTR_USBRAM ATTR_ALIGNED(4)
 const uint8_t mouse_report_descriptor[] = {
   HID_USAGE_PAGE ( HID_USAGE_PAGE_DESKTOP     ),
   HID_USAGE      ( HID_USAGE_DESKTOP_MOUSE    ),
@@ -118,7 +118,7 @@ const uint8_t mouse_report_descriptor[] = {
 };
 
 
-TUSB_CFG_ATTR_USBRAM ATTR_ALIGNED(4)
+CFG_TUSB_ATTR_USBRAM ATTR_ALIGNED(4)
 tusb_desc_device_t const desc_device =
 {
     .bLength            = sizeof(tusb_desc_device_t),
@@ -142,7 +142,7 @@ tusb_desc_device_t const desc_device =
 } ;
 
 
-TUSB_CFG_ATTR_USBRAM ATTR_ALIGNED(4)
+CFG_TUSB_ATTR_USBRAM ATTR_ALIGNED(4)
 const app_configuration_desc_t desc_configuration =
 {
     .configuration =
diff --git a/tests/support/descriptor_test.h b/tests/support/descriptor_test.h
index 1e5801ce4..a0455f4ba 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 //&& TUSB_CFG_DEVICE_CDC
+#if 0 //&& CFG_TUSB_DEVICE_CDC
   //CDC - Serial
   //CDC Control Interface
   tusb_desc_interface_t                 CDC_CCI_Interface;
diff --git a/tests/support/ehci_controller_fake.c b/tests/support/ehci_controller_fake.c
index 044ea84f3..04d55172c 100644
--- a/tests/support/ehci_controller_fake.c
+++ b/tests/support/ehci_controller_fake.c
@@ -54,7 +54,7 @@
 LPC_USB0_Type lpc_usb0;
 LPC_USB1_Type lpc_usb1;
 
-extern usbh_device_info_t usbh_devices[TUSB_CFG_HOST_DEVICE_MAX+1];
+extern usbh_device_info_t usbh_devices[CFG_TUSB_HOST_DEVICE_MAX+1];
 
 //--------------------------------------------------------------------+
 // IMPLEMENTATION
diff --git a/tests/support/tusb_config.h b/tests/support/tusb_config.h
index 5d23c6c77..964f3a034 100644
--- a/tests/support/tusb_config.h
+++ b/tests/support/tusb_config.h
@@ -46,49 +46,49 @@
 //--------------------------------------------------------------------+

 // CONTROLLER CONFIGURATION

 //--------------------------------------------------------------------+

-#define TUSB_CFG_CONTROLLER_0_MODE  (TUSB_MODE_HOST | TUSB_MODE_DEVICE)

-#define TUSB_CFG_CONTROLLER_1_MODE  (TUSB_MODE_NONE)

+#define CFG_TUSB_CONTROLLER_0_MODE  (TUSB_MODE_HOST | TUSB_MODE_DEVICE)

+#define CFG_TUSB_CONTROLLER_1_MODE  (TUSB_MODE_NONE)

 

 //--------------------------------------------------------------------+

 // HOST CONFIGURATION

 //--------------------------------------------------------------------+

-#define TUSB_CFG_HOST_DEVICE_MAX                5 // TODO be a part of HUB config

+#define CFG_TUSB_HOST_DEVICE_MAX                5 // TODO be a part of HUB config

 

 //------------- CLASS -------------//

-#define TUSB_CFG_HOST_HUB                        0

-#define TUSB_CFG_HOST_HID_KEYBOARD               1

-#define TUSB_CFG_HOST_HID_MOUSE                  1

-#define TUSB_CFG_HOST_HID_GENERIC                0

-#define TUSB_CFG_HOST_MSC                        1

-#define TUSB_CFG_HOST_CDC                        1

-#define TUSB_CFG_HOST_CDC_RNDIS                  0

+#define CFG_TUSB_HOST_HUB                        0

+#define CFG_TUSB_HOST_HID_KEYBOARD               1

+#define CFG_TUSB_HOST_HID_MOUSE                  1

+#define CFG_TUSB_HOST_HID_GENERIC                0

+#define CFG_TUSB_HOST_MSC                        1

+#define CFG_TUSB_HOST_CDC                        1

+#define CFG_TUSB_HOST_CDC_RNDIS                  0

 

 // Test support

 #define TEST_CONTROLLER_HOST_START_INDEX \

- ( ((CONTROLLER_HOST_NUMBER == 1) && (TUSB_CFG_CONTROLLER_1_MODE & TUSB_MODE_HOST)) ? 1 : 0)

+ ( ((CONTROLLER_HOST_NUMBER == 1) && (CFG_TUSB_CONTROLLER_1_MODE & TUSB_MODE_HOST)) ? 1 : 0)

 

 //--------------------------------------------------------------------+

 // DEVICE CONFIGURATION

 //--------------------------------------------------------------------+

-#define TUSB_CFG_DEVICE_CONTROL_ENDOINT_SIZE   64

+#define CFG_TUSB_DEVICE_CONTROL_ENDOINT_SIZE   64

 

 //------------- CLASS -------------//

-#define TUSB_CFG_DEVICE_HID_KEYBOARD  1

-#define TUSB_CFG_DEVICE_HID_MOUSE     1

-#define TUSB_CFG_DEVICE_HID_GENERIC   0

-#define TUSB_CFG_DEVICE_MSC           1

-#define TUSB_CFG_DEVICE_CDC           1

+#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

 

 

 //--------------------------------------------------------------------+

 // COMMON CONFIGURATION

 //--------------------------------------------------------------------+

 

-#define TUSB_CFG_DEBUG 3

+#define CFG_TUSB_DEBUG 3

 

-#define TUSB_CFG_OS TUSB_OS_NONE

-#define TUSB_CFG_TICKS_HZ 1000 // 1 ms tick

-#define TUSB_CFG_ATTR_USBRAM

+#define CFG_TUSB_OS TUSB_OS_NONE

+#define CFG_TUSB_TICKS_HZ 1000 // 1 ms tick

+#define CFG_TUSB_ATTR_USBRAM

 

 #ifdef __cplusplus

  }