fix cmsis rtx warning

IAR host cmsis rtx work with lpc1769
This commit is contained in:
hathach 2014-03-20 13:32:50 +07:00
parent ae2ec5126f
commit 34c60cdca3
3 changed files with 46 additions and 34 deletions

View File

@ -1091,7 +1091,8 @@
<name>CCDefines</name> <name>CCDefines</name>
<state>TUSB_CFG_MCU=MCU_LPC175X_6X</state> <state>TUSB_CFG_MCU=MCU_LPC175X_6X</state>
<state>BOARD=BOARD_LPCXPRESSO1769</state> <state>BOARD=BOARD_LPCXPRESSO1769</state>
<state>TUSB_CFG_OS=TUSB_OS_NONE</state> <state>TUSB_CFG_OS=TUSB_OS_CMSIS_RTX</state>
<state>TUSB_CFG_OS_TASK_PRIO=osPriorityRealtime</state>
</option> </option>
<option> <option>
<name>CCPreprocFile</name> <name>CCPreprocFile</name>
@ -1226,6 +1227,7 @@
<state>$PROJ_DIR$\..\..\..\boards</state> <state>$PROJ_DIR$\..\..\..\boards</state>
<state>$PROJ_DIR$\..\..\..\tinyusb</state> <state>$PROJ_DIR$\..\..\..\tinyusb</state>
<state>$PROJ_DIR$\..\..\..\vendor\fatfs</state> <state>$PROJ_DIR$\..\..\..\vendor\fatfs</state>
<state>$PROJ_DIR$\..\..\..\vendor\cmsis_rtos_rtx\INC</state>
</option> </option>
<option> <option>
<name>CCStdIncCheck</name> <name>CCStdIncCheck</name>
@ -2818,6 +2820,37 @@
<name>$PROJ_DIR$\..\..\..\boards\printf_retarget.c</name> <name>$PROJ_DIR$\..\..\..\boards\printf_retarget.c</name>
</file> </file>
</group> </group>
<group>
<name>cmsis-rtx</name>
<file>
<name>$PROJ_DIR$\..\..\..\vendor\cmsis_rtos_rtx\LIB\IAR\RTX_CM3.a</name>
<excluded>
<configuration>Board EA4357</configuration>
<configuration>Board NGX4330</configuration>
</excluded>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\vendor\cmsis_rtos_rtx\LIB\IAR\RTX_CM4.a</name>
<excluded>
<configuration>Board LPCXpresso1769</configuration>
</excluded>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\vendor\cmsis_rtos_rtx\RTX_Conf_CM.c</name>
</file>
</group>
<group>
<name>fatfs</name>
<file>
<name>$PROJ_DIR$\..\..\..\vendor\fatfs\ccsbcs.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\vendor\fatfs\diskio.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\vendor\fatfs\ff.c</name>
</file>
</group>
<group> <group>
<name>mcu</name> <name>mcu</name>
<group> <group>
@ -2873,27 +2906,6 @@
</file> </file>
</group> </group>
</group> </group>
<group>
<name>cmsis-rtx</name>
<file>
<name>$PROJ_DIR$\..\..\..\vendor\cmsis_rtos_rtx\LIB\IAR\RTX_CM4.a</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\vendor\cmsis_rtos_rtx\RTX_Conf_CM.c</name>
</file>
</group>
<group>
<name>fatfs</name>
<file>
<name>$PROJ_DIR$\..\..\..\vendor\fatfs\ccsbcs.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\vendor\fatfs\diskio.c</name>
</file>
<file>
<name>$PROJ_DIR$\..\..\..\vendor\fatfs\ff.c</name>
</file>
</group>
<group> <group>
<name>tinyusb</name> <name>tinyusb</name>
<group> <group>

View File

@ -599,7 +599,7 @@
<aSer4>1</aSer4> <aSer4>1</aSer4>
<StkLoc>0</StkLoc> <StkLoc>0</StkLoc>
<TrcWin>0</TrcWin> <TrcWin>0</TrcWin>
<newCpu>1</newCpu> <newCpu>0</newCpu>
<uProt>0</uProt> <uProt>0</uProt>
</DebugFlag> </DebugFlag>
<Tracepoint> <Tracepoint>
@ -632,10 +632,10 @@
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<Focus>0</Focus> <Focus>0</Focus>
<ColumnNumber>20</ColumnNumber> <ColumnNumber>64</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<TopLine>2</TopLine> <TopLine>57</TopLine>
<CurrentLine>3</CurrentLine> <CurrentLine>64</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>
@ -666,7 +666,7 @@
<Focus>0</Focus> <Focus>0</Focus>
<ColumnNumber>48</ColumnNumber> <ColumnNumber>48</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<TopLine>101</TopLine> <TopLine>103</TopLine>
<CurrentLine>107</CurrentLine> <CurrentLine>107</CurrentLine>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\src\keyboard_app.c</PathWithFileName> <PathWithFileName>..\src\keyboard_app.c</PathWithFileName>
@ -714,7 +714,7 @@
<Focus>0</Focus> <Focus>0</Focus>
<ColumnNumber>0</ColumnNumber> <ColumnNumber>0</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<TopLine>141</TopLine> <TopLine>143</TopLine>
<CurrentLine>145</CurrentLine> <CurrentLine>145</CurrentLine>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\src\msc_app.c</PathWithFileName> <PathWithFileName>..\src\msc_app.c</PathWithFileName>
@ -986,7 +986,7 @@
<Focus>0</Focus> <Focus>0</Focus>
<ColumnNumber>17</ColumnNumber> <ColumnNumber>17</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<TopLine>368</TopLine> <TopLine>370</TopLine>
<CurrentLine>373</CurrentLine> <CurrentLine>373</CurrentLine>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\..\..\tinyusb\host\usbh.c</PathWithFileName> <PathWithFileName>..\..\..\tinyusb\host\usbh.c</PathWithFileName>
@ -1346,7 +1346,7 @@
<Focus>0</Focus> <Focus>0</Focus>
<ColumnNumber>0</ColumnNumber> <ColumnNumber>0</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<TopLine>212</TopLine> <TopLine>214</TopLine>
<CurrentLine>218</CurrentLine> <CurrentLine>218</CurrentLine>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\..\..\vendor\cmsis_rtos_rtx\RTX_Conf_CM.c</PathWithFileName> <PathWithFileName>..\..\..\vendor\cmsis_rtos_rtx\RTX_Conf_CM.c</PathWithFileName>
@ -1522,7 +1522,7 @@
<Focus>0</Focus> <Focus>0</Focus>
<ColumnNumber>68</ColumnNumber> <ColumnNumber>68</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<TopLine>115</TopLine> <TopLine>117</TopLine>
<CurrentLine>120</CurrentLine> <CurrentLine>120</CurrentLine>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\system_LPC43xx.c</PathWithFileName> <PathWithFileName>..\..\..\mcu\lpc43xx\CMSIS_LPC43xx_DriverLib\src\system_LPC43xx.c</PathWithFileName>
@ -1554,7 +1554,7 @@
<Focus>0</Focus> <Focus>0</Focus>
<ColumnNumber>25</ColumnNumber> <ColumnNumber>25</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<TopLine>161</TopLine> <TopLine>163</TopLine>
<CurrentLine>166</CurrentLine> <CurrentLine>166</CurrentLine>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\..\..\mcu\lpc43xx\keil\startup_LPC43xx.s</PathWithFileName> <PathWithFileName>..\..\..\mcu\lpc43xx\keil\startup_LPC43xx.s</PathWithFileName>
@ -1658,7 +1658,7 @@
<Focus>0</Focus> <Focus>0</Focus>
<ColumnNumber>22</ColumnNumber> <ColumnNumber>22</ColumnNumber>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<TopLine>123</TopLine> <TopLine>125</TopLine>
<CurrentLine>128</CurrentLine> <CurrentLine>128</CurrentLine>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\..\..\mcu\lpc175x_6x\keil\startup_LPC17xx.s</PathWithFileName> <PathWithFileName>..\..\..\mcu\lpc175x_6x\keil\startup_LPC17xx.s</PathWithFileName>

View File

@ -64,7 +64,7 @@
typedef osThreadDef_t osal_task_t; typedef osThreadDef_t osal_task_t;
#define OSAL_TASK_DEF(task_code, task_stack_depth, task_prio) \ #define OSAL_TASK_DEF(task_code, task_stack_depth, task_prio) \
osThreadDef(task_code, task_prio, 1, task_stack_depth*4) // stack depth is in bytes osThreadDef(task_code, (osPriority) task_prio, 1, task_stack_depth*4) // stack depth is in bytes
#define OSAL_TASK_REF(task_name) osThread(task_name) #define OSAL_TASK_REF(task_name) osThread(task_name)