]> git.sur5r.net Git - freertos/commitdiff
projects / freertos / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9eb744f)
Update to the latest compiler version.
authorRichardBarry <RichardBarry@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>
Wed, 3 Dec 2008 15:09:01 +0000 (15:09 +0000)
committerRichardBarry <RichardBarry@1d2547de-c912-0410-9cb9-b8ca96c0e9e2>
Wed, 3 Dec 2008 15:09:01 +0000 (15:09 +0000)
git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@594 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

Demo/AVR_ATMega323_IAR/rtosdemo.ewd patch | blob | history
Demo/AVR_ATMega323_IAR/rtosdemo.ewp patch | blob | history
Demo/AVR_ATMega323_IAR/settings/rtosdemo.wsdt patch | blob | history

diff --git a/Demo/AVR_ATMega323_IAR/rtosdemo.ewd b/Demo/AVR_ATMega323_IAR/rtosdemo.ewd
index 736675fdb5b31e39e476474956d7343991331e04..2e87e9a77641d525a2c76c4faa7558a1a2bbbfe1 100644 (file)
--- a/Demo/AVR_ATMega323_IAR/rtosdemo.ewd
+++ b/Demo/AVR_ATMega323_IAR/rtosdemo.ewd
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>\r
 \r
 <project>\r
-  <fileVersion>1</fileVersion>\r
+  <fileVersion>2</fileVersion>\r
   <configuration>\r
     <name>Debug</name>\r
     <toolchain>\r
@@ -404,9 +404,9 @@
     </settings>\r
     <settings>\r
       <name>JTAGICEMKIIAVR</name>\r
-      <archiveVersion>2</archiveVersion>\r
+      <archiveVersion>3</archiveVersion>\r
       <data>\r
-        <version>4</version>\r
+        <version>5</version>\r
         <wantNonLocal>1</wantNonLocal>\r
         <debug>1</debug>\r
         <option>\r
@@ -534,11 +534,121 @@
           <state>0</state>\r
         </option>\r
         <option>\r
-          <name>OJTAGICEMKIIAVRCommunication</name>\r
+          <name>OJTAGICEMKIIAVRJtagSoftwareBreak</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>ExitBreakpointP7</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>PutcharBreakpointP7</name>\r
           <state>1</state>\r
         </option>\r
         <option>\r
-          <name>OJTAGICEMKIIAVRJtagSoftwareBreak</name>\r
+          <name>GetcharBreakpointP7</name>\r
+          <state>1</state>\r
+        </option>\r
+        <option>\r
+          <name>OJTAGICEMKIIAVRCommunicationNew</name>\r
+          <state>2</state>\r
+        </option>\r
+        <option>\r
+          <name>OJTAGICEMKIIAVRCommunicationUsbEditId</name>\r
+          <state></state>\r
+        </option>\r
+      </data>\r
+    </settings>\r
+    <settings>\r
+      <name>DRAGONAVR</name>\r
+      <archiveVersion>1</archiveVersion>\r
+      <data>\r
+        <version>1</version>\r
+        <wantNonLocal>1</wantNonLocal>\r
+        <debug>1</debug>\r
+        <option>\r
+          <name>ODRAGONAVRDriver</name>\r
+          <state>1</state>\r
+        </option>\r
+        <option>\r
+          <name>ODRAGONAVRExtraOptions</name>\r
+          <state></state>\r
+        </option>\r
+        <option>\r
+          <name>ODRAGONAVRExtraOptionsCheck</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>ODRAGONAVRDoLogfile</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>ODRAGONAVRLogFile</name>\r
+          <state>cspycomm.log</state>\r
+        </option>\r
+        <option>\r
+          <name>ODRAGONAVRJtagIceSuppLoad</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>ODRAGONAVRJtagIceConsCheck</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>ODRAGONAVRJtagIceJtagFreqRadio</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>ODRAGONAVRJtagIceJtagFreqManually</name>\r
+          <state>100000</state>\r
+        </option>\r
+        <option>\r
+          <name>ODRAGONAVRJtagIceJtagFreq</name>\r
+          <version>0</version>\r
+          <state>8</state>\r
+        </option>\r
+        <option>\r
+          <name>ODRAGONAVRJtagIceJtagDeviceBefore</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>ODRAGONAVRJtagIceJtagDeviceAfter</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>ODRAGONAVRJtagIceJtagInstrBitsBefore</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>ODRAGONAVRJtagIceJtagInstrBitsAfter</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>ODRAGONAVRJtagIceDaisyChain</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>ODRAGONAVRJtagDebugTimers</name>\r
+          <state>1</state>\r
+        </option>\r
+        <option>\r
+          <name>ODRAGONAVRJtagDebugEeprom</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>ODRAGONAVRJtagDebugReset</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>ODRAGONAVRJtagDebugFuses</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>ODRAGONAVRJtagIcedownloadToData</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>ODRAGONAVRJtagSoftwareBreak</name>\r
           <state>0</state>\r
         </option>\r
         <option>\r
@@ -553,6 +663,14 @@
           <name>GetcharBreakpointP7</name>\r
           <state>1</state>\r
         </option>\r
+        <option>\r
+          <name>ODRAGONAVRCommunicationNew</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>ODRAGONAVRCommunicationUsbEditId</name>\r
+          <state></state>\r
+        </option>\r
       </data>\r
     </settings>\r
     <settings>\r
@@ -619,19 +737,27 @@
     </settings>\r
     <debuggerPlugins>\r
       <plugin>\r
-        <file>$EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ewplugin</file>\r
+        <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-KA-CSpy.ewplugin</file>\r
+        <loadFlag>0</loadFlag>\r
+      </plugin>\r
+      <plugin>\r
+        <file>$EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin</file>\r
         <loadFlag>1</loadFlag>\r
       </plugin>\r
       <plugin>\r
-        <file>$EW_DIR$\common\plugins\Orti\Orti.ewplugin</file>\r
+        <file>$EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin</file>\r
         <loadFlag>0</loadFlag>\r
       </plugin>\r
       <plugin>\r
-        <file>$EW_DIR$\common\plugins\Profiling\Profiling.ewplugin</file>\r
+        <file>$EW_DIR$\common\plugins\Profiling\Profiling.ENU.ewplugin</file>\r
+        <loadFlag>1</loadFlag>\r
+      </plugin>\r
+      <plugin>\r
+        <file>$EW_DIR$\common\plugins\Stack\Stack.ENU.ewplugin</file>\r
         <loadFlag>1</loadFlag>\r
       </plugin>\r
       <plugin>\r
-        <file>$EW_DIR$\common\plugins\Stack\stack.ewplugin</file>\r
+        <file>$EW_DIR$\common\plugins\SymList\SymList.ENU.ewplugin</file>\r
         <loadFlag>1</loadFlag>\r
       </plugin>\r
     </debuggerPlugins>\r
diff --git a/Demo/AVR_ATMega323_IAR/rtosdemo.ewp b/Demo/AVR_ATMega323_IAR/rtosdemo.ewp
index c1b517e0df217bb220e79f817933fc82e1d28b15..3b2bcc5bd20e05f83bb71b517443c0f0ad774923 100644 (file)
--- a/Demo/AVR_ATMega323_IAR/rtosdemo.ewp
+++ b/Demo/AVR_ATMega323_IAR/rtosdemo.ewp
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="iso-8859-1"?>\r
 \r
 <project>\r
-  <fileVersion>1</fileVersion>\r
+  <fileVersion>2</fileVersion>\r
   <configuration>\r
     <name>Debug</name>\r
     <toolchain>\r
@@ -10,9 +10,9 @@
     <debug>1</debug>\r
     <settings>\r
       <name>General</name>\r
-      <archiveVersion>3</archiveVersion>\r
+      <archiveVersion>5</archiveVersion>\r
       <data>\r
-        <version>6</version>\r
+        <version>7</version>\r
         <wantNonLocal>1</wantNonLocal>\r
         <debug>1</debug>\r
         <option>\r
@@ -127,8 +127,8 @@
         </option>\r
         <option>\r
           <name>New Variant Processor</name>\r
-          <version>15</version>\r
-          <state>47</state>\r
+          <version>24</version>\r
+          <state>56</state>\r
         </option>\r
         <option>\r
           <name>GRuntimeLibSelect</name>\r
@@ -203,13 +203,17 @@
           <name>LCsHeapConfigText</name>\r
           <state>1</state>\r
         </option>\r
+        <option>\r
+          <name>GGNoMULInstruction</name>\r
+          <state>0</state>\r
+        </option>\r
       </data>\r
     </settings>\r
     <settings>\r
       <name>ICCAVR</name>\r
-      <archiveVersion>3</archiveVersion>\r
+      <archiveVersion>4</archiveVersion>\r
       <data>\r
-        <version>12</version>\r
+        <version>13</version>\r
         <wantNonLocal>1</wantNonLocal>\r
         <debug>1</debug>\r
         <option>\r
@@ -461,13 +465,17 @@
           <name>CCRadioModuleTypeSlave</name>\r
           <state>1</state>\r
         </option>\r
+        <option>\r
+          <name>OCCAdditionalCommandLineOptionsSlave</name>\r
+          <state>0</state>\r
+        </option>\r
       </data>\r
     </settings>\r
     <settings>\r
       <name>AAVR</name>\r
-      <archiveVersion>3</archiveVersion>\r
+      <archiveVersion>4</archiveVersion>\r
       <data>\r
-        <version>9</version>\r
+        <version>10</version>\r
         <wantNonLocal>1</wantNonLocal>\r
         <debug>1</debug>\r
         <option>\r
@@ -643,18 +651,6 @@
           <name>AsmOutputFile</name>\r
           <state>$FILE_BNAME$.r90</state>\r
         </option>\r
-        <option>\r
-          <name>AOverrideModuleTypeDefault</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>ARadioModuleType</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>ARadioModuleTypeSlave</name>\r
-          <state>1</state>\r
-        </option>\r
       </data>\r
     </settings>\r
     <settings>\r
@@ -700,7 +696,7 @@
         </option>\r
         <option>\r
           <name>FormatVariant</name>\r
-          <version>7</version>\r
+          <version>8</version>\r
           <state>2</state>\r
         </option>\r
         <option>\r
@@ -882,7 +878,7 @@
         </option>\r
         <option>\r
           <name>ExtraFormatVariant</name>\r
-          <version>7</version>\r
+          <version>8</version>\r
           <state>2</state>\r
         </option>\r
         <option>\r
diff --git a/Demo/AVR_ATMega323_IAR/settings/rtosdemo.wsdt b/Demo/AVR_ATMega323_IAR/settings/rtosdemo.wsdt
index f4f1d0f59a649e31d002f62bdfb9b6748d3798ec..4c88cd32b60ac2d7f17323b2edff947d57530544 100644 (file)
--- a/Demo/AVR_ATMega323_IAR/settings/rtosdemo.wsdt
+++ b/Demo/AVR_ATMega323_IAR/settings/rtosdemo.wsdt
@@ -17,7 +17,7 @@
     <Build><ColumnWidth0>20</ColumnWidth0><ColumnWidth1>1153</ColumnWidth1><ColumnWidth2>307</ColumnWidth2><ColumnWidth3>76</ColumnWidth3></Build><Debug-Log/></Static>\r
     <Windows>\r
       \r
-    <Wnd2>\r
+    <Wnd0>\r
         <Tabs>\r
           <Tab>\r
             <Identity>TabID-12388-19520</Identity>\r
@@ -29,7 +29,7 @@
           </Tab>\r
         </Tabs>\r
         \r
-      <SelectedTab>0</SelectedTab></Wnd2><Wnd3><Tabs><Tab><Identity>TabID-19172-8303</Identity><TabName>Build</TabName><Factory>Build</Factory><Session/></Tab><Tab><Identity>TabID-954-28216</Identity><TabName>Debug Log</TabName><Factory>Debug-Log</Factory><Session/></Tab></Tabs><SelectedTab>0</SelectedTab></Wnd3></Windows>\r
+      <SelectedTab>0</SelectedTab></Wnd0><Wnd1><Tabs><Tab><Identity>TabID-19172-8303</Identity><TabName>Build</TabName><Factory>Build</Factory><Session/></Tab><Tab><Identity>TabID-954-28216</Identity><TabName>Debug Log</TabName><Factory>Debug-Log</Factory><Session/></Tab></Tabs><SelectedTab>0</SelectedTab></Wnd1></Windows>\r
     <Editor>\r
       \r
       \r
@@ -42,7 +42,7 @@
       \r
       \r
       \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
+    <Top><Row0><Sizes><Toolbar-00aa9bc8><key>iaridepm.enu1</key></Toolbar-00aa9bc8></Sizes></Row0></Top><Left><Row0><Sizes><Wnd0><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></Wnd0></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd1><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></Wnd1></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>\r
   </Desktop>\r
 </Workspace>\r
 \r
FreeRTOS imported from SF.net SVN