clean ATTR_USB_MIN_ALIGNMENT on application and most of device except the msc_device.c

8 files changed, 31 insertions, 31 deletions

diff --git a/demos/device/src/cdcd_app.c b/demos/device/src/cdcd_app.c
index e29590a2c..90b38e21d 100644
--- a/demos/device/src/cdcd_app.c
+++ b/demos/device/src/cdcd_app.c
@@ -57,8 +57,8 @@ OSAL_SEM_DEF(cdcd_semaphore);
 

 static osal_semaphore_handle_t sem_hdl;

 

-TUSB_CFG_ATTR_USBRAM ATTR_USB_MIN_ALIGNMENT static uint8_t serial_rx_buffer[CDCD_APP_BUFFER_SIZE];

-TUSB_CFG_ATTR_USBRAM ATTR_USB_MIN_ALIGNMENT static uint8_t serial_tx_buffer[CDCD_APP_BUFFER_SIZE];

+TUSB_CFG_ATTR_USBRAM static uint8_t serial_rx_buffer[CDCD_APP_BUFFER_SIZE];

+TUSB_CFG_ATTR_USBRAM static uint8_t serial_tx_buffer[CDCD_APP_BUFFER_SIZE];

 

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

 // INTERNAL OBJECT & FUNCTION DECLARATION

diff --git a/demos/device/src/keyboardd_app.c b/demos/device/src/keyboardd_app.c
index 3b1819da7..0fa73aa59 100644
--- a/demos/device/src/keyboardd_app.c
+++ b/demos/device/src/keyboardd_app.c
@@ -52,7 +52,7 @@
 //--------------------------------------------------------------------+

 OSAL_TASK_DEF(keyboardd_app_task, 128, KEYBOARDD_APP_TASK_PRIO);

 

-TUSB_CFG_ATTR_USBRAM ATTR_USB_MIN_ALIGNMENT hid_keyboard_report_t keyboard_report;

+TUSB_CFG_ATTR_USBRAM hid_keyboard_report_t keyboard_report;

 

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

 // tinyusb Callbacks

diff --git a/demos/device/src/moused_app.c b/demos/device/src/moused_app.c
index 6aed296c2..e123e1bb8 100644
--- a/demos/device/src/moused_app.c
+++ b/demos/device/src/moused_app.c
@@ -52,7 +52,7 @@
 //--------------------------------------------------------------------+

 OSAL_TASK_DEF(moused_app_task, 128, MOUSED_APP_TASK_PRIO);

 

-TUSB_CFG_ATTR_USBRAM ATTR_USB_MIN_ALIGNMENT hid_mouse_report_t mouse_report;

+TUSB_CFG_ATTR_USBRAM hid_mouse_report_t mouse_report;

 

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

 // tinyusb Callbacks

diff --git a/demos/device/src/mscd_app.c b/demos/device/src/mscd_app.c
index c27639321..316cb18f4 100644
--- a/demos/device/src/mscd_app.c
+++ b/demos/device/src/mscd_app.c
@@ -46,7 +46,7 @@
 //--------------------------------------------------------------------+

 // MACRO CONSTANT TYPEDEF

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

-TUSB_CFG_ATTR_USBRAM ATTR_USB_MIN_ALIGNMENT

+TUSB_CFG_ATTR_USBRAM

 static scsi_inquiry_data_t mscd_inquiry_data =

 {

     .is_removable         = 1,

@@ -57,14 +57,14 @@ static scsi_inquiry_data_t mscd_inquiry_data =
     .product_revision     = "0.01"

 };

 

-TUSB_CFG_ATTR_USBRAM ATTR_USB_MIN_ALIGNMENT

+TUSB_CFG_ATTR_USBRAM

 static scsi_read_capacity10_data_t mscd_read_capacity10_data =

 {

     .last_lba   = ENDIAN_BE(DISK_BLOCK_NUM-1), // read capacity

     .block_size = ENDIAN_BE(DISK_BLOCK_SIZE)

 };

 

-TUSB_CFG_ATTR_USBRAM ATTR_USB_MIN_ALIGNMENT

+TUSB_CFG_ATTR_USBRAM

 scsi_sense_fixed_data_t mscd_sense_data =

 {

     .response_code        = 0x70,

@@ -72,7 +72,7 @@ scsi_sense_fixed_data_t mscd_sense_data =
     .additional_sense_len = sizeof(scsi_sense_fixed_data_t) - 8

 };

 

-TUSB_CFG_ATTR_USBRAM ATTR_USB_MIN_ALIGNMENT

+TUSB_CFG_ATTR_USBRAM

 static scsi_read_format_capacity_data_t mscd_format_capacity_data =

 {

     .list_length     = 8,

@@ -81,7 +81,7 @@ static scsi_read_format_capacity_data_t mscd_format_capacity_data =
     .block_size_u16  = ENDIAN_BE16(DISK_BLOCK_SIZE)

 };

 

-TUSB_CFG_ATTR_USBRAM ATTR_USB_MIN_ALIGNMENT

+TUSB_CFG_ATTR_USBRAM

 static scsi_mode_parameters_t msc_dev_mode_para =

 {

     .mode_data_length        = 3,

diff --git a/demos/device/src/mscd_app_ramdisk.c b/demos/device/src/mscd_app_ramdisk.c
index 36f9beedf..b4fde39cd 100644
--- a/demos/device/src/mscd_app_ramdisk.c
+++ b/demos/device/src/mscd_app_ramdisk.c
@@ -47,7 +47,7 @@
 //--------------------------------------------------------------------+

 // INTERNAL OBJECT & FUNCTION DECLARATION

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

-TUSB_CFG_ATTR_USBRAM ATTR_USB_MIN_ALIGNMENT

+TUSB_CFG_ATTR_USBRAM

 uint8_t mscd_app_ramdisk[DISK_BLOCK_NUM][DISK_BLOCK_SIZE] =

 {

   //------------- Boot Sector -------------//

diff --git a/demos/device/src/mscd_app_romdisk.c b/demos/device/src/mscd_app_romdisk.c
index 6001bb900..a4a22a6bf 100644
--- a/demos/device/src/mscd_app_romdisk.c
+++ b/demos/device/src/mscd_app_romdisk.c
@@ -91,7 +91,7 @@ const uint8_t mscd_app_rommdisk[DISK_BLOCK_NUM][DISK_BLOCK_SIZE] =
   [3] = README_CONTENTS

 };

 

-ATTR_USB_MIN_ALIGNMENT TUSB_CFG_ATTR_USBRAM

+TUSB_CFG_ATTR_USBRAM

 static uint8_t sector_buffer[DISK_BLOCK_SIZE];

 

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

diff --git a/demos/device/src/tusb_config.h b/demos/device/src/tusb_config.h
index 295e3d69a..63399b1c9 100644
--- a/demos/device/src/tusb_config.h
+++ b/demos/device/src/tusb_config.h
@@ -59,11 +59,11 @@
 #define TUSB_CFG_DEVICE_FULLSPEED               1 // TODO refractor, remove

 

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

-#define TUSB_CFG_DEVICE_HID_KEYBOARD            1

+#define TUSB_CFG_DEVICE_HID_KEYBOARD            0

 #define TUSB_CFG_DEVICE_HID_MOUSE               1

 #define TUSB_CFG_DEVICE_HID_GENERIC             0 // not supported yet

-#define TUSB_CFG_DEVICE_MSC                     0

-#define TUSB_CFG_DEVICE_CDC                     1

+#define TUSB_CFG_DEVICE_MSC                     1

+#define TUSB_CFG_DEVICE_CDC                     0

 

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

 // COMMON CONFIGURATION

@@ -80,7 +80,7 @@
 #ifdef __CODE_RED // compiled with lpcxpresso

 

   #if (TUSB_CFG_MCU == MCU_LPC11UXX) || (TUSB_CFG_MCU == MCU_LPC13UXX)

-    #define TUSB_CFG_ATTR_USBRAM  ATTR_SECTION(.data.$RAM2)

+    #define TUSB_CFG_ATTR_USBRAM  ATTR_SECTION(.data.$RAM2) ATTR_ALIGNED(64) // lp11u & lp13u requires data to be 64 byte aligned

   #elif TUSB_CFG_MCU == MCU_LPC175X_6X

     #define TUSB_CFG_ATTR_USBRAM // LPC17xx USB DMA can access all

   #elif  (TUSB_CFG_MCU == MCU_LPC43XX)

@@ -90,21 +90,21 @@
 #elif defined  __CC_ARM // Compiled with Keil armcc, USBRAM_SECTION is defined in scatter files

 

   #if (TUSB_CFG_MCU == MCU_LPC11UXX) || (TUSB_CFG_MCU == MCU_LPC13UXX)

-    #define TUSB_CFG_ATTR_USBRAM  ATTR_SECTION(USBRAM_SECTION)

-  #elif  (TUSB_CFG_MCU == MCU_LPC43XX)

-    #define TUSB_CFG_ATTR_USBRAM // Use keil tool configure to have AHB SRAM as default memory

+    #define TUSB_CFG_ATTR_USBRAM  ATTR_SECTION(USBRAM_SECTION) ATTR_ALIGNED(64) // lp11u & lp13u requires data to be 64 byte aligned

   #elif (TUSB_CFG_MCU == MCU_LPC175X_6X)

     #define TUSB_CFG_ATTR_USBRAM

+  #elif  (TUSB_CFG_MCU == MCU_LPC43XX)

+    #define TUSB_CFG_ATTR_USBRAM // Use keil tool configure to have AHB SRAM as default memory

   #endif

 

 #elif defined __ICCARM__ // compiled with IAR

 

-  #if  (TUSB_CFG_MCU == MCU_LPC43XX)

-    #define TUSB_CFG_ATTR_USBRAM _Pragma("location=\".ahb_sram1\"")

+  #if (TUSB_CFG_MCU == MCU_LPC11UXX) || (TUSB_CFG_MCU == MCU_LPC13UXX)

+    #define TUSB_CFG_ATTR_USBRAM _Pragma("location=\"USB_PACKET_MEMORY\"") ATTR_ALIGNED(64)

   #elif (TUSB_CFG_MCU == MCU_LPC175X_6X)

     #define TUSB_CFG_ATTR_USBRAM

-  #elif (TUSB_CFG_MCU == MCU_LPC11UXX) || (TUSB_CFG_MCU == MCU_LPC13UXX)

-    #define TUSB_CFG_ATTR_USBRAM _Pragma("location=\"USB_PACKET_MEMORY\"")

+  #elif  (TUSB_CFG_MCU == MCU_LPC43XX)

+    #define TUSB_CFG_ATTR_USBRAM _Pragma("location=\".ahb_sram1\"")

   #endif

 

 #else

diff --git a/demos/device/src/tusb_descriptors.c b/demos/device/src/tusb_descriptors.c
index 4ab5b0110..5e8c0ad07 100644
--- a/demos/device/src/tusb_descriptors.c
+++ b/demos/device/src/tusb_descriptors.c
@@ -42,7 +42,7 @@
 // Keyboard Report Descriptor

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

 #if TUSB_CFG_DEVICE_HID_KEYBOARD

-ATTR_USB_MIN_ALIGNMENT TUSB_CFG_ATTR_USBRAM

+TUSB_CFG_ATTR_USBRAM

 uint8_t desc_keyboard_report[] = {

   HID_USAGE_PAGE ( HID_USAGE_PAGE_DESKTOP     ),

   HID_USAGE      ( HID_USAGE_DESKTOP_KEYBOARD ),

@@ -89,7 +89,7 @@ uint8_t desc_keyboard_report[] = {
 // Mouse Report Descriptor

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

 #if TUSB_CFG_DEVICE_HID_MOUSE

-ATTR_USB_MIN_ALIGNMENT TUSB_CFG_ATTR_USBRAM

+TUSB_CFG_ATTR_USBRAM

 uint8_t desc_mouse_report[] = {

   HID_USAGE_PAGE ( HID_USAGE_PAGE_DESKTOP     ),

   HID_USAGE      ( HID_USAGE_DESKTOP_MOUSE    ),

@@ -137,7 +137,7 @@ uint8_t desc_mouse_report[] = {
 //--------------------------------------------------------------------+

 // USB DEVICE DESCRIPTOR

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

-ATTR_USB_MIN_ALIGNMENT TUSB_CFG_ATTR_USBRAM

+TUSB_CFG_ATTR_USBRAM

 tusb_descriptor_device_t desc_device =

 {

     .bLength            = sizeof(tusb_descriptor_device_t),

@@ -171,7 +171,7 @@ tusb_descriptor_device_t desc_device =
 //--------------------------------------------------------------------+

 // USB COFNIGURATION DESCRIPTOR

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

-ATTR_USB_MIN_ALIGNMENT TUSB_CFG_ATTR_USBRAM

+TUSB_CFG_ATTR_USBRAM

 app_descriptor_configuration_t desc_configuration =

 {

     .configuration =

@@ -410,28 +410,28 @@ app_descriptor_configuration_t desc_configuration =
 #define STRING_LEN_UNICODE(n) (2 + (2*(n))) // also includes 2 byte header

 #define ENDIAN_BE16_FROM( high, low) ENDIAN_BE16(high << 8 | low)

 

-ATTR_USB_MIN_ALIGNMENT TUSB_CFG_ATTR_USBRAM

+TUSB_CFG_ATTR_USBRAM

 uint16_t desc_string_language[] =

 {

     ENDIAN_BE16_FROM( STRING_LEN_UNICODE(1), TUSB_DESC_TYPE_STRING ),

     0x0409

 };

 

-ATTR_USB_MIN_ALIGNMENT TUSB_CFG_ATTR_USBRAM

+TUSB_CFG_ATTR_USBRAM

 uint16_t desc_string_manufacturer[] =

 {

     ENDIAN_BE16_FROM( STRING_LEN_UNICODE(11), TUSB_DESC_TYPE_STRING),

     't', 'i', 'n', 'y', 'u', 's', 'b', '.', 'o', 'r', 'g' // len = 11

 };

 

-ATTR_USB_MIN_ALIGNMENT TUSB_CFG_ATTR_USBRAM

+TUSB_CFG_ATTR_USBRAM

 uint16_t desc_string_product[] =

 {

     ENDIAN_BE16_FROM( STRING_LEN_UNICODE(14), TUSB_DESC_TYPE_STRING),

     't', 'i', 'n', 'y', 'u', 's', 'b', ' ', 'D', 'e', 'v', 'i', 'c', 'e' // len = 14

 };

 

-ATTR_USB_MIN_ALIGNMENT TUSB_CFG_ATTR_USBRAM

+TUSB_CFG_ATTR_USBRAM

 uint16_t desc_string_serial[] =

 {

     ENDIAN_BE16_FROM( STRING_LEN_UNICODE(4), TUSB_DESC_TYPE_STRING),

@@ -457,7 +457,7 @@ tusbd_descriptor_pointer_t tusbd_descriptor_pointers =
     .p_hid_keyboard_report = desc_keyboard_report,

     #endif

 

-    #if TUSB_CFG_DEVICE_HID_KEYBOARD

+    #if TUSB_CFG_DEVICE_HID_MOUSE

     .p_hid_mouse_report    = desc_mouse_report,

     #endif

 };