clean up STATIC_VAR

4 files changed, 4 insertions, 6 deletions

diff --git a/tinyusb/class/cdc_device.c b/tinyusb/class/cdc_device.c
index 0d3120061..2c90bfc4b 100644
--- a/tinyusb/class/cdc_device.c
+++ b/tinyusb/class/cdc_device.c
@@ -50,8 +50,7 @@
 //--------------------------------------------------------------------+

 // MACRO CONSTANT TYPEDEF

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

-TUSB_CFG_ATTR_USBRAM

-static cdc_line_coding_t cdcd_line_coding[CONTROLLER_DEVICE_NUMBER];

+TUSB_CFG_ATTR_USBRAM STATIC_VAR cdc_line_coding_t cdcd_line_coding[CONTROLLER_DEVICE_NUMBER];

 

 typedef struct {

   uint8_t interface_number;

@@ -63,7 +62,7 @@ typedef struct {
 //--------------------------------------------------------------------+

 // INTERNAL OBJECT & FUNCTION DECLARATION

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

-cdcd_data_t cdcd_data[CONTROLLER_DEVICE_NUMBER];

+STATIC_VAR cdcd_data_t cdcd_data[CONTROLLER_DEVICE_NUMBER];

 

 static tusb_error_t cdcd_xfer(uint8_t coreid,  cdc_pipeid_t pipeid, void * p_buffer, uint32_t length, bool is_notify)

 {

diff --git a/tinyusb/class/cdc_host.c b/tinyusb/class/cdc_host.c
index 679b3752f..0227e5e95 100644
--- a/tinyusb/class/cdc_host.c
+++ b/tinyusb/class/cdc_host.c
@@ -55,7 +55,7 @@
 //--------------------------------------------------------------------+

 // INTERNAL OBJECT & FUNCTION DECLARATION

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

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

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

 

 static inline cdc_pipeid_t get_app_pipeid(pipe_handle_t pipe_hdl) ATTR_PURE  ATTR_ALWAYS_INLINE;

 static inline cdc_pipeid_t get_app_pipeid(pipe_handle_t pipe_hdl)

diff --git a/tinyusb/class/hid_device.c b/tinyusb/class/hid_device.c
index 7e2454d31..540e01dbe 100644
--- a/tinyusb/class/hid_device.c
+++ b/tinyusb/class/hid_device.c
@@ -105,7 +105,7 @@ static hidd_class_driver_t const hidd_class_driver[HIDD_NUMBER_OF_SUBCLASS] =
 };

 

 // internal buffer for transferring data

-TUSB_CFG_ATTR_USBRAM static uint8_t m_hid_buffer[ HIDD_BUFFER_SIZE ];

+TUSB_CFG_ATTR_USBRAM STATIC_VAR uint8_t m_hid_buffer[ HIDD_BUFFER_SIZE ];

 

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

 // KEYBOARD APPLICATION API

diff --git a/tinyusb/class/msc_host.c b/tinyusb/class/msc_host.c
index 4983a95f4..e3eaf7993 100644
--- a/tinyusb/class/msc_host.c
+++ b/tinyusb/class/msc_host.c
@@ -53,7 +53,6 @@
 //--------------------------------------------------------------------+

 TUSB_CFG_ATTR_USBRAM STATIC_VAR msch_interface_t msch_data[TUSB_CFG_HOST_DEVICE_MAX];

 

-

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

 OSAL_SEM_DEF(msch_semaphore);

 static osal_semaphore_handle_t msch_sem_hdl;