git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@768 1d2547de-c912-0410...

diff --git a/Demo/CORTEX_AT91SAM3U256_IAR/RTOSDemo.ewd b/Demo/CORTEX_AT91SAM3U256_IAR/RTOSDemo.ewd
index 9cf6a610733cd7d81feaf32523283e287844e5f5..0d4ead08382a41d512369a0e391926841f7b6c30 100644 (file)
--- a/Demo/CORTEX_AT91SAM3U256_IAR/RTOSDemo.ewd
+++ b/Demo/CORTEX_AT91SAM3U256_IAR/RTOSDemo.ewd
@@ -117,7 +117,7 @@
         </option>\r
         <option>\r
           <name>FlashLoadersV2</name>\r
-          <state>,,,,(default),</state>\r
+          <state>,,,,(default),--boot</state>\r
         </option>\r
       </data>\r
     </settings>\r
@@ -767,7 +767,7 @@
         </option>\r
         <option>\r
           <name>FlashLoadersV2</name>\r
-          <state>,,,,(default),</state>\r
+          <state>,,,,(default),--boot</state>\r
         </option>\r
       </data>\r
     </settings>\r

diff --git a/Demo/CORTEX_AT91SAM3U256_IAR/settings/RTOSDemo.dbgdt b/Demo/CORTEX_AT91SAM3U256_IAR/settings/RTOSDemo.dbgdt
index 357584ca376edd9eb6241b80bf9c32283a490e5b..f9952f935615d417568cdbb41464d35f3a492bea 100644 (file)
--- a/Demo/CORTEX_AT91SAM3U256_IAR/settings/RTOSDemo.dbgdt
+++ b/Demo/CORTEX_AT91SAM3U256_IAR/settings/RTOSDemo.dbgdt
@@ -48,20 +48,20 @@
           </Tab>\r
         </Tabs>\r
         \r
-      <SelectedTab>0</SelectedTab></Wnd0><Wnd1><Tabs><Tab><Identity>TabID-27988-1208</Identity><TabName>Debug Log</TabName><Factory>Debug-Log</Factory><Session/></Tab></Tabs><SelectedTab>0</SelectedTab></Wnd1></Windows>\r
+      <SelectedTab>0</SelectedTab></Wnd0><Wnd1><Tabs><Tab><Identity>TabID-27988-1208</Identity><TabName>Debug Log</TabName><Factory>Debug-Log</Factory><Session/></Tab></Tabs><SelectedTab>0</SelectedTab></Wnd1><Wnd2><Tabs><Tab><Identity>TabID-24197-10743</Identity><TabName>Disassembly</TabName><Factory>Disassembly</Factory><Session/></Tab></Tabs><SelectedTab>0</SelectedTab></Wnd2></Windows>\r
     <Editor>\r
       \r
       \r
       \r
       \r
-    <Pane><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\CORTEX_AT91SAM3U256_IAR\main.c</Filename><XPos>0</XPos><YPos>148</YPos><SelStart>6647</SelStart><SelEnd>6647</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Source\portable\IAR\ARM_CM3\port.c</Filename><XPos>0</XPos><YPos>155</YPos><SelStart>6219</SelStart><SelEnd>6219</SelEnd></Tab><ActiveTab>1</ActiveTab></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\CORTEX_AT91SAM3U256_IAR\main.c</Filename><XPos>0</XPos><YPos>148</YPos><SelStart>6734</SelStart><SelEnd>6734</SelEnd></Tab><ActiveTab>0</ActiveTab></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-00ab91e8><key>iaridepm.enu1</key></Toolbar-00ab91e8><Toolbar-03d251c0><key>debuggergui.enu1</key></Toolbar-03d251c0></Sizes></Row0></Top><Left><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>742</Bottom><Right>337</Right><x>-2</x><y>-2</y><xscreen>167</xscreen><yscreen>200</yscreen><sizeHorzCX>119286</sizeHorzCX><sizeHorzCY>203252</sizeHorzCY><sizeVertCX>242143</sizeVertCX><sizeVertCY>756098</sizeVertCY></Rect></Wnd0></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>198</Bottom><Right>1402</Right><x>-2</x><y>-2</y><xscreen>1404</xscreen><yscreen>200</yscreen><sizeHorzCX>1002857</sizeHorzCX><sizeHorzCY>203252</sizeHorzCY><sizeVertCX>142857</sizeVertCX><sizeVertCY>203252</sizeVertCY></Rect></Wnd1></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>\r
+    <Top><Row0><Sizes><Toolbar-00abafb0><key>iaridepm.enu1</key></Toolbar-00abafb0><Toolbar-05ecf808><key>debuggergui.enu1</key></Toolbar-05ecf808></Sizes></Row0></Top><Left><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>742</Bottom><Right>337</Right><x>-2</x><y>-2</y><xscreen>167</xscreen><yscreen>200</yscreen><sizeHorzCX>119286</sizeHorzCX><sizeHorzCY>203252</sizeHorzCY><sizeVertCX>242143</sizeVertCX><sizeVertCY>756098</sizeVertCY></Rect></Wnd0></Sizes></Row0></Left><Right><Row0><Sizes><Wnd2><Rect><Top>-2</Top><Left>-2</Left><Bottom>742</Bottom><Right>198</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>142857</sizeHorzCX><sizeHorzCY>203252</sizeHorzCY><sizeVertCX>142857</sizeVertCX><sizeVertCY>756098</sizeVertCY></Rect></Wnd2></Sizes></Row0></Right><Bottom><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>198</Bottom><Right>1402</Right><x>-2</x><y>-2</y><xscreen>1404</xscreen><yscreen>200</yscreen><sizeHorzCX>1002857</sizeHorzCX><sizeHorzCY>203252</sizeHorzCY><sizeVertCX>142857</sizeVertCX><sizeVertCY>203252</sizeVertCY></Rect></Wnd1></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>\r
   </Desktop>\r
 </Project>\r
 \r

diff --git a/Demo/CORTEX_AT91SAM3U256_IAR/settings/RTOSDemo.dni b/Demo/CORTEX_AT91SAM3U256_IAR/settings/RTOSDemo.dni
index 959ff6ced51938ff83199892f13d321f003289a4..d37b7c517b886e0d2ff36673cc0d55a66cbee7ee 100644 (file)
--- a/Demo/CORTEX_AT91SAM3U256_IAR/settings/RTOSDemo.dni
+++ b/Demo/CORTEX_AT91SAM3U256_IAR/settings/RTOSDemo.dni
@@ -1,5 +1,5 @@
 [DebugChecksum]\r
-Checksum=1342314454\r
+Checksum=-2026095219\r
 [DisAssemblyWindow]\r
 NumStates=_ 1\r
 State 1=_ 1\r
@@ -55,6 +55,13 @@ SWOInfo_ITMPortsEnabled=0x00000001
 SWOInfo_ITMPortsTermIO=0x00000001\r
 SWOInfo_ITMPortsLogFile=0x00000000\r
 SWOInfo_ITMLogFile=$PROJ_DIR$\ITM.log\r
+[Log file]\r
+LoggingEnabled=_ 0\r
+LogFile=_ ""\r
+Category=_ 0\r
+[TermIOLog]\r
+LoggingEnabled=_ 0\r
+LogFile=_ ""\r
 [DataLog]\r
 LogEnabled=0\r
 SumEnabled=0\r
@@ -78,10 +85,3 @@ Graph=0
 mode=0\r
 [Breakpoints]\r
 Count=0\r
-[Log file]\r
-LoggingEnabled=_ 0\r
-LogFile=_ ""\r
-Category=_ 0\r
-[TermIOLog]\r
-LoggingEnabled=_ 0\r
-LogFile=_ ""\r

diff --git a/Demo/CORTEX_AT91SAM3U256_IAR/settings/RTOSDemo.wsdt b/Demo/CORTEX_AT91SAM3U256_IAR/settings/RTOSDemo.wsdt
index 9e4e0b253d3fd596aadbd8b83a349d78117abaf5..2955a77ac640c198c994bd27636bebeee72cee31 100644 (file)
--- a/Demo/CORTEX_AT91SAM3U256_IAR/settings/RTOSDemo.wsdt
+++ b/Demo/CORTEX_AT91SAM3U256_IAR/settings/RTOSDemo.wsdt
@@ -17,7 +17,7 @@
     <Build><ColumnWidth0>20</ColumnWidth0><ColumnWidth1>1216</ColumnWidth1><ColumnWidth2>324</ColumnWidth2><ColumnWidth3>81</ColumnWidth3></Build><TerminalIO/><Debug-Log><ColumnWidth0>20</ColumnWidth0><ColumnWidth1>1622</ColumnWidth1></Debug-Log><Find-in-Files><ColumnWidth0>580</ColumnWidth0><ColumnWidth1>82</ColumnWidth1><ColumnWidth2>994</ColumnWidth2></Find-in-Files></Static>\r
     <Windows>\r
       \r
-    <Wnd0>\r
+    <Wnd2>\r
         <Tabs>\r
           <Tab>\r
             <Identity>TabID-16570-17725</Identity>\r
@@ -29,20 +29,20 @@
           </Tab>\r
         </Tabs>\r
         \r
-      <SelectedTab>0</SelectedTab></Wnd0><Wnd1><Tabs><Tab><Identity>TabID-13247-26794</Identity><TabName>Build</TabName><Factory>Build</Factory><Session/></Tab><Tab><Identity>TabID-4179-11901</Identity><TabName>Debug Log</TabName><Factory>Debug-Log</Factory><Session/></Tab><Tab><Identity>TabID-30005-19605</Identity><TabName>Find in Files</TabName><Factory>Find-in-Files</Factory><Session/></Tab><Tab><Identity>TabID-6552-24144</Identity><TabName>Breakpoints</TabName><Factory>Breakpoints</Factory></Tab></Tabs><SelectedTab>1</SelectedTab></Wnd1></Windows>\r
+      <SelectedTab>0</SelectedTab></Wnd2><Wnd3><Tabs><Tab><Identity>TabID-13247-26794</Identity><TabName>Build</TabName><Factory>Build</Factory><Session/></Tab><Tab><Identity>TabID-4179-11901</Identity><TabName>Debug Log</TabName><Factory>Debug-Log</Factory><Session/></Tab><Tab><Identity>TabID-30005-19605</Identity><TabName>Find in Files</TabName><Factory>Find-in-Files</Factory><Session/></Tab><Tab><Identity>TabID-6552-24144</Identity><TabName>Breakpoints</TabName><Factory>Breakpoints</Factory></Tab></Tabs><SelectedTab>0</SelectedTab></Wnd3></Windows>\r
     <Editor>\r
       \r
       \r
       \r
       \r
-    <Pane><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\CORTEX_AT91SAM3U256_IAR\main.c</Filename><XPos>0</XPos><YPos>46</YPos><SelStart>6647</SelStart><SelEnd>6647</SelEnd></Tab><ActiveTab>0</ActiveTab></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\CORTEX_AT91SAM3U256_IAR\main.c</Filename><XPos>0</XPos><YPos>148</YPos><SelStart>6734</SelStart><SelEnd>6734</SelEnd></Tab><ActiveTab>0</ActiveTab></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-00ab9de0><key>iaridepm.enu1</key></Toolbar-00ab9de0></Sizes></Row0></Top><Left><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>671</Bottom><Right>276</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>142857</sizeHorzCX><sizeHorzCY>203252</sizeHorzCY><sizeVertCX>198571</sizeVertCX><sizeVertCY>683943</sizeVertCY></Rect></Wnd0></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>269</Bottom><Right>1402</Right><x>-2</x><y>-2</y><xscreen>1404</xscreen><yscreen>271</yscreen><sizeHorzCX>1002857</sizeHorzCX><sizeHorzCY>275407</sizeHorzCY><sizeVertCX>142857</sizeVertCX><sizeVertCY>203252</sizeVertCY></Rect></Wnd1></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>\r
+    <Top><Row0><Sizes><Toolbar-00abafb0><key>iaridepm.enu1</key></Toolbar-00abafb0></Sizes></Row0></Top><Left><Row0><Sizes><Wnd2><Rect><Top>-2</Top><Left>-2</Left><Bottom>671</Bottom><Right>276</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>142857</sizeHorzCX><sizeHorzCY>203252</sizeHorzCY><sizeVertCX>198571</sizeVertCX><sizeVertCY>683943</sizeVertCY></Rect></Wnd2></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>269</Bottom><Right>1402</Right><x>-2</x><y>-2</y><xscreen>1404</xscreen><yscreen>271</yscreen><sizeHorzCX>1002857</sizeHorzCX><sizeHorzCY>275407</sizeHorzCY><sizeVertCX>142857</sizeVertCX><sizeVertCY>203252</sizeVertCY></Rect></Wnd3></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>\r
   </Desktop>\r
 </Workspace>\r
 \r

diff --git a/Demo/CORTEX_AT91SAM3U256_IAR/system/board_lowlevel.c b/Demo/CORTEX_AT91SAM3U256_IAR/system/board_lowlevel.c
index fd4adf7327094f1f7cee2992e374f238ab3fc578..c2d644e97d2448d4c5ebb16fd8a4ef0d4cae27ad 100644 (file)
--- a/Demo/CORTEX_AT91SAM3U256_IAR/system/board_lowlevel.c
+++ b/Demo/CORTEX_AT91SAM3U256_IAR/system/board_lowlevel.c
@@ -113,17 +113,23 @@ void LowLevelInit(void)
 \r
     /* Initialize main oscillator\r
      ****************************/\r
-    if(!(AT91C_BASE_PMC->PMC_MOR & AT91C_CKGR_MOSCSEL))\r
+\r
+       if(!(AT91C_BASE_PMC->PMC_MOR & AT91C_CKGR_MOSCSEL))\r
+       {\r
+               AT91C_BASE_PMC->PMC_MOR = (0x37 << 16) | BOARD_OSCOUNT | AT91C_CKGR_MOSCRCEN | AT91C_CKGR_MOSCXTEN;\r
+               timeout = 0;\r
+               while (!(AT91C_BASE_PMC->PMC_SR & AT91C_PMC_MOSCXTS) && (timeout++ < CLOCK_TIMEOUT));\r
+       }       \r
+       else\r
     {\r
+               AT91C_BASE_PMC->PMC_MOR = (0x37 << 16) | BOARD_OSCOUNT | AT91C_CKGR_MOSCRCEN | AT91C_CKGR_MOSCXTEN | AT91C_CKGR_MOSCSEL;\r
+        timeout = 0;\r
+        while (!(AT91C_BASE_PMC->PMC_SR & AT91C_PMC_MOSCRCS) && (timeout++ < CLOCK_TIMEOUT));\r
         AT91C_BASE_PMC->PMC_MOR = (0x37 << 16) | BOARD_OSCOUNT | AT91C_CKGR_MOSCRCEN | AT91C_CKGR_MOSCXTEN;\r
         timeout = 0;\r
-        while (!(AT91C_BASE_PMC->PMC_SR & AT91C_PMC_MOSCXTS) && (timeout++ < CLOCK_TIMEOUT));\r
+        while (!(AT91C_BASE_PMC->PMC_SR & AT91C_PMC_MOSCSELS) && (timeout++ < CLOCK_TIMEOUT));\r
     }\r
 \r
-//    AT91C_BASE_PIOB->PIO_CODR = 1 << 1;\r
-//    AT91C_BASE_PIOB->PIO_OER =  1 << 1;\r
-//    AT91C_BASE_PIOB->PIO_PER =  1 << 1;\r
-\r
     /* Switch to moscsel */\r
     AT91C_BASE_PMC->PMC_MOR = (0x37 << 16) | BOARD_OSCOUNT | AT91C_CKGR_MOSCRCEN | AT91C_CKGR_MOSCXTEN | AT91C_CKGR_MOSCSEL;\r
     timeout = 0;\r

diff --git a/Demo/CORTEX_AT91SAM3U256_IAR/system/flash.icf b/Demo/CORTEX_AT91SAM3U256_IAR/system/flash.icf
index a7b3a93016b6700417837f65ad7dd46fe9170f0f..78c758eaab4b27313651178a609db44d6ee23334 100644 (file)
--- a/Demo/CORTEX_AT91SAM3U256_IAR/system/flash.icf
+++ b/Demo/CORTEX_AT91SAM3U256_IAR/system/flash.icf
@@ -13,8 +13,8 @@ define symbol __ICFEDIT_region_ROM0_end__    = 0x0009FFFF;
 define symbol __ICFEDIT_region_ROM1_start__  = 0x00100000;\r
 define symbol __ICFEDIT_region_ROM1_end__    = 0x0011FFFF;\r
 /*-Sizes-*/\r
-define symbol __ICFEDIT_size_cstack__        = 0x800;\r
-define symbol __ICFEDIT_size_heap__          = 0x200;\r
+define symbol __ICFEDIT_size_cstack__ = 0x200;\r
+define symbol __ICFEDIT_size_heap__   = 0x4;\r
 /*-Specials-*/\r
 /*define symbol __ICFEDIT_region_RAM_VECT_start__ = __ICFEDIT_region_RAM0_start__;*/ /*Referenced for CMSIS*/\r
 /*define symbol __ICFEDIT_size_vectors__          = 0x100;*/ /*Referenced for CMSIS*/\r