#define SVCall_Handler SVC_Handler in lpcxpresso startup for lpc175x_6x & lpc11uxx for better compatiable with other lib & toolchain.

added lpc176x xpresso with cmsis rtx

15 files changed, 135 insertions, 15 deletions

diff --git a/boards/embedded_artists/ea4357/board_ea4357.h b/boards/embedded_artists/ea4357/board_ea4357.h
index a4bfe9fa5..3c0de9a4e 100644
--- a/boards/embedded_artists/ea4357/board_ea4357.h
+++ b/boards/embedded_artists/ea4357/board_ea4357.h
@@ -63,7 +63,7 @@
 

 

 //#define CFG_PRINTF_TARGET       PRINTF_TARGET_SWO

-#define CFG_PRINTF_TARGET       PRINTF_TARGET_UART // FIXME keil's cmsis rtx does not work with UART (work with SWO)

+#define CFG_PRINTF_TARGET       PRINTF_TARGET_UART

 

 #ifdef __cplusplus

  }

diff --git a/boards/embedded_artists/oem_base_board/acc.c b/boards/embedded_artists/oem_base_board/acc.c
index bd6a82042..a53634980 100644
--- a/boards/embedded_artists/oem_base_board/acc.c
+++ b/boards/embedded_artists/oem_base_board/acc.c
@@ -21,7 +21,9 @@
 /******************************************************************************
  * Includes
  *****************************************************************************/
+#include "../../board.h"
 
+#if BOARD == BOARD_EA4357
 
 #include "lpc_types.h"
 #include "lpc43xx_i2c.h"
@@ -249,3 +251,4 @@ void acc_setMode(acc_mode_t mode)
     setModeControl(mctl);
 }
 
+#endif
diff --git a/boards/embedded_artists/oem_base_board/base_eeprom.c b/boards/embedded_artists/oem_base_board/base_eeprom.c
index a11070d70..7571744a6 100644
--- a/boards/embedded_artists/oem_base_board/base_eeprom.c
+++ b/boards/embedded_artists/oem_base_board/base_eeprom.c
@@ -24,6 +24,9 @@
 /******************************************************************************
  * Includes
  *****************************************************************************/
+#include "../../board.h"
+
+#if BOARD == BOARD_EA4357
 
 #include <string.h>
 #include <stdio.h>
@@ -193,3 +196,5 @@ int16_t base_eeprom_write(uint8_t* buf, uint16_t offset, uint16_t len)
 
   return written;
 }
+
+#endif
diff --git a/boards/embedded_artists/oem_base_board/lm75a.c b/boards/embedded_artists/oem_base_board/lm75a.c
index 5c8b90171..db8234405 100644
--- a/boards/embedded_artists/oem_base_board/lm75a.c
+++ b/boards/embedded_artists/oem_base_board/lm75a.c
@@ -24,6 +24,9 @@
 /******************************************************************************
  * Includes
  *****************************************************************************/
+#include "../../board.h"
+
+#if BOARD == BOARD_EA4357
 
 #include <string.h>
 #include <stdio.h>
@@ -126,3 +129,4 @@ int32_t lm75a_readTemp(void)
 }
 
 
+#endif
diff --git a/boards/embedded_artists/oem_base_board/memreg.c b/boards/embedded_artists/oem_base_board/memreg.c
index ef4338bc3..3704f9bb8 100644
--- a/boards/embedded_artists/oem_base_board/memreg.c
+++ b/boards/embedded_artists/oem_base_board/memreg.c
@@ -21,6 +21,9 @@
 /******************************************************************************
  * Includes
  *****************************************************************************/
+#include "../../board.h"
+
+#if BOARD == BOARD_EA4357
 
 #include "lpc43xx.h"
 #include "lpc_types.h"
@@ -167,4 +170,5 @@ uint32_t memreg_init (void)
   return FALSE;
 }
 
+#endif
 
diff --git a/boards/embedded_artists/oem_base_board/norflash.c b/boards/embedded_artists/oem_base_board/norflash.c
index 20f1dd8bb..0baf62c49 100644
--- a/boards/embedded_artists/oem_base_board/norflash.c
+++ b/boards/embedded_artists/oem_base_board/norflash.c
@@ -21,6 +21,9 @@
 /******************************************************************************
  * Includes
  *****************************************************************************/
+#include "../../board.h"
+
+#if BOARD == BOARD_EA4357
 
 #include "lpc_types.h"
 #include "lpc43xx_scu.h"
@@ -541,3 +544,4 @@ uint32_t norflash_secid_writeWord(uint16_t target, uint16_t* data, uint16_t len)
   return TRUE;
 }
 
+#endif
diff --git a/boards/embedded_artists/oem_base_board/uda1380.c b/boards/embedded_artists/oem_base_board/uda1380.c
index 3528ac6e0..654e4eb9a 100644
--- a/boards/embedded_artists/oem_base_board/uda1380.c
+++ b/boards/embedded_artists/oem_base_board/uda1380.c
@@ -1,3 +1,6 @@
+#include "../../board.h"
+
+#if BOARD == BOARD_EA4357
 
 #include "lpc43xx_i2c.h"
 #include "lpc43xx_scu.h"
@@ -152,5 +155,5 @@ int32_t Uda1380_ReadData(uint8_t reg, uint16_t *data)
 	return UDA1380_FUNC_ERR;
 }
 
-
+#endif
 
diff --git a/demos/host/host_cmsis_rtx/.cproject b/demos/host/host_cmsis_rtx/.cproject
index fa7386f52..812f77897 100644
--- a/demos/host/host_cmsis_rtx/.cproject
+++ b/demos/host/host_cmsis_rtx/.cproject
@@ -85,7 +85,7 @@
 						</toolChain>

 					</folderInfo>

 					<sourceEntries>

-						<entry excluding="cmsis_rtos_rtx/SRC|cmsis_rtos_rtx/SRC/GCC/HAL_CM3.s|cmsis_rtos_rtx/SRC/GCC/HAL_CM0.s|cmsis_rtos_rtx/SRC/ARM|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/sdio.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_wwdt.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_timer.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_ssp.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_sdmmc.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_sdif.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_sct.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_rtc.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_rit.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_rgu.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_qei.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_pwr.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_nvic.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_mcpwm.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_lcd.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_i2s.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_gpdma.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_evrt.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_emc.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_dac.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_can.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_atimer.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_adc.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/LCDTerm.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/Font5x7.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/debug_frmwrk.c|mcu/lpc175x_6x|mcu/lpc13uxx|mcu/lpc11uxx|cmsis_rtos_rtx/SRC/IAR|bsp/boards/embedded_artists/oem_base_board|freertos/freertoslpc/FreeRTOS_lpc43xx_m0_Tick.c|freertos/freertos/Source/portable|bsp/boards/EA4357|NGX|bsp/lpc13uxx|bsp/lpc11uxx" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>

+						<entry excluding="boards/embedded_artists/oem_base_board|cmsis_rtos_rtx/SRC|cmsis_rtos_rtx/SRC/GCC/HAL_CM3.s|cmsis_rtos_rtx/SRC/GCC/HAL_CM0.s|cmsis_rtos_rtx/SRC/ARM|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/sdio.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_wwdt.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_timer.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_ssp.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_sdmmc.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_sdif.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_sct.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_rtc.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_rit.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_rgu.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_qei.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_pwr.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_nvic.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_mcpwm.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_lcd.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_i2s.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_gpdma.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_evrt.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_emc.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_dac.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_can.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_atimer.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_adc.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/LCDTerm.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/Font5x7.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/debug_frmwrk.c|mcu/lpc175x_6x|mcu/lpc13uxx|mcu/lpc11uxx|cmsis_rtos_rtx/SRC/IAR|bsp/boards/embedded_artists/oem_base_board|freertos/freertoslpc/FreeRTOS_lpc43xx_m0_Tick.c|freertos/freertos/Source/portable|bsp/boards/EA4357|NGX|bsp/lpc13uxx|bsp/lpc11uxx" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>

 					</sourceEntries>

 				</configuration>

 			</storageModule>

@@ -196,6 +196,108 @@
 			<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>

 			<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>

 		</cconfiguration>

+		<cconfiguration id="com.crt.advproject.config.exe.debug.1239969983.636406670.682459274">

+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="com.crt.advproject.config.exe.debug.1239969983.636406670.682459274" moduleId="org.eclipse.cdt.core.settings" name="Board LPCXpresso1769">

+				<macros>

+					<stringMacro name="CFLAGS_OFF" type="VALUE_TEXT" value=""/>

+					<stringMacro name="CFLAGS_ON" type="VALUE_TEXT" value="-pedantic -Wextra -Wswitch-default -Wunsafe-loop-optimizations -Wcast-align -Wlogical-op -Wpacked-bitfield-compat -Wpadded -Wnested-externs -Wredundant-decls -Winline -Wpacked"/>

+					<stringMacro name="CFLAGS" type="VALUE_TEXT" value="${CFLAGS_OFF}"/>

+				</macros>

+				<externalSettings/>

+				<extensions>

+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>

+					<extension id="org.eclipse.cdt.core.MakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>

+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>

+					<extension id="org.eclipse.cdt.core.GNU_ELF" point="org.eclipse.cdt.core.BinaryParser"/>

+				</extensions>

+			</storageModule>

+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">

+				<configuration artifactExtension="axf" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe" cleanCommand="rm -rf" description="" errorParsers="org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.CWDLocator;org.eclipse.cdt.core.GmakeErrorParser" id="com.crt.advproject.config.exe.debug.1239969983.636406670.682459274" name="Board LPCXpresso1769" parent="com.crt.advproject.config.exe.debug" postannouncebuildStep="Performing post-build steps" postbuildStep="arm-none-eabi-size &quot;${BuildArtifactFileName}&quot;; # arm-none-eabi-objcopy -O binary &quot;${BuildArtifactFileName}&quot; &quot;${BuildArtifactFileBaseName}.bin&quot; ; checksum -p ${TargetChip} -d &quot;${BuildArtifactFileBaseName}.bin&quot;;  " preannouncebuildStep="" prebuildStep="">

+					<folderInfo id="com.crt.advproject.config.exe.debug.1239969983.636406670.682459274." name="/" resourcePath="">

+						<toolChain errorParsers="" id="com.crt.advproject.toolchain.exe.debug.1095746865" name="Code Red MCU Tools" superClass="com.crt.advproject.toolchain.exe.debug">

+							<targetPlatform binaryParser="org.eclipse.cdt.core.ELF;org.eclipse.cdt.core.GNU_ELF" id="com.crt.advproject.platform.exe.debug.61051881" name="ARM-based MCU (Debug)" superClass="com.crt.advproject.platform.exe.debug"/>

+							<builder buildPath="${workspace_loc:/host/Debug}" errorParsers="org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.CWDLocator" id="com.crt.advproject.builder.exe.debug.1225748121" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" superClass="com.crt.advproject.builder.exe.debug"/>

+							<tool id="com.crt.advproject.cpp.exe.debug.1732793690" name="MCU C++ Compiler" superClass="com.crt.advproject.cpp.exe.debug"/>

+							<tool command="arm-none-eabi-gcc" commandLinePattern="${COMMAND} ${FLAGS} ${CFLAGS} ${OUTPUT_FLAG}${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}" errorParsers="org.eclipse.cdt.core.GCCErrorParser" id="com.crt.advproject.gcc.exe.debug.1929539740" name="MCU C Compiler" superClass="com.crt.advproject.gcc.exe.debug">

+								<option id="com.crt.advproject.gcc.arch.268060068" name="Architecture" superClass="com.crt.advproject.gcc.arch" value="com.crt.advproject.gcc.target.cm3" valueType="enumerated"/>

+								<option id="com.crt.advproject.gcc.thumb.918927668" name="Thumb mode" superClass="com.crt.advproject.gcc.thumb" value="true" valueType="boolean"/>

+								<option id="gnu.c.compiler.option.preprocessor.def.symbols.1055719498" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols" valueType="definedSymbols">

+									<listOptionValue builtIn="false" value="__REDLIB__"/>

+									<listOptionValue builtIn="false" value="__CORTEX_M3"/>

+									<listOptionValue builtIn="false" value="__CMSIS_RTOS "/>

+									<listOptionValue builtIn="false" value="__USE_CMSIS"/>

+									<listOptionValue builtIn="false" value="TUSB_CFG_MCU=MCU_LPC175X_6X"/>

+									<listOptionValue builtIn="false" value="BOARD=BOARD_LPCXPRESSO1769"/>

+									<listOptionValue builtIn="false" value="TUSB_CFG_OS=TUSB_OS_CMSIS_RTX"/>

+									<listOptionValue builtIn="false" value="TUSB_CFG_OS_TASK_PRIO=osPriorityRealtime"/>

+									<listOptionValue builtIn="false" value="DEBUG"/>

+									<listOptionValue builtIn="false" value="__CODE_RED"/>

+								</option>

+								<option id="gnu.c.compiler.option.misc.other.856452465" name="Other flags" superClass="gnu.c.compiler.option.misc.other" value="-c -fmessage-length=0 -fno-builtin -ffunction-sections -fdata-sections" valueType="string"/>

+								<option id="gnu.c.compiler.option.include.paths.1254063509" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">

+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/boards}&quot;"/>

+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/fatfs}&quot;"/>

+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/mcu/lpc175x_6x/LPC17xx_DriverLib/include}&quot;"/>

+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/mcu/lpc175x_6x/CMSIS_CORE_LPC17xx/inc}&quot;"/>

+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/cmsis_rtos_rtx/INC}&quot;"/>

+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/tinyusb}&quot;"/>

+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/src}&quot;"/>

+								</option>

+								<option id="com.crt.advproject.c.misc.dialect.433357991" name="C Dialect" superClass="com.crt.advproject.c.misc.dialect" value="com.crt.advproject.misc.dialect.gnu99" valueType="enumerated"/>

+								<option id="com.crt.advproject.gcc.fpu.1262323634" name="Floating point" superClass="com.crt.advproject.gcc.fpu" value="com.crt.advproject.gcc.fpu.none" valueType="enumerated"/>

+								<option id="gnu.c.compiler.option.dialect.std.512107713" name="Language standard" superClass="gnu.c.compiler.option.dialect.std" value="gnu.c.compiler.dialect.default" valueType="enumerated"/>

+								<inputType id="com.crt.advproject.compiler.input.2041510445" superClass="com.crt.advproject.compiler.input"/>

+							</tool>

+							<tool command="arm-none-eabi-gcc" commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG}${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}" errorParsers="org.eclipse.cdt.core.GASErrorParser" id="com.crt.advproject.gas.exe.debug.844673095" name="MCU Assembler" superClass="com.crt.advproject.gas.exe.debug">

+								<option id="com.crt.advproject.gas.arch.1081225329" name="Architecture" superClass="com.crt.advproject.gas.arch" value="com.crt.advproject.gas.target.cm3" valueType="enumerated"/>

+								<option id="com.crt.advproject.gas.thumb.78538241" name="Thumb mode" superClass="com.crt.advproject.gas.thumb" value="true" valueType="boolean"/>

+								<option id="gnu.both.asm.option.flags.crt.2074404865" name="Assembler flags" superClass="gnu.both.asm.option.flags.crt" value="-c -x assembler-with-cpp -D__REDLIB__ -DDEBUG -D__CODE_RED" valueType="string"/>

+								<option id="com.crt.advproject.gas.fpu.639015202" name="Floating point" superClass="com.crt.advproject.gas.fpu" value="com.crt.advproject.gas.fpu.none" valueType="enumerated"/>

+								<inputType id="com.crt.advproject.assembler.input.1063672371" name="Additional Assembly Source Files" superClass="com.crt.advproject.assembler.input"/>

+								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.150631130" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>

+							</tool>

+							<tool id="com.crt.advproject.link.cpp.exe.debug.954988311" name="MCU C++ Linker" superClass="com.crt.advproject.link.cpp.exe.debug"/>

+							<tool command="arm-none-eabi-gcc" commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG}${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}" errorParsers="org.eclipse.cdt.core.GLDErrorParser" id="com.crt.advproject.link.exe.debug.1502192644" name="MCU Linker" superClass="com.crt.advproject.link.exe.debug">

+								<option id="com.crt.advproject.link.arch.158315986" name="Architecture" superClass="com.crt.advproject.link.arch" value="com.crt.advproject.link.target.cm3" valueType="enumerated"/>

+								<option id="com.crt.advproject.link.thumb.627956478" name="Thumb mode" superClass="com.crt.advproject.link.thumb" value="true" valueType="boolean"/>

+								<option id="com.crt.advproject.link.script.18945284" name="Linker script" superClass="com.crt.advproject.link.script" value="&quot;host_cmsis_rtx_Board_LPCXpresso1769.ld&quot;" valueType="string"/>

+								<option id="com.crt.advproject.link.manage.1847041217" name="Manage linker script" superClass="com.crt.advproject.link.manage" value="true" valueType="boolean"/>

+								<option id="gnu.c.link.option.nostdlibs.1862195417" name="No startup or default libs (-nostdlib)" superClass="gnu.c.link.option.nostdlibs" value="true" valueType="boolean"/>

+								<option id="gnu.c.link.option.other.2005212407" name="Other options (-Xlinker [option])" superClass="gnu.c.link.option.other" valueType="stringList">

+									<listOptionValue builtIn="false" value="-Map=&quot;${BuildArtifactFileBaseName}.map&quot;"/>

+									<listOptionValue builtIn="false" value="--gc-sections"/>

+								</option>

+								<option id="gnu.c.link.option.libs.570002171" name="Libraries (-l)" superClass="gnu.c.link.option.libs" valueType="libs">

+									<listOptionValue builtIn="false" value="RTX_CM3"/>

+								</option>

+								<option id="gnu.c.link.option.paths.1185436199" name="Library search path (-L)" superClass="gnu.c.link.option.paths" valueType="libPaths">

+									<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/cmsis_rtos_rtx/LIB/GCC}&quot;"/>

+								</option>

+								<option id="com.crt.advproject.link.gcc.hdrlib.1376822718" name="Library" superClass="com.crt.advproject.link.gcc.hdrlib" value="com.crt.advproject.gcc.link.hdrlib.codered.nohost" valueType="enumerated"/>

+								<option id="com.crt.advproject.link.fpu.1096421602" name="Floating point" superClass="com.crt.advproject.link.fpu" value="com.crt.advproject.link.fpu.none" valueType="enumerated"/>

+								<option id="com.crt.advproject.link.gcc.multicore.slave.1605384275" name="Multicore slave" superClass="com.crt.advproject.link.gcc.multicore.slave"/>

+								<option id="com.crt.advproject.link.gcc.multicore.master.122348860" name="Multicore" superClass="com.crt.advproject.link.gcc.multicore.master"/>

+								<inputType id="cdt.managedbuild.tool.gnu.c.linker.input.1743324153" superClass="cdt.managedbuild.tool.gnu.c.linker.input">

+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>

+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>

+								</inputType>

+							</tool>

+						</toolChain>

+					</folderInfo>

+					<sourceEntries>

+						<entry excluding="boards/embedded_artists/oem_base_board|mcu/lpc43xx|cmsis_rtos_rtx/SRC|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/sdio.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_wwdt.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_timer.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_ssp.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_sdmmc.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_sdif.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_sct.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_rtc.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_rit.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_rgu.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_qei.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_pwr.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_nvic.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_mcpwm.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_lcd.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_i2s.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_gpdma.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_evrt.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_emc.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_dac.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_can.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_atimer.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/lpc43xx_adc.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/LCDTerm.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/Font5x7.c|mcu/lpc43xx/CMSIS_LPC43xx_DriverLib/src/debug_frmwrk.c|mcu/lpc13uxx|mcu/lpc11uxx|freertos/freertoslpc/FreeRTOS_lpc43xx_m0_Tick.c|freertos/freertos/Source/portable" flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name=""/>

+					</sourceEntries>

+				</configuration>

+			</storageModule>

+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>

+			<storageModule moduleId="org.eclipse.cdt.core.language.mapping"/>

+			<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>

+			<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>

+		</cconfiguration>

 	</storageModule>

 	<storageModule moduleId="cdtBuildSystem" version="4.0.0">

 		<project id="host.com.crt.advproject.projecttype.exe.1859815870" name="Executable" projectType="com.crt.advproject.projecttype.exe"/>

diff --git a/mcu/lpc11uxx/lpcxpresso/cr_startup_lpc11u.c b/mcu/lpc11uxx/lpcxpresso/cr_startup_lpc11u.c
index 6865b0721..582b71f15 100644
--- a/mcu/lpc11uxx/lpcxpresso/cr_startup_lpc11u.c
+++ b/mcu/lpc11uxx/lpcxpresso/cr_startup_lpc11u.c
@@ -44,6 +44,7 @@ extern "C" {
 
 #define WEAK __attribute__ ((weak))
 #define ALIAS(f) __attribute__ ((weak, alias (#f)))
+#define SVCall_Handler SVC_Handler
 
 // Code Red - if CMSIS is being used, then SystemInit() routine
 // will be called by startup code rather than in application's main()
diff --git a/mcu/lpc13uxx/lpcxpresso/cr_startup_lpc13u.c b/mcu/lpc13uxx/lpcxpresso/cr_startup_lpc13u.c
index 5738aac35..8b5d7eebb 100644
--- a/mcu/lpc13uxx/lpcxpresso/cr_startup_lpc13u.c
+++ b/mcu/lpc13uxx/lpcxpresso/cr_startup_lpc13u.c
@@ -45,8 +45,6 @@ extern "C" {
 #define WEAK __attribute__ ((weak))
 #define ALIAS(f) __attribute__ ((weak, alias (#f)))
 
-#define __USE_CMSIS // Added by nxpUSBlib
-
 // Code Red - if CMSIS is being used, then SystemInit() routine
 // will be called by startup code rather than in application's main()
 #if defined (__USE_CMSIS)
diff --git a/mcu/lpc175x_6x/lpcxpresso/cr_startup_lpc176x.c b/mcu/lpc175x_6x/lpcxpresso/cr_startup_lpc176x.c
index 95f702573..fc6bed580 100644
--- a/mcu/lpc175x_6x/lpcxpresso/cr_startup_lpc176x.c
+++ b/mcu/lpc175x_6x/lpcxpresso/cr_startup_lpc176x.c
@@ -45,6 +45,8 @@ extern "C" {
 #define WEAK __attribute__ ((weak))
 #define ALIAS(f) __attribute__ ((weak, alias (#f)))
 
+#define SVCall_Handler SVC_Handler
+
 // Code Red - if CMSIS is being used, then SystemInit() routine
 // will be called by startup code rather than in application's main()
 #if defined (__USE_CMSIS)
diff --git a/tinyusb/host/usbh.c b/tinyusb/host/usbh.c
index 1ff9d365e..13f08719e 100644
--- a/tinyusb/host/usbh.c
+++ b/tinyusb/host/usbh.c
@@ -178,7 +178,7 @@ tusb_error_t usbh_init(void)
 tusb_error_t usbh_control_xfer_subtask(uint8_t dev_addr, uint8_t bmRequestType, uint8_t bRequest,

                                        uint16_t wValue, uint16_t wIndex, uint16_t wLength, uint8_t* data)

 {

-  static tusb_error_t error; // FIXME cmsis-rtx use svc for OS API, error value changed after mutex release at the end of function

+  static tusb_error_t error; // FIXME [CMSIS-RTX] use svc for OS API, error value changed after mutex release at the end of function

 

   OSAL_SUBTASK_BEGIN

 

diff --git a/tinyusb/osal/osal_common.h b/tinyusb/osal/osal_common.h
index 4c551126c..9add3e877 100644
--- a/tinyusb/osal/osal_common.h
+++ b/tinyusb/osal/osal_common.h
@@ -59,7 +59,7 @@
 enum

 {

   OSAL_TIMEOUT_NOTIMEOUT    = 0,  // for use within ISR,  return immediately

-  OSAL_TIMEOUT_NORMAL       = 10*5, // default is 10 msec, FIXME CMSIS-RTX easily timeout with 10 msec

+  OSAL_TIMEOUT_NORMAL       = 10*5, // default is 10 msec, FIXME [CMSIS-RTX] easily timeout with 10 msec

   OSAL_TIMEOUT_WAIT_FOREVER = 0xFFFFFFFF

 };

 

diff --git a/vendor/cmsis_rtos_rtx/SRC/GCC/RTX_Lib_CM.uvopt b/vendor/cmsis_rtos_rtx/SRC/GCC/RTX_Lib_CM.uvopt
index 7e1e6f803..8a512d13e 100644
--- a/vendor/cmsis_rtos_rtx/SRC/GCC/RTX_Lib_CM.uvopt
+++ b/vendor/cmsis_rtos_rtx/SRC/GCC/RTX_Lib_CM.uvopt
@@ -73,7 +73,7 @@
       <OPTFL>
         <tvExp>1</tvExp>
         <tvExpOptDlg>0</tvExpOptDlg>
-        <IsCurrentTarget>1</IsCurrentTarget>
+        <IsCurrentTarget>0</IsCurrentTarget>
       </OPTFL>
       <CpuCode>255</CpuCode>
       <DllOpt>
@@ -341,7 +341,7 @@
       <OPTFL>
         <tvExp>1</tvExp>
         <tvExpOptDlg>0</tvExpOptDlg>
-        <IsCurrentTarget>0</IsCurrentTarget>
+        <IsCurrentTarget>1</IsCurrentTarget>
       </OPTFL>
       <CpuCode>255</CpuCode>
       <DllOpt>
diff --git a/vendor/freertos/FreeRTOSConfig_cm3.h b/vendor/freertos/FreeRTOSConfig_cm3.h
index 0c80d8563..4a79fd0ae 100644
--- a/vendor/freertos/FreeRTOSConfig_cm3.h
+++ b/vendor/freertos/FreeRTOSConfig_cm3.h
@@ -154,12 +154,6 @@ function can have.  Note that lower priority have numerically higher values.  */
 standard names. */

 #define xPortPendSVHandler    PendSV_Handler

 #define xPortSysTickHandler   SysTick_Handler

-

-#ifdef __CODE_RED // cr_startup_lpc176x.c use different name for SVC_Hanlder

-#define vPortSVCHandler       SVCall_Handler

-#else

 #define vPortSVCHandler       SVC_Handler

-#endif

-

 

 #endif /* FREERTOS_CONFIG_H */