mass rename TUSB_CFG to CFG_TUSB

13 files changed, 65 insertions, 65 deletions

diff --git a/tinyusb/class/cdc/cdc_device.c b/tinyusb/class/cdc/cdc_device.c
index 3dde8a4a9..5ca4c7d31 100644
--- a/tinyusb/class/cdc/cdc_device.c
+++ b/tinyusb/class/cdc/cdc_device.c
@@ -38,7 +38,7 @@
 

 #include "tusb_option.h"

 

-#if (MODE_DEVICE_SUPPORTED && TUSB_CFG_DEVICE_CDC)

+#if (MODE_DEVICE_SUPPORTED && CFG_TUSB_DEVICE_CDC)

 

 #define _TINY_USB_SOURCE_FILE_

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

@@ -51,7 +51,7 @@
 //--------------------------------------------------------------------+

 // MACRO CONSTANT TYPEDEF

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

-TUSB_CFG_ATTR_USBRAM STATIC_VAR cdc_line_coding_t cdcd_line_coding[CONTROLLER_DEVICE_NUMBER];

+CFG_TUSB_ATTR_USBRAM STATIC_VAR cdc_line_coding_t cdcd_line_coding[CONTROLLER_DEVICE_NUMBER];

 

 typedef struct {

   uint8_t interface_number;

@@ -66,8 +66,8 @@ typedef struct {
 }cdcd_data_t;

 

 // TODO multiple rhport

-TUSB_CFG_ATTR_USBRAM ATTR_ALIGNED(4) uint8_t _tmp_rx_buf[64];

-TUSB_CFG_ATTR_USBRAM ATTR_ALIGNED(4) uint8_t _tmp_tx_buf[64];

+CFG_TUSB_ATTR_USBRAM ATTR_ALIGNED(4) uint8_t _tmp_rx_buf[64];

+CFG_TUSB_ATTR_USBRAM ATTR_ALIGNED(4) uint8_t _tmp_tx_buf[64];

 

 #define CFG_TUD_CDC_BUFSIZE   128

 

diff --git a/tinyusb/class/cdc/cdc_host.c b/tinyusb/class/cdc/cdc_host.c
index 56f36aedb..bd5b5e32c 100644
--- a/tinyusb/class/cdc/cdc_host.c
+++ b/tinyusb/class/cdc/cdc_host.c
@@ -38,7 +38,7 @@
 

 #include "tusb_option.h"

 

-#if (MODE_HOST_SUPPORTED && TUSB_CFG_HOST_CDC)

+#if (MODE_HOST_SUPPORTED && CFG_TUSB_HOST_CDC)

 

 #define _TINY_USB_SOURCE_FILE_

 

@@ -55,7 +55,7 @@
 //--------------------------------------------------------------------+

 // INTERNAL OBJECT & FUNCTION DECLARATION

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

-STATIC_VAR cdch_data_t cdch_data[TUSB_CFG_HOST_DEVICE_MAX]; // TODO to be static

+STATIC_VAR cdch_data_t cdch_data[CFG_TUSB_HOST_DEVICE_MAX]; // TODO to be static

 

 static inline cdc_pipeid_t get_app_pipeid(pipe_handle_t pipe_hdl)

 {

@@ -139,7 +139,7 @@ tusb_error_t tuh_cdc_receive(uint8_t dev_addr, void * p_buffer, uint32_t length,
 //--------------------------------------------------------------------+

 void cdch_init(void)

 {

-  memclr_(cdch_data, sizeof(cdch_data_t)*TUSB_CFG_HOST_DEVICE_MAX);

+  memclr_(cdch_data, sizeof(cdch_data_t)*CFG_TUSB_HOST_DEVICE_MAX);

 }

 

 tusb_error_t cdch_open_subtask(uint8_t dev_addr, tusb_desc_interface_t const *p_interface_desc, uint16_t *p_length)

diff --git a/tinyusb/class/cdc/cdc_host.h b/tinyusb/class/cdc/cdc_host.h
index f720cb438..77f1e5a78 100644
--- a/tinyusb/class/cdc/cdc_host.h
+++ b/tinyusb/class/cdc/cdc_host.h
@@ -77,27 +77,27 @@ bool tuh_cdc_is_busy(uint8_t dev_addr, cdc_pipeid_t pipeid)  ATTR_PURE ATTR_WARN
 

 /** \brief 			Perform USB OUT transfer to device

  * \param[in]		dev_addr	device address

- * \param[in]	  p_data    Buffer containing data. Must be accessible by USB controller (see \ref TUSB_CFG_ATTR_USBRAM)

+ * \param[in]	  p_data    Buffer containing data. Must be accessible by USB controller (see \ref CFG_TUSB_ATTR_USBRAM)

  * \param[in]		length    Number of bytes to be transferred via USB bus

  * \retval      TUSB_ERROR_NONE on success

  * \retval      TUSB_ERROR_INTERFACE_IS_BUSY if the interface is already transferring data with device

  * \retval      TUSB_ERROR_DEVICE_NOT_READY if device is not yet configured (by SET CONFIGURED request)

  * \retval      TUSB_ERROR_INVALID_PARA if input parameters are not correct

  * \note        This function is non-blocking and returns immediately. The result of USB transfer will be reported by the

- *              interface's callback function. \a p_data must be declared with \ref TUSB_CFG_ATTR_USBRAM.

+ *              interface's callback function. \a p_data must be declared with \ref CFG_TUSB_ATTR_USBRAM.

  */

 tusb_error_t tuh_cdc_send(uint8_t dev_addr, void const * p_data, uint32_t length, bool is_notify);

 

 /** \brief 			Perform USB IN transfer to get data from device

  * \param[in]		dev_addr	device address

- * \param[in]	  p_buffer  Buffer containing received data. Must be accessible by USB controller (see \ref TUSB_CFG_ATTR_USBRAM)

+ * \param[in]	  p_buffer  Buffer containing received data. Must be accessible by USB controller (see \ref CFG_TUSB_ATTR_USBRAM)

  * \param[in]		length    Number of bytes to be transferred via USB bus

  * \retval      TUSB_ERROR_NONE on success

  * \retval      TUSB_ERROR_INTERFACE_IS_BUSY if the interface is already transferring data with device

  * \retval      TUSB_ERROR_DEVICE_NOT_READY if device is not yet configured (by SET CONFIGURED request)

  * \retval      TUSB_ERROR_INVALID_PARA if input parameters are not correct

  * \note        This function is non-blocking and returns immediately. The result of USB transfer will be reported by the

- *              interface's callback function. \a p_data must be declared with \ref TUSB_CFG_ATTR_USBRAM.

+ *              interface's callback function. \a p_data must be declared with \ref CFG_TUSB_ATTR_USBRAM.

  */

 tusb_error_t tuh_cdc_receive(uint8_t dev_addr, void * p_buffer, uint32_t length, bool is_notify);

 

@@ -147,7 +147,7 @@ typedef struct {
 

 } cdch_data_t;

 

-extern cdch_data_t cdch_data[TUSB_CFG_HOST_DEVICE_MAX]; // TODO consider to move to cdch internal header file

+extern cdch_data_t cdch_data[CFG_TUSB_HOST_DEVICE_MAX]; // TODO consider to move to cdch internal header file

 

 void         cdch_init(void);

 tusb_error_t cdch_open_subtask(uint8_t dev_addr, tusb_desc_interface_t const *p_interface_desc, uint16_t *p_length) ATTR_WARN_UNUSED_RESULT;

diff --git a/tinyusb/class/cdc/cdc_rndis_host.c b/tinyusb/class/cdc/cdc_rndis_host.c
index 7026a3871..62361feb4 100644
--- a/tinyusb/class/cdc/cdc_rndis_host.c
+++ b/tinyusb/class/cdc/cdc_rndis_host.c
@@ -38,7 +38,7 @@
 
 #include "tusb_option.h"
 
-#if (MODE_HOST_SUPPORTED && TUSB_CFG_HOST_CDC && TUSB_CFG_HOST_CDC_RNDIS)
+#if (MODE_HOST_SUPPORTED && CFG_TUSB_HOST_CDC && CFG_TUSB_HOST_CDC_RNDIS)
 
 #define _TINY_USB_SOURCE_FILE_
 
@@ -54,10 +54,10 @@
 //--------------------------------------------------------------------+
 #define RNDIS_MSG_PAYLOAD_MAX   (1024*4)
 
-TUSB_CFG_ATTR_USBRAM static uint8_t msg_notification[TUSB_CFG_HOST_DEVICE_MAX][8];
-TUSB_CFG_ATTR_USBRAM ATTR_ALIGNED(4) static uint8_t msg_payload[RNDIS_MSG_PAYLOAD_MAX];
+CFG_TUSB_ATTR_USBRAM static uint8_t msg_notification[CFG_TUSB_HOST_DEVICE_MAX][8];
+CFG_TUSB_ATTR_USBRAM ATTR_ALIGNED(4) static uint8_t msg_payload[RNDIS_MSG_PAYLOAD_MAX];
 
-STATIC_VAR rndish_data_t rndish_data[TUSB_CFG_HOST_DEVICE_MAX];
+STATIC_VAR rndish_data_t rndish_data[CFG_TUSB_HOST_DEVICE_MAX];
 
 // TODO Microsoft requires message length for any get command must be at least 4096 bytes
 
@@ -102,7 +102,7 @@ static tusb_error_t rndis_body_subtask(void)
 
   OSAL_SUBTASK_BEGIN
 
-  for (relative_addr = 0; relative_addr < TUSB_CFG_HOST_DEVICE_MAX; relative_addr++)
+  for (relative_addr = 0; relative_addr < CFG_TUSB_HOST_DEVICE_MAX; relative_addr++)
   {
 
   }
@@ -117,12 +117,12 @@ static tusb_error_t rndis_body_subtask(void)
 //--------------------------------------------------------------------+
 void rndish_init(void)
 {
-  memclr_(rndish_data, sizeof(rndish_data_t)*TUSB_CFG_HOST_DEVICE_MAX);
+  memclr_(rndish_data, sizeof(rndish_data_t)*CFG_TUSB_HOST_DEVICE_MAX);
 
   //------------- Task creation -------------//
 
   //------------- semaphore creation for notificaiton pipe -------------//
-  for(uint8_t i=0; i<TUSB_CFG_HOST_DEVICE_MAX; i++)
+  for(uint8_t i=0; i<CFG_TUSB_HOST_DEVICE_MAX; i++)
   {
     rndish_data[i].sem_notification_hdl = osal_semaphore_create( OSAL_SEM_REF(rndish_data[i].semaphore_notification) );
   }
diff --git a/tinyusb/class/custom_class_host.c b/tinyusb/class/custom_class_host.c
index 474931cf9..6aca2bfb3 100644
--- a/tinyusb/class/custom_class_host.c
+++ b/tinyusb/class/custom_class_host.c
@@ -38,7 +38,7 @@
 
 #include "tusb_option.h"
 
-#if (MODE_HOST_SUPPORTED && TUSB_CFG_HOST_CUSTOM_CLASS)
+#if (MODE_HOST_SUPPORTED && CFG_TUSB_HOST_CUSTOM_CLASS)
 
 #define _TINY_USB_SOURCE_FILE_
 
@@ -55,7 +55,7 @@
 //--------------------------------------------------------------------+
 // INTERNAL OBJECT & FUNCTION DECLARATION
 //--------------------------------------------------------------------+
-custom_interface_info_t custom_interface[TUSB_CFG_HOST_DEVICE_MAX];
+custom_interface_info_t custom_interface[CFG_TUSB_HOST_DEVICE_MAX];
 
 static tusb_error_t cush_validate_paras(uint8_t dev_addr, uint16_t vendor_id, uint16_t product_id, void * p_buffer, uint16_t length)
 {
@@ -104,7 +104,7 @@ tusb_error_t tusbh_custom_write(uint8_t dev_addr, uint16_t vendor_id, uint16_t p
 //--------------------------------------------------------------------+
 void cush_init(void)
 {
-  memclr_(&custom_interface, sizeof(custom_interface_info_t) * TUSB_CFG_HOST_DEVICE_MAX);
+  memclr_(&custom_interface, sizeof(custom_interface_info_t) * CFG_TUSB_HOST_DEVICE_MAX);
 }
 
 tusb_error_t cush_open_subtask(uint8_t dev_addr, tusb_desc_interface_t const *p_interface_desc, uint16_t *p_length)
diff --git a/tinyusb/class/hid/hid_device.c b/tinyusb/class/hid/hid_device.c
index 6790ef739..da296260e 100644
--- a/tinyusb/class/hid/hid_device.c
+++ b/tinyusb/class/hid/hid_device.c
@@ -78,7 +78,7 @@ static hidd_class_driver_t const hidd_class_driver[HIDD_NUMBER_OF_SUBCLASS] =
 {

 //    [HID_PROTOCOL_NONE]  = for HID Generic

 

-#if TUSB_CFG_DEVICE_HID_KEYBOARD

+#if CFG_TUSB_DEVICE_HID_KEYBOARD

     [HID_PROTOCOL_KEYBOARD] =

     {

         .p_interface   = &keyboardd_data,

@@ -88,7 +88,7 @@ static hidd_class_driver_t const hidd_class_driver[HIDD_NUMBER_OF_SUBCLASS] =
     },

 #endif

 

-#if TUSB_CFG_DEVICE_HID_MOUSE

+#if CFG_TUSB_DEVICE_HID_MOUSE

     [HID_PROTOCOL_MOUSE] =

     {

         .p_interface   = &moused_data,

@@ -100,12 +100,12 @@ static hidd_class_driver_t const hidd_class_driver[HIDD_NUMBER_OF_SUBCLASS] =
 };

 

 // internal buffer for transferring data

-TUSB_CFG_ATTR_USBRAM STATIC_VAR uint8_t m_hid_buffer[ HIDD_BUFFER_SIZE ];

+CFG_TUSB_ATTR_USBRAM STATIC_VAR uint8_t m_hid_buffer[ HIDD_BUFFER_SIZE ];

 

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

 // KEYBOARD APPLICATION API

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

-#if TUSB_CFG_DEVICE_HID_KEYBOARD

+#if CFG_TUSB_DEVICE_HID_KEYBOARD

 STATIC_VAR hidd_interface_t keyboardd_data;

 

 bool tud_hid_keyboard_busy(uint8_t rhport)

@@ -128,7 +128,7 @@ tusb_error_t tud_hid_keyboard_send(uint8_t rhport, hid_keyboard_report_t const *
 //--------------------------------------------------------------------+

 // MOUSE APPLICATION API

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

-#if TUSB_CFG_DEVICE_HID_MOUSE

+#if CFG_TUSB_DEVICE_HID_MOUSE

 STATIC_VAR hidd_interface_t moused_data;

 

 bool tud_hid_mouse_is_busy(uint8_t rhport)

diff --git a/tinyusb/class/hid/hid_device.h b/tinyusb/class/hid/hid_device.h
index a816a29ac..b211731e0 100644
--- a/tinyusb/class/hid/hid_device.h
+++ b/tinyusb/class/hid/hid_device.h
@@ -66,7 +66,7 @@ bool tud_hid_keyboard_busy(uint8_t rhport);
 

 /** \brief        Submit USB transfer

  * \param[in]		  rhport USB Controller ID

- * \param[in,out] p_report address that is used to store data from device. Must be accessible by usb controller (see \ref TUSB_CFG_ATTR_USBRAM)

+ * \param[in,out] p_report address that is used to store data from device. Must be accessible by usb controller (see \ref CFG_TUSB_ATTR_USBRAM)

  * \returns       \ref tusb_error_t type to indicate success or error condition.

  * \retval        TUSB_ERROR_NONE on success

  * \retval        TUSB_ERROR_INTERFACE_IS_BUSY if the interface is already transferring data with device

@@ -96,7 +96,7 @@ void tud_hid_keyboard_cb(uint8_t rhport, tusb_event_t event, uint32_t xferred_by
  *              via control endpoint.

  * \param[in]		rhport	USB Controller ID

  * \param[in]   report_type specify which report (INPUT, OUTPUT, FEATURE) that host requests

- * \param[out]  pp_report pointer to buffer that application need to update, value must be accessible by USB controller (see \ref TUSB_CFG_ATTR_USBRAM)

+ * \param[out]  pp_report pointer to buffer that application need to update, value must be accessible by USB controller (see \ref CFG_TUSB_ATTR_USBRAM)

  * \param[in]   requested_length  number of bytes that host requested

  * \retval      non-zero Actual number of bytes in the response's buffer.

  * \retval      zero  indicates the current request is not supported. Tinyusb device stack will reject the request by

@@ -139,7 +139,7 @@ bool tud_hid_mouse_is_busy(uint8_t rhport);
 

 /** \brief        Perform transfer queuing

  * \param[in]		  rhport USB Controller ID

- * \param[in,out] p_report address that is used to store data from device. Must be accessible by usb controller (see \ref TUSB_CFG_ATTR_USBRAM)

+ * \param[in,out] p_report address that is used to store data from device. Must be accessible by usb controller (see \ref CFG_TUSB_ATTR_USBRAM)

  * \returns       \ref tusb_error_t type to indicate success or error condition.

  * \retval        TUSB_ERROR_NONE on success

  * \retval        TUSB_ERROR_INTERFACE_IS_BUSY if the interface is already transferring data with device

@@ -169,7 +169,7 @@ void tud_hid_mouse_cb(uint8_t rhport, tusb_event_t event, uint32_t xferred_bytes
  *              via control endpoint.

  * \param[in]		rhport	USB Controller ID

  * \param[in]   report_type specify which report (INPUT, OUTPUT, FEATURE) that host requests

- * \param[out]  pp_report pointer to buffer that application need to update, value must be accessible by USB controller (see \ref TUSB_CFG_ATTR_USBRAM)

+ * \param[out]  pp_report pointer to buffer that application need to update, value must be accessible by USB controller (see \ref CFG_TUSB_ATTR_USBRAM)

  * \param[in]   requested_length  number of bytes that host requested

  * \retval      non-zero Actual number of bytes in the response's buffer.

  * \retval      zero  indicates the current request is not supported. Tinyusb device stack will reject the request by

diff --git a/tinyusb/class/hid/hid_host.c b/tinyusb/class/hid/hid_host.c
index 06e87210b..65bb36b15 100644
--- a/tinyusb/class/hid/hid_host.c
+++ b/tinyusb/class/hid/hid_host.c
@@ -88,7 +88,7 @@ tusb_error_t hidh_interface_get_report(uint8_t dev_addr, void * report, hidh_int
 //--------------------------------------------------------------------+

 // KEYBOARD

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

-#if TUSB_CFG_HOST_HID_KEYBOARD

+#if CFG_TUSB_HOST_HID_KEYBOARD

 

 #define EXPAND_KEYCODE_TO_ASCII(keycode, ascii, shift_modified)  \

   [0][keycode] = ascii,\

@@ -100,7 +100,7 @@ uint8_t const hid_keycode_to_ascii_tbl[2][128] =
     HID_KEYCODE_TABLE(EXPAND_KEYCODE_TO_ASCII)

 };

 

-STATIC_VAR hidh_interface_info_t keyboardh_data[TUSB_CFG_HOST_DEVICE_MAX]; // does not have addr0, index = dev_address-1

+STATIC_VAR hidh_interface_info_t keyboardh_data[CFG_TUSB_HOST_DEVICE_MAX]; // does not have addr0, index = dev_address-1

 

 //------------- KEYBOARD PUBLIC API (parameter validation required) -------------//

 bool  tuh_hid_keyboard_is_mounted(uint8_t dev_addr)

@@ -124,9 +124,9 @@ bool tuh_hid_keyboard_is_busy(uint8_t dev_addr)
 //--------------------------------------------------------------------+

 // MOUSE

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

-#if TUSB_CFG_HOST_HID_MOUSE

+#if CFG_TUSB_HOST_HID_MOUSE

 

-STATIC_VAR hidh_interface_info_t mouseh_data[TUSB_CFG_HOST_DEVICE_MAX]; // does not have addr0, index = dev_address-1

+STATIC_VAR hidh_interface_info_t mouseh_data[CFG_TUSB_HOST_DEVICE_MAX]; // does not have addr0, index = dev_address-1

 

 //------------- Public API -------------//

 bool tuh_hid_mouse_is_mounted(uint8_t dev_addr)

@@ -150,11 +150,11 @@ tusb_error_t tuh_hid_mouse_get_report(uint8_t dev_addr, void * report)
 //--------------------------------------------------------------------+

 // GENERIC

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

-#if TUSB_CFG_HOST_HID_GENERIC

+#if CFG_TUSB_HOST_HID_GENERIC

 

 //STATIC_ struct {

 //  hidh_interface_info_t

-//} generic_data[TUSB_CFG_HOST_DEVICE_MAX];

+//} generic_data[CFG_TUSB_HOST_DEVICE_MAX];

 

 #endif

 

@@ -163,21 +163,21 @@ tusb_error_t tuh_hid_mouse_get_report(uint8_t dev_addr, void * report)
 //--------------------------------------------------------------------+

 void hidh_init(void)

 {

-#if TUSB_CFG_HOST_HID_KEYBOARD

-  memclr_(&keyboardh_data, sizeof(hidh_interface_info_t)*TUSB_CFG_HOST_DEVICE_MAX);

+#if CFG_TUSB_HOST_HID_KEYBOARD

+  memclr_(&keyboardh_data, sizeof(hidh_interface_info_t)*CFG_TUSB_HOST_DEVICE_MAX);

 #endif

 

-#if TUSB_CFG_HOST_HID_MOUSE

-  memclr_(&mouseh_data, sizeof(hidh_interface_info_t)*TUSB_CFG_HOST_DEVICE_MAX);

+#if CFG_TUSB_HOST_HID_MOUSE

+  memclr_(&mouseh_data, sizeof(hidh_interface_info_t)*CFG_TUSB_HOST_DEVICE_MAX);

 #endif

 

-#if TUSB_CFG_HOST_HID_GENERIC

+#if CFG_TUSB_HOST_HID_GENERIC

   hidh_generic_init();

 #endif

 }

 

 #if 0

-TUSB_CFG_ATTR_USBRAM uint8_t report_descriptor[256];

+CFG_TUSB_ATTR_USBRAM uint8_t report_descriptor[256];

 #endif

 

 tusb_error_t hidh_open_subtask(uint8_t dev_addr, tusb_desc_interface_t const *p_interface_desc, uint16_t *p_length)

@@ -222,7 +222,7 @@ tusb_error_t hidh_open_subtask(uint8_t dev_addr, tusb_desc_interface_t const *p_
 

   if ( HID_SUBCLASS_BOOT == p_interface_desc->bInterfaceSubClass )

   {

-    #if TUSB_CFG_HOST_HID_KEYBOARD

+    #if CFG_TUSB_HOST_HID_KEYBOARD

     if ( HID_PROTOCOL_KEYBOARD == p_interface_desc->bInterfaceProtocol)

     {

       STASK_ASSERT_ERR ( hidh_interface_open(dev_addr, p_interface_desc->bInterfaceNumber, p_endpoint_desc, &keyboardh_data[dev_addr-1]) );

@@ -230,7 +230,7 @@ tusb_error_t hidh_open_subtask(uint8_t dev_addr, tusb_desc_interface_t const *p_
     } else

     #endif

 

-    #if TUSB_CFG_HOST_HID_MOUSE

+    #if CFG_TUSB_HOST_HID_MOUSE

     if ( HID_PROTOCOL_MOUSE == p_interface_desc->bInterfaceProtocol)

     {

       STASK_ASSERT_ERR ( hidh_interface_open(dev_addr, p_interface_desc->bInterfaceNumber, p_endpoint_desc, &mouseh_data[dev_addr-1]) );

@@ -255,7 +255,7 @@ void hidh_isr(pipe_handle_t pipe_hdl, tusb_event_t event, uint32_t xferred_bytes
 {

   (void) xferred_bytes; // TODO may need to use this para later

 

-#if TUSB_CFG_HOST_HID_KEYBOARD

+#if CFG_TUSB_HOST_HID_KEYBOARD

   if ( pipehandle_is_equal(pipe_hdl, keyboardh_data[pipe_hdl.dev_addr-1].pipe_hdl) )

   {

     tuh_hid_keyboard_isr(pipe_hdl.dev_addr, event);

@@ -263,7 +263,7 @@ void hidh_isr(pipe_handle_t pipe_hdl, tusb_event_t event, uint32_t xferred_bytes
   }

 #endif

 

-#if TUSB_CFG_HOST_HID_MOUSE

+#if CFG_TUSB_HOST_HID_MOUSE

   if ( pipehandle_is_equal(pipe_hdl, mouseh_data[pipe_hdl.dev_addr-1].pipe_hdl) )

   {

     tuh_hid_mouse_isr(pipe_hdl.dev_addr, event);

@@ -271,14 +271,14 @@ void hidh_isr(pipe_handle_t pipe_hdl, tusb_event_t event, uint32_t xferred_bytes
   }

 #endif

 

-#if TUSB_CFG_HOST_HID_GENERIC

+#if CFG_TUSB_HOST_HID_GENERIC

 

 #endif

 }

 

 void hidh_close(uint8_t dev_addr)

 {

-#if TUSB_CFG_HOST_HID_KEYBOARD

+#if CFG_TUSB_HOST_HID_KEYBOARD

   if ( pipehandle_is_valid( keyboardh_data[dev_addr-1].pipe_hdl ) )

   {

     hidh_interface_close(&keyboardh_data[dev_addr-1]);

@@ -286,7 +286,7 @@ void hidh_close(uint8_t dev_addr)
   }

 #endif

 

-#if TUSB_CFG_HOST_HID_MOUSE

+#if CFG_TUSB_HOST_HID_MOUSE

   if( pipehandle_is_valid( mouseh_data[dev_addr-1].pipe_hdl ) )

   {

     hidh_interface_close(&mouseh_data[dev_addr-1]);

@@ -294,7 +294,7 @@ void hidh_close(uint8_t dev_addr)
   }

 #endif

 

-#if TUSB_CFG_HOST_HID_GENERIC

+#if CFG_TUSB_HOST_HID_GENERIC

   hidh_generic_close(dev_addr);

 #endif

 }

diff --git a/tinyusb/class/hid/hid_host.h b/tinyusb/class/hid/hid_host.h
index c52f4b6de..b93bcdccb 100644
--- a/tinyusb/class/hid/hid_host.h
+++ b/tinyusb/class/hid/hid_host.h
@@ -80,7 +80,7 @@ bool          tuh_hid_keyboard_is_busy(uint8_t dev_addr) ATTR_PURE ATTR_WARN_UNU
 

 /** \brief        Perform a get report from Keyboard interface

  * \param[in]		  dev_addr device address

- * \param[in,out] p_report address that is used to store data from device. Must be accessible by usb controller (see \ref TUSB_CFG_ATTR_USBRAM)

+ * \param[in,out] p_report address that is used to store data from device. Must be accessible by usb controller (see \ref CFG_TUSB_ATTR_USBRAM)

  * \returns       \ref tusb_error_t type to indicate success or error condition.

  * \retval        TUSB_ERROR_NONE on success

  * \retval        TUSB_ERROR_INTERFACE_IS_BUSY if the interface is already transferring data with device

@@ -145,7 +145,7 @@ bool          tuh_hid_mouse_is_busy(uint8_t dev_addr) ATTR_PURE ATTR_WARN_UNUSED
 

 /** \brief        Perform a get report from Mouse interface

  * \param[in]		  dev_addr device address

- * \param[in,out] p_report address that is used to store data from device. Must be accessible by usb controller (see \ref TUSB_CFG_ATTR_USBRAM)

+ * \param[in,out] p_report address that is used to store data from device. Must be accessible by usb controller (see \ref CFG_TUSB_ATTR_USBRAM)

  * \returns       \ref tusb_error_t type to indicate success or error condition.

  * \retval        TUSB_ERROR_NONE on success

  * \retval        TUSB_ERROR_INTERFACE_IS_BUSY if the interface is already transferring data with device

diff --git a/tinyusb/class/msc/msc_device.c b/tinyusb/class/msc/msc_device.c
index 3e9008a90..0d7fa4f71 100644
--- a/tinyusb/class/msc/msc_device.c
+++ b/tinyusb/class/msc/msc_device.c
@@ -38,7 +38,7 @@
 

 #include "tusb_option.h"

 

-#if (MODE_DEVICE_SUPPORTED && TUSB_CFG_DEVICE_MSC)

+#if (MODE_DEVICE_SUPPORTED && CFG_TUSB_DEVICE_MSC)

 

 #define _TINY_USB_SOURCE_FILE_

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

@@ -64,7 +64,7 @@ typedef struct {
   uint8_t scsi_data[64];

   ATTR_USB_MIN_ALIGNMENT msc_cbw_t  cbw;

 

-#if defined (__ICCARM__) && (TUSB_CFG_MCU == MCU_LPC11UXX || TUSB_CFG_MCU == MCU_LPC13UXX)

+#if defined (__ICCARM__) && (CFG_TUSB_MCU == MCU_LPC11UXX || CFG_TUSB_MCU == MCU_LPC13UXX)

   uint8_t padding1[64-sizeof(msc_cbw_t)]; // IAR cannot align struct's member

 #endif

 

@@ -79,7 +79,7 @@ typedef struct {
   uint16_t xferred_len; // numbered of bytes transferred so far in the Data Stage

 }mscd_interface_t;

 

-TUSB_CFG_ATTR_USBRAM ATTR_USB_MIN_ALIGNMENT STATIC_VAR mscd_interface_t mscd_data;

+CFG_TUSB_ATTR_USBRAM ATTR_USB_MIN_ALIGNMENT STATIC_VAR mscd_interface_t mscd_data;

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

 // INTERNAL OBJECT & FUNCTION DECLARATION

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

diff --git a/tinyusb/class/msc/msc_device.h b/tinyusb/class/msc/msc_device.h
index 8176e7ea6..1d7b11aec 100644
--- a/tinyusb/class/msc/msc_device.h
+++ b/tinyusb/class/msc/msc_device.h
@@ -64,7 +64,7 @@
  * \param[in]		rhport	    USB Controller ID

  * \param[in]		lun         Targeted Logical Unit

  * \param[out]	pp_buffer   Pointer to buffer which application need to update with the response data's address.

- *                          Must be accessible by USB controller (see \ref TUSB_CFG_ATTR_USBRAM)

+ *                          Must be accessible by USB controller (see \ref CFG_TUSB_ATTR_USBRAM)

  * \param[in]		lba         Starting Logical Block Address to be read

  * \param[in]		block_count Number of requested block

  * \retval      non-zero    Actual number of block that application processed, must be less than or equal to \a \b block_count.

@@ -82,7 +82,7 @@ uint16_t tud_msc_read10_cb (uint8_t rhport, uint8_t lun, void** pp_buffer, uint3
  * \param[in]		rhport	    USB Controller ID

  * \param[in]		lun         Targeted Logical Unit

  * \param[out]	pp_buffer   Pointer to buffer which application need to update with the address to hold data from host

- *                          Must be accessible by USB controller (see \ref TUSB_CFG_ATTR_USBRAM)

+ *                          Must be accessible by USB controller (see \ref CFG_TUSB_ATTR_USBRAM)

  * \param[in]		lba         Starting Logical Block Address to be write

  * \param[in]		block_count Number of requested block

  * \retval      non-zero    Actual number of block that application can receive and must be less than or equal to \a \b block_count.

diff --git a/tinyusb/class/msc/msc_host.c b/tinyusb/class/msc/msc_host.c
index c0b643076..dcdfa4d53 100644
--- a/tinyusb/class/msc/msc_host.c
+++ b/tinyusb/class/msc/msc_host.c
@@ -38,7 +38,7 @@
 

 #include "tusb_option.h"

 

-#if MODE_HOST_SUPPORTED & TUSB_CFG_HOST_MSC

+#if MODE_HOST_SUPPORTED & CFG_TUSB_HOST_MSC

 

 #define _TINY_USB_SOURCE_FILE_

 

@@ -51,13 +51,13 @@
 //--------------------------------------------------------------------+

 // MACRO CONSTANT TYPEDEF

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

-TUSB_CFG_ATTR_USBRAM STATIC_VAR msch_interface_t msch_data[TUSB_CFG_HOST_DEVICE_MAX];

+CFG_TUSB_ATTR_USBRAM STATIC_VAR msch_interface_t msch_data[CFG_TUSB_HOST_DEVICE_MAX];

 

 //------------- Initalization Data -------------//

 static osal_semaphore_t msch_sem_hdl;

 

 // buffer used to read scsi information when mounted, largest response data currently is inquiry

-TUSB_CFG_ATTR_USBRAM ATTR_ALIGNED(4) STATIC_VAR uint8_t msch_buffer[sizeof(scsi_inquiry_data_t)];

+CFG_TUSB_ATTR_USBRAM ATTR_ALIGNED(4) STATIC_VAR uint8_t msch_buffer[sizeof(scsi_inquiry_data_t)];

 

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

 // INTERNAL OBJECT & FUNCTION DECLARATION

@@ -288,7 +288,7 @@ tusb_error_t tuh_msc_write10(uint8_t dev_addr, uint8_t lun, void const * p_buffe
 //--------------------------------------------------------------------+

 void msch_init(void)

 {

-  memclr_(msch_data, sizeof(msch_interface_t)*TUSB_CFG_HOST_DEVICE_MAX);

+  memclr_(msch_data, sizeof(msch_interface_t)*CFG_TUSB_HOST_DEVICE_MAX);

   msch_sem_hdl = osal_semaphore_create(1, 0);

 }

 

diff --git a/tinyusb/class/msc/msc_host.h b/tinyusb/class/msc/msc_host.h
index 049db97ce..dce275fc8 100644
--- a/tinyusb/class/msc/msc_host.h
+++ b/tinyusb/class/msc/msc_host.h
@@ -104,7 +104,7 @@ tusb_error_t tuh_msc_get_capacity(uint8_t dev_addr, uint32_t* p_last_lba, uint32
 /** \brief 			Perform SCSI READ 10 command to read data from MassStorage device

  * \param[in]		dev_addr	device address

  * \param[in]		lun       Targeted Logical Unit

- * \param[out]	p_buffer  Buffer used to store data read from device. Must be accessible by USB controller (see \ref TUSB_CFG_ATTR_USBRAM)

+ * \param[out]	p_buffer  Buffer used to store data read from device. Must be accessible by USB controller (see \ref CFG_TUSB_ATTR_USBRAM)

  * \param[in]		lba       Starting Logical Block Address to be read

  * \param[in]		block_count Number of Block to be read

  * \retval      TUSB_ERROR_NONE on success

@@ -118,7 +118,7 @@ tusb_error_t tuh_msc_read10 (uint8_t dev_addr, uint8_t lun, void * p_buffer, uin
 /** \brief 			Perform SCSI WRITE 10 command to write data to MassStorage device

  * \param[in]		dev_addr	device address

  * \param[in]		lun       Targeted Logical Unit

- * \param[in]	  p_buffer  Buffer containing data. Must be accessible by USB controller (see \ref TUSB_CFG_ATTR_USBRAM)

+ * \param[in]	  p_buffer  Buffer containing data. Must be accessible by USB controller (see \ref CFG_TUSB_ATTR_USBRAM)

  * \param[in]		lba       Starting Logical Block Address to be written

  * \param[in]		block_count Number of Block to be written

  * \retval      TUSB_ERROR_NONE on success

@@ -132,7 +132,7 @@ tusb_error_t tuh_msc_write10(uint8_t dev_addr, uint8_t lun, void const * p_buffe
 /** \brief 			Perform SCSI REQUEST SENSE command, used to retrieve sense data from MassStorage device

  * \param[in]		dev_addr	device address

  * \param[in]		lun       Targeted Logical Unit

- * \param[in]	  p_data    Buffer to store response's data from device. Must be accessible by USB controller (see \ref TUSB_CFG_ATTR_USBRAM)

+ * \param[in]	  p_data    Buffer to store response's data from device. Must be accessible by USB controller (see \ref CFG_TUSB_ATTR_USBRAM)

  * \retval      TUSB_ERROR_NONE on success

  * \retval      TUSB_ERROR_INTERFACE_IS_BUSY if the interface is already transferring data with device

  * \retval      TUSB_ERROR_DEVICE_NOT_READY if device is not yet configured (by SET CONFIGURED request)