diff --git a/demos/device/device_freertos/.cproject b/demos/device/device_freertos/.cproject index 80c56e76..ff991ee8 100644 --- a/demos/device/device_freertos/.cproject +++ b/demos/device/device_freertos/.cproject @@ -1,25 +1,23 @@ - - - + - + - - + + @@ -95,25 +93,24 @@ - - + - - + + @@ -191,25 +188,24 @@ - - + - - + + @@ -291,25 +287,24 @@ - - + - - + + @@ -386,25 +381,24 @@ - - + - - + + @@ -484,25 +478,24 @@ - - + - - + + @@ -578,7 +571,6 @@ - diff --git a/demos/host/host_freertos/.cproject b/demos/host/host_freertos/.cproject index 2591b50d..d8d02ed1 100644 --- a/demos/host/host_freertos/.cproject +++ b/demos/host/host_freertos/.cproject @@ -1,25 +1,23 @@ - - - + - + - - + + @@ -99,25 +97,24 @@ - - + - - + + @@ -197,7 +194,6 @@ - @@ -365,43 +361,42 @@ - + - - + + - - + - - + + @@ -481,7 +476,6 @@ - diff --git a/vendor/freertos/FreeRTOSConfig.h b/vendor/freertos/FreeRTOSConfig.h index c4188dc2..e2378234 100644 --- a/vendor/freertos/FreeRTOSConfig.h +++ b/vendor/freertos/FreeRTOSConfig.h @@ -1,31 +1,15 @@ #ifndef __FREERTOS_CONFIG__H #define __FREERTOS_CONFIG__H +#ifndef __IASMARM__ +// IAR assembler "compile" portarm.s need to include this file but cannot understand many other headers. #include "hal/hal.h" - -#ifndef __IASMARM__ // IAR assblemer portarm.s need to include this file but cannot understand - -//#include "LPC43xx.h" -//#include "core_cm4.h" -//#include "lpc43xx_cgu.h" -#include "hal/hal.h" - -#endif - -/*----------------------------------------------------------- - * See http://www.freertos.org/a00110.html. - *----------------------------------------------------------*/ - -#if __CORTEX_M == 4 - -#elif __CORTEX_M == 3 - -#elif __CORTEX_M == 0 - -#else - #error "not yet supported MCU" +#include "common/assertion.h" #endif +//--------------------------------------------------------------------+ +// See http://www.freertos.org/a00110.html. +//--------------------------------------------------------------------+ #define configUSE_PREEMPTION 1 #define configCPU_CLOCK_HZ ( SystemCoreClock ) //#define configCPU_CLOCK_HZ ( CGU_GetPCLKFrequency(CGU_PERIPHERAL_M4CORE)) @@ -88,7 +72,9 @@ #define xPortSysTickHandler SysTick_Handler #define vPortSVCHandler SVC_Handler -/* Interrupt nesting behaviour configuration. */ +//--------------------------------------------------------------------+ +// Interrupt nesting behaviour configuration. +//--------------------------------------------------------------------+ /* Cortex-M specific definitions. */ #ifdef __NVIC_PRIO_BITS #define configPRIO_BITS __NVIC_PRIO_BITS @@ -114,4 +100,16 @@ to all Cortex-M ports, and do not rely on any particular library functions. */ See http://www.FreeRTOS.org/RTOS-Cortex-M3-M4.html. */ #define configMAX_SYSCALL_INTERRUPT_PRIORITY ( configLIBRARY_MAX_SYSCALL_INTERRUPT_PRIORITY << (8 - configPRIO_BITS) ) +#if 0 +#if __CORTEX_M == 4 + +#elif __CORTEX_M == 3 + +#elif __CORTEX_M == 0 + +#else + #error "not yet supported MCU" +#endif +#endif + #endif /* __FREERTOS_CONFIG__H */