diff options
Diffstat (limited to 'demos/device/src')
| -rw-r--r-- | demos/device/src/cdcd_app.h | 2 | ||||
| -rw-r--r-- | demos/device/src/keyboardd_app.h | 2 | ||||
| -rw-r--r-- | demos/device/src/main.c | 2 | ||||
| -rw-r--r-- | demos/device/src/moused_app.h | 2 | ||||
| -rw-r--r-- | demos/device/src/mscd_app.h | 2 | ||||
| -rw-r--r-- | demos/device/src/tusb_config.h | 14 |
6 files changed, 9 insertions, 15 deletions
diff --git a/demos/device/src/cdcd_app.h b/demos/device/src/cdcd_app.h index 7c259ea1d..6f5df7b9d 100644 --- a/demos/device/src/cdcd_app.h +++ b/demos/device/src/cdcd_app.h @@ -46,7 +46,7 @@ #ifndef _TUSB_CDCD_APP_H_
#define _TUSB_CDCD_APP_H_
-#include "boards/board.h"
+#include "board.h"
#include "tusb.h"
#ifdef __cplusplus
diff --git a/demos/device/src/keyboardd_app.h b/demos/device/src/keyboardd_app.h index 78d1fa6d6..a6af1220b 100644 --- a/demos/device/src/keyboardd_app.h +++ b/demos/device/src/keyboardd_app.h @@ -46,7 +46,7 @@ #ifndef _TUSB_KEYBOARDD_APP_H_
#define _TUSB_KEYBOARDD_APP_H_
-#include "boards/board.h"
+#include "board.h"
#include "tusb.h"
#ifdef __cplusplus
diff --git a/demos/device/src/main.c b/demos/device/src/main.c index 914c97217..9e9be2a7d 100644 --- a/demos/device/src/main.c +++ b/demos/device/src/main.c @@ -43,7 +43,7 @@ #include <stdio.h>
#include <string.h>
-#include "boards/board.h"
+#include "board.h"
#include "tusb.h"
#include "mscd_app.h"
diff --git a/demos/device/src/moused_app.h b/demos/device/src/moused_app.h index 2b49d4373..9561680fe 100644 --- a/demos/device/src/moused_app.h +++ b/demos/device/src/moused_app.h @@ -46,7 +46,7 @@ #ifndef _TUSB_MOUSED_APP_H_
#define _TUSB_MOUSED_APP_H_
-#include "boards/board.h"
+#include "board.h"
#include "tusb.h"
#ifdef __cplusplus
diff --git a/demos/device/src/mscd_app.h b/demos/device/src/mscd_app.h index f9f1d20bc..203e05d2d 100644 --- a/demos/device/src/mscd_app.h +++ b/demos/device/src/mscd_app.h @@ -46,7 +46,7 @@ #ifndef _TUSB_MSCD_APP_H_
#define _TUSB_MSCD_APP_H_
-#include "boards/board.h"
+#include "board.h"
#include "tusb.h"
#ifdef __cplusplus
diff --git a/demos/device/src/tusb_config.h b/demos/device/src/tusb_config.h index 4bba991bf..e9124e1d8 100644 --- a/demos/device/src/tusb_config.h +++ b/demos/device/src/tusb_config.h @@ -88,27 +88,21 @@ //--------------------------------------------------------------------+
#ifdef __CODE_RED // compiled with lpcxpresso
#if (TUSB_CFG_MCU == MCU_LPC11UXX) || (TUSB_CFG_MCU == MCU_LPC13UXX)
- #define TUSB_RAM_SECTION ".data.$RAM2"
+ #define TUSB_CFG_ATTR_USBRAM ATTR_SECTION(.data.$RAM2)
#elif TUSB_CFG_MCU == MCU_LPC175X_6X
- #define TUSB_RAM_SECTION // LPC17xx USB DMA can access all
+ #define TUSB_CFG_ATTR_USBRAM // LPC17xx USB DMA can access all
#elif (TUSB_CFG_MCU == MCU_LPC43XX)
- #define TUSB_RAM_SECTION ".data.$RAM3"
- #else
- #error Please define USB RAM section
+ #define TUSB_CFG_ATTR_USBRAM ATTR_SECTION(.data.$RAM3)
#endif
- #define TUSB_CFG_ATTR_USBRAM __attribute__ ((section(TUSB_RAM_SECTION)))
-
#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 __attribute__ ((section("USBRAM_SECTION"))) // TODO Keil linker file
+ #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
#elif (TUSB_CFG_MCU == MCU_LPC175X_6X)
#define TUSB_CFG_ATTR_USBRAM
- #else
- #error Please define USB RAM section
#endif
#elif defined __ICCARM__ // compiled with IAR
|