cannot get IAR work with lpc1769 device demo

7 files changed, 27 insertions, 21 deletions

diff --git a/demos/device/src/cdcd_app.c b/demos/device/src/cdcd_app.c
index 44e06ddf4..e4c004952 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;

 

-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;

+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];

 

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

 // INTERNAL OBJECT & FUNCTION DECLARATION

diff --git a/demos/device/src/keyboardd_app.c b/demos/device/src/keyboardd_app.c
index 5940b4c0d..9c0212435 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);

 

-ATTR_USB_MIN_ALIGNMENT hid_keyboard_report_t keyboard_report TUSB_CFG_ATTR_USBRAM;

+TUSB_CFG_ATTR_USBRAM ATTR_USB_MIN_ALIGNMENT 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 b70b235e1..2c19376bb 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);

 

-ATTR_USB_MIN_ALIGNMENT hid_mouse_report_t mouse_report TUSB_CFG_ATTR_USBRAM;

+TUSB_CFG_ATTR_USBRAM ATTR_USB_MIN_ALIGNMENT 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 fa125d769..c27639321 100644
--- a/demos/device/src/mscd_app.c
+++ b/demos/device/src/mscd_app.c
@@ -46,8 +46,8 @@
 //--------------------------------------------------------------------+

 // MACRO CONSTANT TYPEDEF

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

-ATTR_USB_MIN_ALIGNMENT

-static scsi_inquiry_data_t mscd_inquiry_data TUSB_CFG_ATTR_USBRAM =

+TUSB_CFG_ATTR_USBRAM ATTR_USB_MIN_ALIGNMENT

+static scsi_inquiry_data_t mscd_inquiry_data =

 {

     .is_removable         = 1,

     .version              = 2,

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

 };

 

-ATTR_USB_MIN_ALIGNMENT

-static scsi_read_capacity10_data_t mscd_read_capacity10_data TUSB_CFG_ATTR_USBRAM =

+TUSB_CFG_ATTR_USBRAM ATTR_USB_MIN_ALIGNMENT

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

 };

 

-ATTR_USB_MIN_ALIGNMENT

-scsi_sense_fixed_data_t mscd_sense_data TUSB_CFG_ATTR_USBRAM =

+TUSB_CFG_ATTR_USBRAM ATTR_USB_MIN_ALIGNMENT

+scsi_sense_fixed_data_t mscd_sense_data =

 {

     .response_code        = 0x70,

     .sense_key            = 0, // no errors

     .additional_sense_len = sizeof(scsi_sense_fixed_data_t) - 8

 };

 

-ATTR_USB_MIN_ALIGNMENT

-static scsi_read_format_capacity_data_t mscd_format_capacity_data TUSB_CFG_ATTR_USBRAM =

+TUSB_CFG_ATTR_USBRAM ATTR_USB_MIN_ALIGNMENT

+static scsi_read_format_capacity_data_t mscd_format_capacity_data =

 {

     .list_length     = 8,

     .block_num       = ENDIAN_BE(DISK_BLOCK_NUM), // write capacity

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

 };

 

-ATTR_USB_MIN_ALIGNMENT

-static scsi_mode_parameters_t msc_dev_mode_para TUSB_CFG_ATTR_USBRAM =

+TUSB_CFG_ATTR_USBRAM ATTR_USB_MIN_ALIGNMENT

+static scsi_mode_parameters_t msc_dev_mode_para =

 {

     .mode_data_length        = 3,

     .medium_type             = 0,

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

 // INTERNAL OBJECT & FUNCTION DECLARATION

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

-ATTR_USB_MIN_ALIGNMENT

-uint8_t mscd_app_ramdisk[DISK_BLOCK_NUM][DISK_BLOCK_SIZE] TUSB_CFG_ATTR_USBRAM =

+TUSB_CFG_ATTR_USBRAM ATTR_USB_MIN_ALIGNMENT

+uint8_t mscd_app_ramdisk[DISK_BLOCK_NUM][DISK_BLOCK_SIZE] =

 {

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

   // byte_per_sector    = DISK_BLOCK_SIZE; fat12_sector_num_16  = DISK_BLOCK_NUM;

diff --git a/demos/device/src/mscd_app_romdisk.c b/demos/device/src/mscd_app_romdisk.c
index 751800f02..c59b55858 100644
--- a/demos/device/src/mscd_app_romdisk.c
+++ b/demos/device/src/mscd_app_romdisk.c
@@ -91,8 +91,8 @@ const uint8_t mscd_app_rommdisk[DISK_BLOCK_NUM][DISK_BLOCK_SIZE] =
   [3] = README_CONTENTS

 };

 

-ATTR_USB_MIN_ALIGNMENT

-static uint8_t sector_buffer[DISK_BLOCK_SIZE] TUSB_CFG_ATTR_USBRAM;

+ATTR_USB_MIN_ALIGNMENT TUSB_CFG_ATTR_USBRAM

+static uint8_t sector_buffer[DISK_BLOCK_SIZE];

 

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

 // IMPLEMENTATION

diff --git a/demos/device/src/tusb_config.h b/demos/device/src/tusb_config.h
index 2f32abba7..25b37da72 100644
--- a/demos/device/src/tusb_config.h
+++ b/demos/device/src/tusb_config.h
@@ -99,8 +99,10 @@
 #define TUSB_CFG_OS_TICKS_PER_SECOND  1000

 

 #ifdef __CODE_RED // compiled with lpcxpresso

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

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

     #define TUSB_RAM_SECTION  ".data.$RAM2"

+  #elif

+    #define TUSB_CFG_MCU == MCU_LPC175X_6X // LPC17xx USB DMA can access all

   #elif  (TUSB_CFG_MCU == MCU_LPC43XX)

     #define TUSB_RAM_SECTION  ".data.$RAM3"

   #else

@@ -114,7 +116,7 @@
   #if (TUSB_CFG_MCU == MCU_LPC11UXX) || (TUSB_CFG_MCU == MCU_LPC13UXX)

     #define TUSB_CFG_ATTR_USBRAM   __attribute__ ((section("USBRAM_SECTION")))

   #elif  (TUSB_CFG_MCU == MCU_LPC43XX)

-    #define TUSB_CFG_ATTR_USBRAM

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

   #elif (TUSB_CFG_MCU == MCU_LPC175X_6X)

     #define TUSB_CFG_ATTR_USBRAM

   #else

@@ -123,7 +125,11 @@
 

 #elif __ICCARM__ // compiled with IAR

 

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

+  #if  (TUSB_CFG_MCU == MCU_LPC43XX)

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

+  #elif (TUSB_CFG_MCU == MCU_LPC175X_6X)

+    #define TUSB_CFG_ATTR_USBRAM

+  #endif

 

 #else