fix issue with SVC_Handler SVCall_Handler name between keil & xpresso start up file. Host freertos works with lpc17xx

This commit is contained in:
hathach
2014-03-04 14:15:10 +07:00
parent c11946f318
commit 93a60641ea
8 changed files with 180 additions and 173 deletions
+1 -1
View File
@@ -10,7 +10,7 @@
#elif __CORTEX_M == 3
#include "FreeRTOSConfig_lpc175x_6x.h"
#else
#error "For LPC43XX one of CORE_M0 or CORE_M4 must be defined!"
#error "not yet supported MCU"
#endif /* ifdef CORE_M4 */
# endif /* __FREERTOS_CONFIG__H */
+7 -3
View File
@@ -149,10 +149,14 @@ function can have. Note that lower priority have numerically higher values. */
/* Definitions that map the FreeRTOS port interrupt handlers to their CMSIS
standard names. */
#define vPortSVCHandler SVCall_Handler
#define xPortPendSVHandler PendSV_Handler
#define xPortSysTickHandler SysTick_Handler
#define xPortPendSVHandler PendSV_Handler
#define xPortSysTickHandler SysTick_Handler
#ifdef __CODE_RED
#define vPortSVCHandler SVCall_Handler
#else
#define vPortSVCHandler SVC_Handler
#endif
#endif /* FREERTOS_CONFIG_H */
+17 -9
View File
@@ -315,20 +315,28 @@
//--------------------------------------------------------------------+
// TinyUSB modification
//--------------------------------------------------------------------+
#include "tusb_option.h"
#ifdef __GNUC__
#if defined __CC_ARM
#if __CORTEX_M == 4 // TODO M0 M4
#include "../portable/GCC/ARM_CM4F/portmacro.h"
#define PORTMACRO_PATH "../portable/RVDS/ARM_CM4F/portmacro.h"
#elif __CORTEX_M == 3
#include "../portable/GCC/ARM_CM3/portmacro.h"
#else
#error portmacro.h for mcu is not supported yet
#define PORTMACRO_PATH "../portable/RVDS/ARM_CM3/portmacro.h"
#endif
#elif defined __GNUC__
#if __CORTEX_M == 4 // TODO M0 M4
#define PORTMACRO_PATH "../portable/GCC/ARM_CM4F/portmacro.h"
#elif __CORTEX_M == 3
#define PORTMACRO_PATH "../portable/GCC/ARM_CM3/portmacro.h"
#endif
#else
#error portmacro.h for mcu is not supported yet
#endif
#ifndef PORTMACRO_PATH
#error portmacro.h path is not defined for this toolchain and/or MCU
#endif
#include PORTMACRO_PATH
/* Catch all to ensure portmacro.h is included in the build. Newer demos
have the path as part of the project options, rather than as relative from
the project location. If portENTER_CRITICAL() has not been defined then