andy/tinyUSB
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix issue with IAR Assembler in freertos build

Browse Source
This commit is contained in:
hathach
2014-04-28 14:59:05 +07:00
parent 05c767313d
commit b7b1d530f4
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
demos/host/host_freertos/host_freertos.uvopt
View File

@@ -606,10 +606,10 @@
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<Focus>0</Focus> <Focus>0</Focus>
<ColumnNumber>18</ColumnNumber> <ColumnNumber>0</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<TopLine>101</TopLine> <TopLine>111</TopLine>
<CurrentLine>118</CurrentLine> <CurrentLine>113</CurrentLine>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\src\main.c</PathWithFileName> <PathWithFileName>..\src\main.c</PathWithFileName>
<FilenameWithoutPath>main.c</FilenameWithoutPath> <FilenameWithoutPath>main.c</FilenameWithoutPath>

8
vendor/freertos/FreeRTOSConfig.h vendored
View File

@@ -79,11 +79,11 @@
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
// Interrupt nesting behaviour configuration. // 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 #ifdef __NVIC_PRIO_BITS
#define configPRIO_BITS __NVIC_PRIO_BITS #define configPRIO_BITS __NVIC_PRIO_BITS
#else #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 #endif
/* The lowest interrupt priority that can be used in a call to a "set priority" /* 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 // portmacro.h include path
//--------------------------------------------------------------------+ //--------------------------------------------------------------------+
#ifndef __IASMARM__ // avoid messing up with IAR
#if defined __CC_ARM #if defined __CC_ARM
#define TOOL_DIR RVDS #define TOOL_DIR RVDS
#elif defined __GNUC__ #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) #include XSTRING_(freertos/Source/portable/TOOL_DIR/ARCH_DIR/portmacro.h)
#endif
#endif /* __FREERTOS_CONFIG__H */ #endif /* __FREERTOS_CONFIG__H */