Update to the latest compiler version.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@593 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

diff --git a/Demo/AVR_ATMega323_IAR/serial/serial.c b/Demo/AVR_ATMega323_IAR/serial/serial.c
index c741ee3ed24b7773d4e6ed6a55cea3f6ee82044c..8e47c17a4893387c1259fb5dd53bbcf8464bb1dc 100644 (file)
--- a/Demo/AVR_ATMega323_IAR/serial/serial.c
+++ b/Demo/AVR_ATMega323_IAR/serial/serial.c
@@ -19,7 +19,7 @@
 \r
        A special exception to the GPL can be applied should you wish to distribute\r
        a combined work that includes FreeRTOS.org, without being obliged to provide\r
-       the source code for any proprietary components.  See the licensing section \r
+       the source code for any proprietary components.  See the licensing section\r
        of http://www.FreeRTOS.org for full details of how and when the exception\r
        can be applied.\r
 \r
@@ -37,13 +37,13 @@
        Please ensure to read the configuration and relevant port sections of the\r
        online documentation.\r
 \r
-       http://www.FreeRTOS.org - Documentation, latest information, license and \r
+       http://www.FreeRTOS.org - Documentation, latest information, license and\r
        contact details.\r
 \r
-       http://www.SafeRTOS.com - A version that is certified for use in safety \r
+       http://www.SafeRTOS.com - A version that is certified for use in safety\r
        critical systems.\r
 \r
-       http://www.OpenRTOS.com - Commercial support, development, porting, \r
+       http://www.OpenRTOS.com - Commercial support, development, porting,\r
        licensing and training services.\r
 */\r
 \r
@@ -69,8 +69,8 @@
 #define serUCSRC_SELECT                                        ( ( unsigned portCHAR ) 0x80 )\r
 #define serEIGHT_DATA_BITS                             ( ( unsigned portCHAR ) 0x06 )\r
 \r
-static xQueueHandle xRxedChars; \r
-static xQueueHandle xCharsForTx; \r
+static xQueueHandle xRxedChars;\r
+static xQueueHandle xCharsForTx;\r
 \r
 #define vInterruptOn()                                                                         \\r
 {                                                                                                                      \\r
@@ -180,15 +180,14 @@ unsigned portCHAR ucByte;
 \r
 __interrupt void SIG_UART_RECV( void )\r
 {\r
-signed portCHAR cChar;\r
-portBASE_TYPE xHigherPriorityTaskWoken = pdFALSE;\r
+signed portCHAR ucChar, xHigherPriorityTaskWoken = pdFALSE;\r
 \r
        /* Get the character and post it on the queue of Rxed characters.\r
        If the post causes a task to wake force a context switch as the woken task\r
        may have a higher priority than the task we have interrupted. */\r
-       cChar = UDR;\r
+       ucChar = UDR;\r
 \r
-       xQueueSendFromISR( xRxedChars, &cChar, &xHigherPriorityTaskWoken );\r
+       xQueueSendFromISR( xRxedChars, &ucChar, &xHigherPriorityTaskWoken );\r
 \r
        if( xHigherPriorityTaskWoken != pdFALSE )\r
        {\r

diff --git a/Demo/AVR_ATMega323_IAR/settings/rtosdemo.wsdt b/Demo/AVR_ATMega323_IAR/settings/rtosdemo.wsdt
index 9f6c956dfcf9b2ff3c71ede1d8389db12cc05390..f4f1d0f59a649e31d002f62bdfb9b6748d3798ec 100644 (file)
--- a/Demo/AVR_ATMega323_IAR/settings/rtosdemo.wsdt
+++ b/Demo/AVR_ATMega323_IAR/settings/rtosdemo.wsdt
@@ -12,7 +12,7 @@
           \r
           \r
           \r
-        <Column0>246</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths>\r
+        <Column0>310</Column0><Column1>27</Column1><Column2>27</Column2><Column3>27</Column3></ColumnWidths>\r
       </Workspace>\r
     <Build><ColumnWidth0>20</ColumnWidth0><ColumnWidth1>1153</ColumnWidth1><ColumnWidth2>307</ColumnWidth2><ColumnWidth3>76</ColumnWidth3></Build><Debug-Log/></Static>\r
     <Windows>\r
@@ -35,14 +35,14 @@
       \r
       \r
       \r
-    <Pane><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\Demo\AVR_ATMega323_IAR\regtest.c</Filename><XPos>0</XPos><YPos>190</YPos><SelStart>6619</SelStart><SelEnd>6619</SelEnd></Tab><ActiveTab>0</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\Demo\AVR_ATMega323_IAR\main.c</Filename><XPos>0</XPos><YPos>123</YPos><SelStart>5500</SelStart><SelEnd>5500</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\Demo\Common\Minimal\crflash.c</Filename><XPos>0</XPos><YPos>170</YPos><SelStart>6807</SelStart><SelEnd>6807</SelEnd></Tab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>\r
+    <Pane><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\AVR_ATMega323_IAR\serial\serial.c</Filename><XPos>0</XPos><YPos>174</YPos><SelStart>6386</SelStart><SelEnd>6386</SelEnd></Tab><ActiveTab>0</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Source\include\queue.h</Filename><XPos>45</XPos><YPos>975</YPos><SelStart>33703</SelStart><SelEnd>33727</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Source\queue.c</Filename><XPos>0</XPos><YPos>814</YPos><SelStart>28555</SelStart><SelEnd>28555</SelEnd></Tab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>\r
     <Positions>\r
       \r
       \r
       \r
       \r
       \r
-    <Top><Row0><Sizes><Toolbar-00a0bb70><key>iaridepm1</key></Toolbar-00a0bb70></Sizes></Row0></Top><Left><Row0><Sizes><Wnd2><Rect><Top>-2</Top><Left>-2</Left><Bottom>619</Bottom><Right>320</Right><x>-2</x><y>-2</y><xscreen>162</xscreen><yscreen>161</yscreen><sizeHorzCX>115714</sizeHorzCX><sizeHorzCY>165638</sizeHorzCY><sizeVertCX>230000</sizeVertCX><sizeVertCY>638889</sizeVertCY></Rect></Wnd2></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>307</Bottom><Right>1402</Right><x>-2</x><y>-2</y><xscreen>1404</xscreen><yscreen>309</yscreen><sizeHorzCX>1002857</sizeHorzCX><sizeHorzCY>317901</sizeHorzCY><sizeVertCX>116429</sizeVertCX><sizeVertCY>166667</sizeVertCY></Rect></Wnd3></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>\r
+    <Top><Row0><Sizes><Toolbar-0088f608><key>iaridepm.enu1</key></Toolbar-0088f608></Sizes></Row0></Top><Left><Row0><Sizes><Wnd2><Rect><Top>-2</Top><Left>-2</Left><Bottom>628</Bottom><Right>384</Right><x>-2</x><y>-2</y><xscreen>194</xscreen><yscreen>163</yscreen><sizeHorzCX>115476</sizeHorzCX><sizeHorzCY>165988</sizeHorzCY><sizeVertCX>229762</sizeVertCX><sizeVertCY>641548</sizeVertCY></Rect></Wnd2></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>310</Bottom><Right>1682</Right><x>-2</x><y>-2</y><xscreen>1684</xscreen><yscreen>312</yscreen><sizeHorzCX>1002381</sizeHorzCX><sizeHorzCY>317719</sizeHorzCY><sizeVertCX>116667</sizeVertCX><sizeVertCY>167006</sizeVertCY></Rect></Wnd3></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>\r
   </Desktop>\r
 </Workspace>\r
 \r