diff options
| author | hathach <[email protected]> | 2013-11-25 12:48:27 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2013-11-25 12:48:27 +0700 |
| commit | a5ba28355782eedb967c4ec41a5b83323118251d (patch) | |
| tree | 4f4fa0bfa3ba3fb8d781690fb3649ae834541ee0 | |
| parent | 41ffcaf4a508a421a49d8650777d8b0325b28921 (diff) | |
change MCU to TUSB_CFG_MCU
27 files changed, 84 insertions, 115 deletions
diff --git a/demos/device/device_os_none/.cproject b/demos/device/device_os_none/.cproject index 60f11e8d3..06786a060 100644 --- a/demos/device/device_os_none/.cproject +++ b/demos/device/device_os_none/.cproject @@ -34,7 +34,7 @@ <option id="com.crt.advproject.gcc.thumb.697143257" name="Thumb mode" superClass="com.crt.advproject.gcc.thumb" value="true" valueType="boolean"/>
<option id="gnu.c.compiler.option.preprocessor.def.symbols.371325215" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols" valueType="definedSymbols">
<listOptionValue builtIn="false" value="__REDLIB__"/>
- <listOptionValue builtIn="false" value="MCU=MCU_LPC13UXX"/>
+ <listOptionValue builtIn="false" value="TUSB_CFG_MCU=MCU_LPC13UXX"/>
<listOptionValue builtIn="false" value="BOARD=BOARD_LPCXPRESSO1347"/>
<listOptionValue builtIn="false" value="DEBUG"/>
<listOptionValue builtIn="false" value="__CODE_RED"/>
@@ -125,7 +125,7 @@ <option id="gnu.c.compiler.option.preprocessor.def.symbols.690334585" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols" valueType="definedSymbols">
<listOptionValue builtIn="false" value="__REDLIB__"/>
<listOptionValue builtIn="false" value="__USE_CMSIS"/>
- <listOptionValue builtIn="false" value="MCU=MCU_LPC11UXX"/>
+ <listOptionValue builtIn="false" value="TUSB_CFG_MCU=MCU_LPC11UXX"/>
<listOptionValue builtIn="false" value="BOARD=BOARD_RF1GHZNODE"/>
<listOptionValue builtIn="false" value="DEBUG"/>
<listOptionValue builtIn="false" value="__CODE_RED"/>
@@ -215,7 +215,7 @@ <listOptionValue builtIn="false" value="__REDLIB__"/>
<listOptionValue builtIn="false" value="__USE_CMSIS"/>
<listOptionValue builtIn="false" value="CORE_M4"/>
- <listOptionValue builtIn="false" value="MCU=MCU_LPC43XX"/>
+ <listOptionValue builtIn="false" value="TUSB_CFG_MCU=MCU_LPC43XX"/>
<listOptionValue builtIn="false" value="BOARD=BOARD_EA4357"/>
<listOptionValue builtIn="false" value="DEBUG"/>
<listOptionValue builtIn="false" value="__CODE_RED"/>
@@ -307,7 +307,7 @@ <option id="com.crt.advproject.gcc.thumb.530159727" name="Thumb mode" superClass="com.crt.advproject.gcc.thumb" value="true" valueType="boolean"/>
<option id="gnu.c.compiler.option.preprocessor.def.symbols.216849614" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols" valueType="definedSymbols">
<listOptionValue builtIn="false" value="__REDLIB__"/>
- <listOptionValue builtIn="false" value="MCU=MCU_LPC175X_6X"/>
+ <listOptionValue builtIn="false" value="TUSB_CFG_MCU=MCU_LPC175X_6X"/>
<listOptionValue builtIn="false" value="BOARD=BOARD_LPCXPRESSO1769"/>
<listOptionValue builtIn="false" value="DEBUG"/>
<listOptionValue builtIn="false" value="__CODE_RED"/>
@@ -372,82 +372,49 @@ <storageModule moduleId="com.crt.config">
<projectStorage><?xml version="1.0" encoding="UTF-8"?>
<TargetConfig>
-<Properties property_0="" property_2="LPC18x7_43x7_2x512_BootA.cfx" property_3="NXP" property_4="LPC4357" property_count="5" version="1"/>
-<infoList vendor="NXP"><info chip="LPC4357" flash_driver="LPC18x7_43x7_2x512_BootA.cfx" match_id="0x0" name="LPC4357" stub="crt_emu_lpc18_43_nxp"><chip><name>LPC4357</name>
-<family>LPC43xx</family>
+<Properties property_0="" property_3="NXP" property_4="LPC1347" property_count="5" version="1"/>
+<infoList vendor="NXP"><info chip="LPC1347" match_id="0x08020543" name="LPC1347" stub="crt_emu_lpc11_13_nxp"><chip><name>LPC1347</name>
+<family>LPC13xx (12bit ADC)</family>
<vendor>NXP (formerly Philips)</vendor>
<reset board="None" core="Real" sys="Real"/>
-<clock changeable="TRUE" freq="20MHz" is_accurate="TRUE"/>
+<clock changeable="TRUE" freq="12MHz" is_accurate="TRUE"/>
<memory can_program="true" id="Flash" is_ro="true" type="Flash"/>
<memory id="RAM" type="RAM"/>
<memory id="Periph" is_volatile="true" type="Peripheral"/>
-<memoryInstance derived_from="Flash" id="MFlashA512" location="0x1a000000" size="0x80000"/>
-<memoryInstance derived_from="Flash" id="MFlashB512" location="0x1b000000" size="0x80000"/>
-<memoryInstance derived_from="RAM" id="RamLoc32" location="0x10000000" size="0x8000"/>
-<memoryInstance derived_from="RAM" id="RamLoc40" location="0x10080000" size="0xa000"/>
-<memoryInstance derived_from="RAM" id="RamAHB32" location="0x20000000" size="0x8000"/>
-<memoryInstance derived_from="RAM" id="RamAHB16" location="0x20008000" size="0x4000"/>
-<memoryInstance derived_from="RAM" id="RamAHB_ETB16" location="0x2000c000" size="0x4000"/>
-<prog_flash blocksz="0x2000" location="0x1a000000" maxprgbuff="0x400" progwithcode="TRUE" size="0x10000"/>
-<prog_flash blocksz="0x10000" location="0x1a010000" maxprgbuff="0x400" progwithcode="TRUE" size="0x70000"/>
-<prog_flash blocksz="0x2000" location="0x1b000000" maxprgbuff="0x400" progwithcode="TRUE" size="0x10000"/>
-<prog_flash blocksz="0x10000" location="0x1b010000" maxprgbuff="0x400" progwithcode="TRUE" size="0x70000"/>
+<memoryInstance derived_from="Flash" id="MFlash64" location="0x0" size="0x10000"/>
+<memoryInstance derived_from="RAM" id="RamLoc8" location="0x10000000" size="0x2000"/>
+<memoryInstance derived_from="RAM" id="RamUsb2" location="0x20004000" size="0x800"/>
+<memoryInstance derived_from="RAM" id="RamPeriph2" location="0x20000000" size="0x800"/>
+<prog_flash blocksz="0x1000" location="0x0" maxprgbuff="0x400" progwithcode="TRUE" size="0x10000"/>
<peripheralInstance derived_from="V7M_MPU" id="MPU" location="0xe000ed90"/>
<peripheralInstance derived_from="V7M_NVIC" id="NVIC" location="0xe000e000"/>
<peripheralInstance derived_from="V7M_DCR" id="DCR" location="0xe000edf0"/>
<peripheralInstance derived_from="V7M_ITM" id="ITM" location="0xe0000000"/>
-<peripheralInstance derived_from="SCT" id="SCT" location="0x40000000"/>
-<peripheralInstance derived_from="GPDMA" id="GPDMA" location="0x40002000"/>
-<peripheralInstance derived_from="SDMMC" id="SDMMC" location="0x40004000"/>
-<peripheralInstance derived_from="EMC" id="EMC" location="0x40005000"/>
-<peripheralInstance derived_from="USB0" id="USB0" location="0x40006000"/>
-<peripheralInstance derived_from="USB1" id="USB1" location="0x40007000"/>
-<peripheralInstance derived_from="LCD" id="LCD" location="0x40008000"/>
-<peripheralInstance derived_from="ETHERNET" id="ETHERNET" location="0x40010000"/>
-<peripheralInstance derived_from="ATIMER" id="ATIMER" location="0x40040000"/>
-<peripheralInstance derived_from="REGFILE" id="REGFILE" location="0x40041000"/>
-<peripheralInstance derived_from="PMC" id="PMC" location="0x40042000"/>
-<peripheralInstance derived_from="CREG" id="CREG" location="0x40043000"/>
-<peripheralInstance derived_from="EVENTROUTER" id="EVENTROUTER" location="0x40044000"/>
-<peripheralInstance derived_from="RTC" id="RTC" location="0x40046000"/>
-<peripheralInstance derived_from="CGU" id="CGU" location="0x40050000"/>
-<peripheralInstance derived_from="CCU1" id="CCU1" location="0x40051000"/>
-<peripheralInstance derived_from="CCU2" id="CCU2" location="0x40052000"/>
-<peripheralInstance derived_from="RGU" id="RGU" location="0x40053000"/>
-<peripheralInstance derived_from="WWDT" id="WWDT" location="0x40080000"/>
-<peripheralInstance derived_from="USART0" id="USART0" location="0x40081000"/>
-<peripheralInstance derived_from="USART2" id="USART2" location="0x400c1000"/>
-<peripheralInstance derived_from="USART3" id="USART3" location="0x400c2000"/>
-<peripheralInstance derived_from="UART1" id="UART1" location="0x40082000"/>
-<peripheralInstance derived_from="SSP0" id="SSP0" location="0x40083000"/>
-<peripheralInstance derived_from="SSP1" id="SSP1" location="0x400c5000"/>
-<peripheralInstance derived_from="TIMER0" id="TIMER0" location="0x40084000"/>
-<peripheralInstance derived_from="TIMER1" id="TIMER1" location="0x40085000"/>
-<peripheralInstance derived_from="TIMER2" id="TIMER2" location="0x400c3000"/>
-<peripheralInstance derived_from="TIMER3" id="TIMER3" location="0x400c4000"/>
-<peripheralInstance derived_from="SCU" id="SCU" location="0x40086000"/>
-<peripheralInstance derived_from="GPIO-PIN-INT" id="GPIO-PIN-INT" location="0x40087000"/>
-<peripheralInstance derived_from="GPIO-GROUP-INT0" id="GPIO-GROUP-INT0" location="0x40088000"/>
-<peripheralInstance derived_from="GPIO-GROUP-INT1" id="GPIO-GROUP-INT1" location="0x40089000"/>
-<peripheralInstance derived_from="MCPWM" id="MCPWM" location="0x400a0000"/>
-<peripheralInstance derived_from="I2C0" id="I2C0" location="0x400a1000"/>
-<peripheralInstance derived_from="I2C1" id="I2C1" location="0x400e0000"/>
-<peripheralInstance derived_from="I2S0" id="I2S0" location="0x400a2000"/>
-<peripheralInstance derived_from="I2S1" id="I2S1" location="0x400a3000"/>
-<peripheralInstance derived_from="C-CAN1" id="C-CAN1" location="0x400a4000"/>
-<peripheralInstance derived_from="RITIMER" id="RITIMER" location="0x400c0000"/>
-<peripheralInstance derived_from="QEI" id="QEI" location="0x400c6000"/>
-<peripheralInstance derived_from="GIMA" id="GIMA" location="0x400c7000"/>
-<peripheralInstance derived_from="DAC" id="DAC" location="0x400e1000"/>
-<peripheralInstance derived_from="C-CAN0" id="C-CAN0" location="0x400e2000"/>
-<peripheralInstance derived_from="ADC0" id="ADC0" location="0x400e3000"/>
-<peripheralInstance derived_from="ADC1" id="ADC1" location="0x400e4000"/>
-<peripheralInstance derived_from="GPIO-PORT" id="GPIO-PORT" location="0x400f4000"/>
+<peripheralInstance derived_from="I2C" id="I2C" location="0x40000000"/>
+<peripheralInstance derived_from="WWDT" id="WWDT" location="0x40004000"/>
+<peripheralInstance derived_from="USART" id="USART" location="0x40008000"/>
+<peripheralInstance derived_from="CT16B0" id="CT16B0" location="0x4000c000"/>
+<peripheralInstance derived_from="CT16B1" id="CT16B1" location="0x40010000"/>
+<peripheralInstance derived_from="CT32B0" id="CT32B0" location="0x40014000"/>
+<peripheralInstance derived_from="CT32B1" id="CT32B1" location="0x40018000"/>
+<peripheralInstance derived_from="ADC" id="ADC" location="0x4001c000"/>
+<peripheralInstance derived_from="PMU" id="PMU" location="0x40038000"/>
+<peripheralInstance derived_from="FLASHCTRL" id="FLASHCTRL" location="0x4003c000"/>
+<peripheralInstance derived_from="SSP0" id="SSP0" location="0x40040000"/>
+<peripheralInstance derived_from="IOCON" id="IOCON" location="0x40044000"/>
+<peripheralInstance derived_from="SYSCON" id="SYSCON" location="0x40048000"/>
+<peripheralInstance derived_from="GPIO-PIN-INT" id="GPIO-PIN-INT" location="0x4004c000"/>
+<peripheralInstance derived_from="SSP1" id="SSP1" location="0x40058000"/>
+<peripheralInstance derived_from="GPIO-GROUP-INT0" id="GPIO-GROUP-INT0" location="0x4005c000"/>
+<peripheralInstance derived_from="GPIO-GROUP-INT1" id="GPIO-GROUP-INT1" location="0x40060000"/>
+<peripheralInstance derived_from="RITIMER" id="RITIMER" location="0x40064000"/>
+<peripheralInstance derived_from="USB" id="USB" location="0x40080000"/>
+<peripheralInstance derived_from="GPIO-PORT" id="GPIO-PORT" location="0x50000000"/>
</chip>
-<processor><name gcc_name="cortex-m4">Cortex-M4</name>
+<processor><name gcc_name="cortex-m3">Cortex-M3</name>
<family>Cortex-M</family>
</processor>
-<link href="nxp_lpc43xx_peripheral.xme" show="embed" type="simple"/>
+<link href="nxp_lpc13Uxx_peripheral.xme" show="embed" type="simple"/>
</info>
</infoList>
</TargetConfig></projectStorage>
diff --git a/demos/device/device_os_none/mscd_app.h b/demos/device/device_os_none/mscd_app.h index 4bbd91da1..722cfbe99 100644 --- a/demos/device/device_os_none/mscd_app.h +++ b/demos/device/device_os_none/mscd_app.h @@ -61,7 +61,7 @@ enum DISK_BLOCK_SIZE = 512
};
-#if MCU==MCU_LPC11UXX || MCU==MCU_LPC13UXX
+#if TUSB_CFG_MCU==MCU_LPC11UXX || TUSB_CFG_MCU==MCU_LPC13UXX
#define MSCD_APP_ROMDISK
#else // defaults is ram disk
#define MSCD_APP_RAMDISK
diff --git a/demos/device/device_os_none/tusb_config.h b/demos/device/device_os_none/tusb_config.h index 2149abfce..8fa5e315a 100644 --- a/demos/device/device_os_none/tusb_config.h +++ b/demos/device/device_os_none/tusb_config.h @@ -53,6 +53,8 @@ //--------------------------------------------------------------------+
// CONTROLLER CONFIGURATION
//--------------------------------------------------------------------+
+//#define TUSB_CFG_MCU will be passed from IDE for easy board/mcu switching
+
#define TUSB_CFG_CONTROLLER_0_MODE (TUSB_MODE_DEVICE)
#define TUSB_CFG_CONTROLLER_1_MODE (TUSB_MODE_NONE) // TODO not yet tested
@@ -85,7 +87,7 @@ #define TUSB_CFG_DEVICE_HID_MOUSE 0
#define TUSB_CFG_DEVICE_HID_GENERIC 0
#define TUSB_CFG_DEVICE_MSC 1
-#define TUSB_CFG_DEVICE_CDC 1
+#define TUSB_CFG_DEVICE_CDC 0
//--------------------------------------------------------------------+
@@ -98,11 +100,11 @@ #define TUSB_CFG_OS_TICKS_PER_SECOND 1000
#ifdef __CODE_RED // make use of code red's support for ram region macros
- #if (MCU == MCU_LPC11UXX) || (MCU == MCU_LPC13UXX)
+ #if (TUSB_CFG_MCU == MCU_LPC11UXX) || (TUSB_CFG_MCU == MCU_LPC13UXX)
#define TUSB_RAM_SECTION ".data.$RAM2"
- #elif (MCU == MCU_LPC43XX)
+ #elif (TUSB_CFG_MCU == MCU_LPC43XX)
#define TUSB_RAM_SECTION ".data.$RAM3"
- #elif (MCU == MCU_LPC175X_6X)
+ #elif (TUSB_CFG_MCU == MCU_LPC175X_6X)
#define TUSB_RAM_SECTION ".data.$RAM2"
#else
#error Please define USB RAM section
diff --git a/demos/device/device_os_none/tusb_descriptors.h b/demos/device/device_os_none/tusb_descriptors.h index 040114ba9..bacbdd144 100644 --- a/demos/device/device_os_none/tusb_descriptors.h +++ b/demos/device/device_os_none/tusb_descriptors.h @@ -74,7 +74,7 @@ #define EDPT_IN(x) (0x80 | (x)) #define EDPT_OUT(x) (x) -#if MCU == MCU_LPC175X_6X +#if TUSB_CFG_MCU == MCU_LPC175X_6X //------------- These MCUs's endpoint number has a fixed type -------------// //------------- CDC -------------// #define CDC_EDPT_NOTIFICATION_ADDR EDPT_IN (1) diff --git a/demos/host/host_bulk_xfer/.cproject b/demos/host/host_bulk_xfer/.cproject index b839b245f..f30433165 100644 --- a/demos/host/host_bulk_xfer/.cproject +++ b/demos/host/host_bulk_xfer/.cproject @@ -36,7 +36,7 @@ <listOptionValue builtIn="false" value="__REDLIB__"/> <listOptionValue builtIn="false" value="__USE_CMSIS=CMSIS_LPC43xx_DriverLib"/> <listOptionValue builtIn="false" value="CORE_M4"/> - <listOptionValue builtIn="false" value="MCU=MCU_LPC43XX"/> + <listOptionValue builtIn="false" value="TUSB_CFG_MCU=MCU_LPC43XX"/> <listOptionValue builtIn="false" value="BOARD=BOARD_NGX4330"/> <listOptionValue builtIn="false" value="TUSB_CFG_OS=TUSB_OS_NONE"/> <listOptionValue builtIn="false" value="DEBUG"/> @@ -1141,7 +1141,7 @@ <listOptionValue builtIn="false" value="__REDLIB__"/> <listOptionValue builtIn="false" value="__USE_CMSIS=CMSIS_LPC43xx_DriverLib"/> <listOptionValue builtIn="false" value="CORE_M4"/> - <listOptionValue builtIn="false" value="MCU=MCU_LPC43XX"/> + <listOptionValue builtIn="false" value="TUSB_CFG_MCU=MCU_LPC43XX"/> <listOptionValue builtIn="false" value="BOARD=BOARD_EA4357"/> <listOptionValue builtIn="false" value="TUSB_CFG_OS=TUSB_OS_NONE"/> <listOptionValue builtIn="false" value="DEBUG"/> @@ -2249,7 +2249,7 @@ <listOptionValue builtIn="false" value="__REDLIB__"/> <listOptionValue builtIn="false" value="__USE_CMSIS=CMSIS_LPC43xx_DriverLib"/> <listOptionValue builtIn="false" value="CORE_M4"/> - <listOptionValue builtIn="false" value="MCU=MCU_LPC43XX"/> + <listOptionValue builtIn="false" value="TUSB_CFG_MCU=MCU_LPC43XX"/> <listOptionValue builtIn="false" value="BOARD=BOARD_MCB4300"/> <listOptionValue builtIn="false" value="TUSB_CFG_OS=TUSB_OS_NONE"/> <listOptionValue builtIn="false" value="DEBUG"/> @@ -3357,7 +3357,7 @@ <listOptionValue builtIn="false" value="__REDLIB__"/> <listOptionValue builtIn="false" value="__USE_CMSIS=CMSIS_LPC43xx_DriverLib"/> <listOptionValue builtIn="false" value="CORE_M4"/> - <listOptionValue builtIn="false" value="MCU=MCU_LPC43XX"/> + <listOptionValue builtIn="false" value="TUSB_CFG_MCU=MCU_LPC43XX"/> <listOptionValue builtIn="false" value="BOARD=BOARD_HITEX4350"/> <listOptionValue builtIn="false" value="TUSB_CFG_OS=TUSB_OS_NONE"/> <listOptionValue builtIn="false" value="DEBUG"/> diff --git a/demos/host/host_bulk_xfer/tusb_config.h b/demos/host/host_bulk_xfer/tusb_config.h index 0548ef599..80edd20fa 100644 --- a/demos/host/host_bulk_xfer/tusb_config.h +++ b/demos/host/host_bulk_xfer/tusb_config.h @@ -103,9 +103,9 @@ #define TUSB_CFG_OS_TICKS_PER_SECOND 1000
#ifdef __CODE_RED // make use of code red's support for ram region macros
- #if (MCU == MCU_LPC11UXX) || (MCU == MCU_LPC13UXX)
+ #if (TUSB_CFG_MCU == MCU_LPC11UXX) || (TUSB_CFG_MCU == MCU_LPC13UXX)
#define TUSB_RAM_SECTION ".data.$RAM2"
- #elif (MCU == MCU_LPC43XX)
+ #elif (TUSB_CFG_MCU == MCU_LPC43XX)
#define TUSB_RAM_SECTION ".data.$RAM3"
#endif
diff --git a/demos/host/host_cmsis_rtx/.cproject b/demos/host/host_cmsis_rtx/.cproject index b58260105..aab8538cf 100644 --- a/demos/host/host_cmsis_rtx/.cproject +++ b/demos/host/host_cmsis_rtx/.cproject @@ -36,7 +36,7 @@ <listOptionValue builtIn="false" value="__REDLIB__"/> <listOptionValue builtIn="false" value="__USE_CMSIS=CMSIS_LPC43xx_DriverLib"/> <listOptionValue builtIn="false" value="CORE_M4"/> - <listOptionValue builtIn="false" value="MCU=MCU_LPC43XX"/> + <listOptionValue builtIn="false" value="TUSB_CFG_MCU=MCU_LPC43XX"/> <listOptionValue builtIn="false" value="BOARD=BOARD_NGX4330"/> <listOptionValue builtIn="false" value="TUSB_CFG_OS=TUSB_OS_FREERTOS"/> <listOptionValue builtIn="false" value="TUSB_CFG_OS_TASK_PRIO=(configMAX_PRIORITIES-5)"/> @@ -698,7 +698,7 @@ <listOptionValue builtIn="false" value="__FPU_PRESENT"/> <listOptionValue builtIn="false" value="__USE_CMSIS=CMSIS_LPC43xx_DriverLib"/> <listOptionValue builtIn="false" value="CORE_M4"/> - <listOptionValue builtIn="false" value="MCU=MCU_LPC43XX"/> + <listOptionValue builtIn="false" value="TUSB_CFG_MCU=MCU_LPC43XX"/> <listOptionValue builtIn="false" value="BOARD=BOARD_EA4357"/> <listOptionValue builtIn="false" value="TUSB_CFG_OS=TUSB_OS_CMSIS_RTX"/> <listOptionValue builtIn="false" value="TUSB_CFG_OS_TASK_PRIO=osPriorityRealtime"/> diff --git a/demos/host/host_freertos/.cproject b/demos/host/host_freertos/.cproject index d22eea060..a137d8cb7 100644 --- a/demos/host/host_freertos/.cproject +++ b/demos/host/host_freertos/.cproject @@ -34,7 +34,7 @@ <listOptionValue builtIn="false" value="__REDLIB__"/>
<listOptionValue builtIn="false" value="__USE_CMSIS=CMSIS_LPC43xx_DriverLib"/>
<listOptionValue builtIn="false" value="CORE_M4"/>
- <listOptionValue builtIn="false" value="MCU=MCU_LPC43XX"/>
+ <listOptionValue builtIn="false" value="TUSB_CFG_MCU=MCU_LPC43XX"/>
<listOptionValue builtIn="false" value="BOARD=BOARD_NGX4330"/>
<listOptionValue builtIn="false" value="TUSB_CFG_OS=TUSB_OS_FREERTOS"/>
<listOptionValue builtIn="false" value="TUSB_CFG_OS_TASK_PRIO=(configMAX_PRIORITIES-5)"/>
@@ -133,7 +133,7 @@ <listOptionValue builtIn="false" value="__FPU_PRESENT"/>
<listOptionValue builtIn="false" value="__USE_CMSIS=CMSIS_LPC43xx_DriverLib"/>
<listOptionValue builtIn="false" value="CORE_M4"/>
- <listOptionValue builtIn="false" value="MCU=MCU_LPC43XX"/>
+ <listOptionValue builtIn="false" value="TUSB_CFG_MCU=MCU_LPC43XX"/>
<listOptionValue builtIn="false" value="BOARD=BOARD_EA4357"/>
<listOptionValue builtIn="false" value="TUSB_CFG_OS=TUSB_OS_FREERTOS"/>
<listOptionValue builtIn="false" value="TUSB_CFG_OS_TASK_PRIO=(configMAX_PRIORITIES-5)"/>
diff --git a/demos/host/host_os_none/.cproject b/demos/host/host_os_none/.cproject index b70491306..cda33db1a 100644 --- a/demos/host/host_os_none/.cproject +++ b/demos/host/host_os_none/.cproject @@ -36,7 +36,7 @@ <listOptionValue builtIn="false" value="__REDLIB__"/>
<listOptionValue builtIn="false" value="__USE_CMSIS=CMSIS_LPC43xx_DriverLib"/>
<listOptionValue builtIn="false" value="CORE_M4"/>
- <listOptionValue builtIn="false" value="MCU=MCU_LPC43XX"/>
+ <listOptionValue builtIn="false" value="TUSB_CFG_MCU=MCU_LPC43XX"/>
<listOptionValue builtIn="false" value="BOARD=BOARD_NGX4330"/>
<listOptionValue builtIn="false" value="TUSB_CFG_OS=TUSB_OS_NONE"/>
<listOptionValue builtIn="false" value="DEBUG"/>
@@ -125,7 +125,7 @@ <listOptionValue builtIn="false" value="__REDLIB__"/>
<listOptionValue builtIn="false" value="__USE_CMSIS=CMSIS_LPC43xx_DriverLib"/>
<listOptionValue builtIn="false" value="CORE_M4"/>
- <listOptionValue builtIn="false" value="MCU=MCU_LPC43XX"/>
+ <listOptionValue builtIn="false" value="TUSB_CFG_MCU=MCU_LPC43XX"/>
<listOptionValue builtIn="false" value="BOARD=BOARD_EA4357"/>
<listOptionValue builtIn="false" value="TUSB_CFG_OS=TUSB_OS_NONE"/>
<listOptionValue builtIn="false" value="DEBUG"/>
@@ -221,7 +221,7 @@ <listOptionValue builtIn="false" value="__REDLIB__"/>
<listOptionValue builtIn="false" value="__USE_CMSIS=CMSIS_LPC43xx_DriverLib"/>
<listOptionValue builtIn="false" value="CORE_M4"/>
- <listOptionValue builtIn="false" value="MCU=MCU_LPC43XX"/>
+ <listOptionValue builtIn="false" value="TUSB_CFG_MCU=MCU_LPC43XX"/>
<listOptionValue builtIn="false" value="BOARD=BOARD_MCB4300"/>
<listOptionValue builtIn="false" value="TUSB_CFG_OS=TUSB_OS_NONE"/>
<listOptionValue builtIn="false" value="DEBUG"/>
@@ -313,7 +313,7 @@ <listOptionValue builtIn="false" value="__REDLIB__"/>
<listOptionValue builtIn="false" value="__USE_CMSIS=CMSIS_LPC43xx_DriverLib"/>
<listOptionValue builtIn="false" value="CORE_M4"/>
- <listOptionValue builtIn="false" value="MCU=MCU_LPC43XX"/>
+ <listOptionValue builtIn="false" value="TUSB_CFG_MCU=MCU_LPC43XX"/>
<listOptionValue builtIn="false" value="BOARD=BOARD_HITEX4350"/>
<listOptionValue builtIn="false" value="TUSB_CFG_OS=TUSB_OS_NONE"/>
<listOptionValue builtIn="false" value="DEBUG"/>
@@ -405,7 +405,7 @@ <listOptionValue builtIn="false" value="__REDLIB__"/>
<listOptionValue builtIn="false" value="__USE_CMSIS=CMSIS_LPC43xx_DriverLib"/>
<listOptionValue builtIn="false" value="CORE_M4"/>
- <listOptionValue builtIn="false" value="MCU=MCU_LPC43XX"/>
+ <listOptionValue builtIn="false" value="TUSB_CFG_MCU=MCU_LPC43XX"/>
<listOptionValue builtIn="false" value="BOARD=BOARD_LPC4357USB"/>
<listOptionValue builtIn="false" value="TUSB_CFG_OS=TUSB_OS_NONE"/>
<listOptionValue builtIn="false" value="DEBUG"/>
diff --git a/demos/host/src/tusb_config.h b/demos/host/src/tusb_config.h index bbfac4da2..3239c35a0 100644 --- a/demos/host/src/tusb_config.h +++ b/demos/host/src/tusb_config.h @@ -101,9 +101,9 @@ #define TUSB_CFG_OS_TICKS_PER_SECOND 1000
#ifdef __CODE_RED // make use of code red's support for ram region macros
- #if (MCU == MCU_LPC11UXX) || (MCU == MCU_LPC13UXX)
+ #if (TUSB_CFG_MCU == MCU_LPC11UXX) || (TUSB_CFG_MCU == MCU_LPC13UXX)
#define TUSB_RAM_SECTION ".data.$RAM2"
- #elif (MCU == MCU_LPC43XX)
+ #elif (TUSB_CFG_MCU == MCU_LPC43XX)
#define TUSB_RAM_SECTION ".data.$RAM3"
#endif
diff --git a/tests/.cproject b/tests/.cproject index 7bec32a62..ca3934f3f 100644 --- a/tests/.cproject +++ b/tests/.cproject @@ -33,7 +33,7 @@ <tool id="cdt.managedbuild.tool.gnu.cpp.compiler.mingw.base.694786126" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.mingw.base"/> <tool errorParsers="org.eclipse.cdt.core.GCCErrorParser" id="cdt.managedbuild.tool.gnu.c.compiler.mingw.base.1588045403" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.mingw.base"> <option id="gnu.c.compiler.option.preprocessor.def.symbols.1484610767" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols" valueType="definedSymbols"> - <listOptionValue builtIn="false" value="MCU=MCU_LPC43XX"/> + <listOptionValue builtIn="false" value="TUSB_CFG_MCU=MCU_LPC43XX"/> </option> <option id="gnu.c.compiler.option.preprocessor.undef.symbol.1508960620" superClass="gnu.c.compiler.option.preprocessor.undef.symbol"/> <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.451457393" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/> diff --git a/tests/lpc175x_6x/project.yml b/tests/lpc175x_6x/project.yml index 2426f39fa..78f183823 100644 --- a/tests/lpc175x_6x/project.yml +++ b/tests/lpc175x_6x/project.yml @@ -42,7 +42,7 @@ # 1) remove the trailing [] from the :common: section # 2) add entries to the :common: section (e.g. :test: has TEST defined) :commmon: &common_defines - - MCU=MCU_LPC175X_6X -std=gnu99 + - TUSB_CFG_MCU=MCU_LPC175X_6X -std=gnu99 # - -mx32 - CORE_M4 - __CODE_RED diff --git a/tests/lpc18xx_43xx/project.yml b/tests/lpc18xx_43xx/project.yml index 8340d83e9..56d7a3b48 100644 --- a/tests/lpc18xx_43xx/project.yml +++ b/tests/lpc18xx_43xx/project.yml @@ -43,7 +43,7 @@ # 1) remove the trailing [] from the :common: section # 2) add entries to the :common: section (e.g. :test: has TEST defined) :commmon: &common_defines - - MCU=MCU_LPC43XX -std=gnu99 + - TUSB_CFG_MCU=MCU_LPC43XX -std=gnu99 # - -mx32 - CORE_M4 - __CODE_RED diff --git a/tinyusb/.cproject b/tinyusb/.cproject index fdb4d73d8..38563efe7 100644 --- a/tinyusb/.cproject +++ b/tinyusb/.cproject @@ -36,7 +36,7 @@ <option id="com.crt.advproject.gcc.thumb.724152017" name="Thumb mode" superClass="com.crt.advproject.gcc.thumb" value="true" valueType="boolean"/> <option id="gnu.c.compiler.option.preprocessor.def.symbols.38062140" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols" valueType="definedSymbols"> <listOptionValue builtIn="false" value="__REDLIB__"/> - <listOptionValue builtIn="false" value="MCU=MCU_LPC13UXX"/> + <listOptionValue builtIn="false" value="TUSB_CFG_MCU=MCU_LPC13UXX"/> <listOptionValue builtIn="false" value="DEBUG"/> <listOptionValue builtIn="false" value="__CODE_RED"/> </option> @@ -666,7 +666,7 @@ <option id="com.crt.advproject.gcc.thumb.1699307665" name="Thumb mode" superClass="com.crt.advproject.gcc.thumb" value="true" valueType="boolean"/> <option id="gnu.c.compiler.option.preprocessor.def.symbols.1161208646" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols" valueType="definedSymbols"> <listOptionValue builtIn="false" value="__REDLIB__"/> - <listOptionValue builtIn="false" value="MCU=MCU_LPC11UXX"/> + <listOptionValue builtIn="false" value="TUSB_CFG_MCU=MCU_LPC11UXX"/> <listOptionValue builtIn="false" value="DEBUG"/> <listOptionValue builtIn="false" value="__CODE_RED"/> </option> @@ -1298,7 +1298,7 @@ <option id="gnu.c.compiler.option.preprocessor.def.symbols.1903848113" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols" valueType="definedSymbols"> <listOptionValue builtIn="false" value="__REDLIB__"/> <listOptionValue builtIn="false" value="CORE_M4"/> - <listOptionValue builtIn="false" value="MCU=MCU_LPC43XX"/> + <listOptionValue builtIn="false" value="TUSB_CFG_MCU=MCU_LPC43XX"/> <listOptionValue builtIn="false" value="DEBUG"/> <listOptionValue builtIn="false" value="__CODE_RED"/> </option> diff --git a/tinyusb/device/dcd_lpc175x_6x.c b/tinyusb/device/dcd_lpc175x_6x.c index bb6410e02..4e95f03da 100644 --- a/tinyusb/device/dcd_lpc175x_6x.c +++ b/tinyusb/device/dcd_lpc175x_6x.c @@ -38,7 +38,7 @@ #include "tusb_option.h" -#if MODE_DEVICE_SUPPORTED && (MCU == MCU_LPC175X_6X) +#if MODE_DEVICE_SUPPORTED && (TUSB_CFG_MCU == MCU_LPC175X_6X) #define _TINY_USB_SOURCE_FILE_ //--------------------------------------------------------------------+ diff --git a/tinyusb/device/dcd_lpc43xx.c b/tinyusb/device/dcd_lpc43xx.c index 152b384d5..296a19a6c 100644 --- a/tinyusb/device/dcd_lpc43xx.c +++ b/tinyusb/device/dcd_lpc43xx.c @@ -38,7 +38,7 @@ #include "tusb_option.h"
-#if MODE_DEVICE_SUPPORTED && MCU == MCU_LPC43XX
+#if MODE_DEVICE_SUPPORTED && TUSB_CFG_MCU == MCU_LPC43XX
#define _TINY_USB_SOURCE_FILE_
//--------------------------------------------------------------------+
diff --git a/tinyusb/device/dcd_lpc_11uxx_13uxx.c b/tinyusb/device/dcd_lpc_11uxx_13uxx.c index 209462ef9..22dcaafa0 100644 --- a/tinyusb/device/dcd_lpc_11uxx_13uxx.c +++ b/tinyusb/device/dcd_lpc_11uxx_13uxx.c @@ -38,7 +38,7 @@ #include "tusb_option.h"
-#if MODE_DEVICE_SUPPORTED && (MCU == MCU_LPC11UXX || MCU == MCU_LPC13UXX)
+#if MODE_DEVICE_SUPPORTED && (TUSB_CFG_MCU == MCU_LPC11UXX || TUSB_CFG_MCU == MCU_LPC13UXX)
#define _TINY_USB_SOURCE_FILE_
//--------------------------------------------------------------------+
diff --git a/tinyusb/device/usbd.c b/tinyusb/device/usbd.c index fd62874b3..77346fc05 100644 --- a/tinyusb/device/usbd.c +++ b/tinyusb/device/usbd.c @@ -50,7 +50,7 @@ #include "usbd_dcd.h" // Some MCUs cannot transfer more than 64 bytes each queue, thus require special task-alike treatment -#if MCU == MCU_LPC11UXX || MCU == MCU_LPC175X_6X +#if TUSB_CFG_MCU == MCU_LPC11UXX || TUSB_CFG_MCU == MCU_LPC175X_6X #define USBD_CONTROL_ONE_PACKET_EACH_XFER // for each Transfer, cannot queue more than packet size enum { USBD_COTNROL_MAX_LENGTH_EACH_XFER = 64 diff --git a/tinyusb/device/usbd.h b/tinyusb/device/usbd.h index 6128f506d..d1e71c0dd 100644 --- a/tinyusb/device/usbd.h +++ b/tinyusb/device/usbd.h @@ -58,7 +58,7 @@ #endif // LPC11uxx and LPC13uxx requires each buffer has to be 64-byte alignment -#if MCU == MCU_LPC11UXX || MCU == MCU_LPC13UXX +#if TUSB_CFG_MCU == MCU_LPC11UXX || TUSB_CFG_MCU == MCU_LPC13UXX #define ATTR_USB_MIN_ALIGNMENT ATTR_ALIGNED(64) #else #define ATTR_USB_MIN_ALIGNMENT diff --git a/tinyusb/hal/hal.h b/tinyusb/hal/hal.h index c6f44f47c..b26804efc 100644 --- a/tinyusb/hal/hal.h +++ b/tinyusb/hal/hal.h @@ -86,13 +86,13 @@ static inline void hal_interrupt_disable(uint8_t coreid) ATTR_ALWAYS_INLINE; //--------------------------------------------------------------------+ // INCLUDE DRIVEN //--------------------------------------------------------------------+ -#if MCU == MCU_LPC11UXX +#if TUSB_CFG_MCU == MCU_LPC11UXX #include "hal_lpc11uxx.h" -#elif MCU == MCU_LPC13UXX +#elif TUSB_CFG_MCU == MCU_LPC13UXX #include "hal_lpc13uxx.h" -#elif MCU == MCU_LPC43XX +#elif TUSB_CFG_MCU == MCU_LPC43XX #include "hal_lpc43xx.h" -#elif MCU == MCU_LPC175X_6X +#elif TUSB_CFG_MCU == MCU_LPC175X_6X #include "hal_lpc175x_6x.h" #else #error MCU is not defined or supported yet @@ -107,7 +107,7 @@ static inline bool hal_debugger_is_attached(void) ATTR_PURE ATTR_ALWAYS_INLINE; static inline bool hal_debugger_is_attached(void) { // TODO check core M3/M4 defined instead -#if !defined(_TEST_) && !(MCU==MCU_LPC11UXX) +#if !defined(_TEST_) && !(TUSB_CFG_MCU==MCU_LPC11UXX) return ( (CoreDebug->DHCSR & CoreDebug_DHCSR_C_DEBUGEN_Msk) == CoreDebug_DHCSR_C_DEBUGEN_Msk ); #else return true; // force to break into breakpoint diff --git a/tinyusb/hal/hal_lpc11uxx.c b/tinyusb/hal/hal_lpc11uxx.c index c1e504731..60177485d 100644 --- a/tinyusb/hal/hal_lpc11uxx.c +++ b/tinyusb/hal/hal_lpc11uxx.c @@ -39,7 +39,7 @@ #include "common/common.h" #include "hal.h" -#if MCU == MCU_LPC11UXX +#if TUSB_CFG_MCU == MCU_LPC11UXX tusb_error_t hal_init(void) { diff --git a/tinyusb/hal/hal_lpc13uxx.c b/tinyusb/hal/hal_lpc13uxx.c index 4e986faac..706f5004c 100644 --- a/tinyusb/hal/hal_lpc13uxx.c +++ b/tinyusb/hal/hal_lpc13uxx.c @@ -39,7 +39,7 @@ #include "common/common.h" #include "hal.h" -#if MCU == MCU_LPC13UXX +#if TUSB_CFG_MCU == MCU_LPC13UXX tusb_error_t hal_init(void) { diff --git a/tinyusb/hal/hal_lpc175x_6x.c b/tinyusb/hal/hal_lpc175x_6x.c index ae63b7b7a..60b66a5e4 100644 --- a/tinyusb/hal/hal_lpc175x_6x.c +++ b/tinyusb/hal/hal_lpc175x_6x.c @@ -38,7 +38,7 @@ #include "tusb_option.h" -#if MCU == MCU_LPC175X_6X +#if TUSB_CFG_MCU == MCU_LPC175X_6X //--------------------------------------------------------------------+ // INCLUDE diff --git a/tinyusb/hal/hal_lpc43xx.c b/tinyusb/hal/hal_lpc43xx.c index 9cb07deff..fd64fc59a 100644 --- a/tinyusb/hal/hal_lpc43xx.c +++ b/tinyusb/hal/hal_lpc43xx.c @@ -39,7 +39,7 @@ #include "common/common.h"
#include "hal.h"
-#if MCU == MCU_LPC43XX
+#if TUSB_CFG_MCU == MCU_LPC43XX
#include "lpc43xx_cgu.h"
#include "lpc43xx_scu.h"
diff --git a/tinyusb/host/ehci/ehci.c b/tinyusb/host/ehci/ehci.c index 322f17879..21114712e 100644 --- a/tinyusb/host/ehci/ehci.c +++ b/tinyusb/host/ehci/ehci.c @@ -38,7 +38,7 @@ #include "common/common.h"
-#if MODE_HOST_SUPPORTED && (MCU == MCU_LPC43XX || MCU == MCU_LPC18XX)
+#if MODE_HOST_SUPPORTED && (TUSB_CFG_MCU == MCU_LPC43XX || TUSB_CFG_MCU == MCU_LPC18XX)
//--------------------------------------------------------------------+
// INCLUDE
//--------------------------------------------------------------------+
diff --git a/tinyusb/mcu_capacity.h b/tinyusb/mcu_capacity.h index b5944ebed..3b9181700 100644 --- a/tinyusb/mcu_capacity.h +++ b/tinyusb/mcu_capacity.h @@ -67,14 +67,14 @@ //--------------------------------------------------------------------+
// Controller
//--------------------------------------------------------------------+
-#if MCU == MCU_LPC43XX || MCU == MCU_LPC18XX
+#if TUSB_CFG_MCU == MCU_LPC43XX || TUSB_CFG_MCU == MCU_LPC18XX
#define CAP_CONTROLLER_NUMBER 2
#else
#define CAP_CONTROLLER_NUMBER 1
#endif
#define CAP_MODE_DEVICE
-#if MCU == MCU_LPC43XX || MCU == MCU_LPC18XX || MCU == MCU_LPC175X_6X
+#if TUSB_CFG_MCU == MCU_LPC43XX || TUSB_CFG_MCU == MCU_LPC18XX || TUSB_CFG_MCU == MCU_LPC175X_6X
#define CAP_MODE_HOST
#endif
diff --git a/vendor/freertos/freertos/Source/include/portable.h b/vendor/freertos/freertos/Source/include/portable.h index 3d3af3081..79919c01f 100644 --- a/vendor/freertos/freertos/Source/include/portable.h +++ b/vendor/freertos/freertos/Source/include/portable.h @@ -318,7 +318,7 @@ #include "tusb_option.h" #ifdef __GNUC__ - #if MCU==MCU_LPC43XX // TODO M0 M4 + #if TUSB_CFG_MCU==MCU_LPC43XX // TODO M0 M4 #include "../portable/GCC/ARM_CM4F/portmacro.h" #else #error portmacro.h for mcu is not supported yet |