diff options
| author | hathach <[email protected]> | 2014-04-28 14:59:05 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2014-04-28 14:59:05 +0700 |
| commit | b7b1d530f4a7182d87f2438637c9fcd21a0cb51f (patch) | |
| tree | 91bdfe68fcadf45b1d3054bb442923deba297be2 | |
| parent | 05c767313d0efd10d5b07b5b2f9b3d69a361075d (diff) | |
fix issue with IAR Assembler in freertos build
| -rw-r--r-- | demos/host/host_freertos/host_freertos.uvopt | 6 | ||||
| -rw-r--r-- | vendor/freertos/FreeRTOSConfig.h | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/demos/host/host_freertos/host_freertos.uvopt b/demos/host/host_freertos/host_freertos.uvopt index 1f80f8ae3..5af4f4f3e 100644 --- a/demos/host/host_freertos/host_freertos.uvopt +++ b/demos/host/host_freertos/host_freertos.uvopt @@ -606,10 +606,10 @@ <FileType>1</FileType> <tvExp>0</tvExp> <Focus>0</Focus> - <ColumnNumber>18</ColumnNumber> + <ColumnNumber>0</ColumnNumber> <tvExpOptDlg>0</tvExpOptDlg> - <TopLine>101</TopLine> - <CurrentLine>118</CurrentLine> + <TopLine>111</TopLine> + <CurrentLine>113</CurrentLine> <bDave2>0</bDave2> <PathWithFileName>..\src\main.c</PathWithFileName> <FilenameWithoutPath>main.c</FilenameWithoutPath> diff --git a/vendor/freertos/FreeRTOSConfig.h b/vendor/freertos/FreeRTOSConfig.h index 36246e853..17a14a550 100644 --- a/vendor/freertos/FreeRTOSConfig.h +++ b/vendor/freertos/FreeRTOSConfig.h @@ -79,11 +79,11 @@ //--------------------------------------------------------------------+ // Interrupt nesting behaviour configuration. //--------------------------------------------------------------------+ -/* Cortex-M specific definitions. */ +/* Cortex-M specific definitions. __NVIC_PRIO_BITS is defined in core_cmx.h */ #ifdef __NVIC_PRIO_BITS #define configPRIO_BITS __NVIC_PRIO_BITS #else - #define configPRIO_BITS 5 /* 32 priority levels */ + #define configPRIO_BITS 5 // 32 priority levels FIXME IAR Assembler will wrongly get this default value #endif /* The lowest interrupt priority that can be used in a call to a "set priority" @@ -107,6 +107,8 @@ See http://www.FreeRTOS.org/RTOS-Cortex-M3-M4.html. */ //--------------------------------------------------------------------+ // portmacro.h include path //--------------------------------------------------------------------+ +#ifndef __IASMARM__ // avoid messing up with IAR + #if defined __CC_ARM #define TOOL_DIR RVDS #elif defined __GNUC__ @@ -129,4 +131,6 @@ See http://www.FreeRTOS.org/RTOS-Cortex-M3-M4.html. */ #include XSTRING_(freertos/Source/portable/TOOL_DIR/ARCH_DIR/portmacro.h) +#endif + #endif /* __FREERTOS_CONFIG__H */ |