Update so both methods of defining interrupts can be used.

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

diff --git a/Demo/msp430_IAR/FreeRTOSConfig.h b/Demo/msp430_IAR/FreeRTOSConfig.h
index 4c0c3c5e4b6f948cb5e121542c4397df1709d126..d341116004842665f5df56947267b57348944000 100644 (file)
--- a/Demo/msp430_IAR/FreeRTOSConfig.h
+++ b/Demo/msp430_IAR/FreeRTOSConfig.h
@@ -94,7 +94,7 @@ occurs.
  * See http://www.freertos.org/a00110.html.\r
  *----------------------------------------------------------*/\r
 \r
-#define configUSE_PREEMPTION           0\r
+#define configUSE_PREEMPTION           1\r
 #define configUSE_IDLE_HOOK                    1\r
 #define configUSE_TICK_HOOK                    0\r
 #define configCPU_CLOCK_HZ                     ( ( unsigned portLONG ) 7995392 ) /* Clock setup from main.c in the demo application. */\r

diff --git a/Demo/msp430_IAR/serial/serialASM.s43 b/Demo/msp430_IAR/serial/serialASM.s43
index a0d5651e60c03184e9cb137bba29bbcc34cc267a..fb9cadb08341181e1ebf4b009117982b24f4ddc3 100644 (file)
--- a/Demo/msp430_IAR/serial/serialASM.s43
+++ b/Demo/msp430_IAR/serial/serialASM.s43
@@ -54,45 +54,39 @@
 FreeRTOSConfig.h for an explanation. */\r
 #if configINTERRUPT_EXAMPLE_METHOD == 2\r
 \r
-.CODE\r
-\r
-\r
-\r
+       /* Import the functions that are called by these wrappers. */\r
+       IMPORT vRxISR\r
+       IMPORT vTxISR\r
 \r
+       RSEG CODE\r
 \r
 /* Wrapper for the Rx UART interrupt. */\r
-_vUARTRx_Wrapper\r
+vUARTRx_Wrapper\r
 \r
        portSAVE_CONTEXT\r
-       call #_vRxISR\r
+       call #vRxISR\r
        portRESTORE_CONTEXT\r
 \r
 /*-----------------------------------------------------------*/\r
 \r
 /* Wrapper for the Tx UART interrupt. */\r
-_vUARTTx_Wrapper\r
+vUARTTx_Wrapper\r
 \r
        portSAVE_CONTEXT\r
-       call #_vTxISR\r
+       call #vTxISR\r
        portRESTORE_CONTEXT\r
 \r
 /*-----------------------------------------------------------*/\r
-\r
-\r
                \r
 \r
        /* Place the UART ISRs in the correct vectors. */\r
+       ASEG\r
 \r
-       .VECTORS\r
-\r
-       .KEEP\r
-\r
-       ORG             UART1RX_VECTOR\r
-       DW              _vUARTRx_Wrapper\r
-\r
-       ORG             UART1TX_VECTOR\r
-       DW              _vUARTTx_Wrapper                \r
+       ORG 0xFFE0 + UART1RX_VECTOR     \r
+       _vRxISR_: DC16 vUARTRx_Wrapper\r
                \r
+       ORG 0xFFE0 + UART1TX_VECTOR     \r
+       _vTxISR_: DC16 vUARTTx_Wrapper\r
 \r
 #endif /* configINTERRUPT_EXAMPLE_METHOD */\r
 \r

diff --git a/Demo/msp430_IAR/settings/RTOSDemo.dbgdt b/Demo/msp430_IAR/settings/RTOSDemo.dbgdt
index a0936d6ac1fb21a7025f06e5b9ca7174a8be95c7..ec3756ae2a7c5dde13a3219503f333eff1836289 100644 (file)
--- a/Demo/msp430_IAR/settings/RTOSDemo.dbgdt
+++ b/Demo/msp430_IAR/settings/RTOSDemo.dbgdt
@@ -28,7 +28,7 @@
       \r
       \r
       \r
-    <Wnd2>\r
+    <Wnd3>\r
         <Tabs>\r
           <Tab>\r
             <Identity>TabID-22310-31641</Identity>\r
@@ -44,7 +44,7 @@
           </Tab>\r
         <Tab><Identity>TabID-3522-7304</Identity><TabName>Breakpoints</TabName><Factory>Breakpoints</Factory></Tab></Tabs>\r
         \r
-      <SelectedTab>0</SelectedTab></Wnd2><Wnd3>\r
+      <SelectedTab>0</SelectedTab></Wnd3><Wnd4>\r
         <Tabs>\r
           <Tab>\r
             <Identity>TabID-290-31644</Identity>\r
@@ -52,24 +52,24 @@
             <Factory>Workspace</Factory>\r
             <Session>\r
               \r
-            <NodeDict><ExpandedNode>RTOSDemo</ExpandedNode><ExpandedNode>RTOSDemo/FreeRTOS Source</ExpandedNode><ExpandedNode>RTOSDemo/Output</ExpandedNode></NodeDict></Session>\r
+            <NodeDict><ExpandedNode>RTOSDemo</ExpandedNode><ExpandedNode>RTOSDemo/Demo Source</ExpandedNode><ExpandedNode>RTOSDemo/FreeRTOS Source</ExpandedNode><ExpandedNode>RTOSDemo/Output</ExpandedNode></NodeDict></Session>\r
           </Tab>\r
         </Tabs>\r
         \r
-      <SelectedTab>0</SelectedTab></Wnd3></Windows>\r
+      <SelectedTab>0</SelectedTab></Wnd4><Wnd5><Tabs><Tab><Identity>TabID-452-589</Identity><TabName>Disassembly</TabName><Factory>Disassembly</Factory><Session/></Tab></Tabs><SelectedTab>0</SelectedTab></Wnd5></Windows>\r
     <Editor>\r
       \r
       \r
       \r
       \r
-    <Pane><Tab><Factory>TextEditor</Factory><Filename>C:\Devtools\IAR Systems\Embedded Workbench 4.0\430\INC\msp430x44x.h</Filename><XPos>0</XPos><YPos>1272</YPos><SelStart>66620</SelStart><SelEnd>66620</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\msp430_IAR\Debug\List\RTOSDemo.map</Filename><XPos>0</XPos><YPos>1286</YPos><SelStart>4121</SelStart><SelEnd>4121</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy2\Source\portable\IAR\MSP430\port.c</Filename><XPos>0</XPos><YPos>119</YPos><SelStart>5394</SelStart><SelEnd>5394</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy2\Source\portable\IAR\MSP430\portext.s43</Filename><XPos>0</XPos><YPos>67</YPos><SelStart>2862</SelStart><SelEnd>2862</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy2\Source\portable\IAR\MSP430\portmacro.h</Filename><XPos>0</XPos><YPos>81</YPos><SelStart>4509</SelStart><SelEnd>4509</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\msp430_IAR\serial\serial.c</Filename><XPos>0</XPos><YPos>127</YPos><SelStart>4941</SelStart><SelEnd>4941</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\Common\Minimal\comtest.c</Filename><XPos>0</XPos><YPos>195</YPos><SelStart>8885</SelStart><SelEnd>8885</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\msp430_IAR\main.c</Filename><XPos>0</XPos><YPos>301</YPos><SelStart>11204</SelStart><SelEnd>11206</SelEnd></Tab><ActiveTab>7</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy2\Source\queue.c</Filename><XPos>0</XPos><YPos>491</YPos><SelStart>19590</SelStart><SelEnd>19590</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\Common\Minimal\PollQ.c</Filename><XPos>0</XPos><YPos>132</YPos><SelStart>5908</SelStart><SelEnd>5908</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy2\Source\tasks.c</Filename><XPos>0</XPos><YPos>1837</YPos><SelStart>57274</SelStart><SelEnd>57309</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\msp430_IAR\FreeRTOSConfig.h</Filename><XPos>0</XPos><YPos>95</YPos><SelStart>4581</SelStart><SelEnd>4581</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\WorkingCopy2\Demo\msp430_IAR\main.c</Filename><XPos>0</XPos><YPos>142</YPos><SelStart>6347</SelStart><SelEnd>6347</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\msp430_IAR\FreeRTOSConfig.h</Filename><XPos>0</XPos><YPos>72</YPos><SelStart>4168</SelStart><SelEnd>4168</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\msp430_IAR\serial\serialASM.s43</Filename><XPos>0</XPos><YPos>57</YPos><SelStart>3209</SelStart><SelEnd>3209</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy2\Source\portable\IAR\MSP430\portext.s43</Filename><XPos>0</XPos><YPos>54</YPos><SelStart>2743</SelStart><SelEnd>2743</SelEnd></Tab><ActiveTab>3</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\msp430_IAR\serial\serial.c</Filename><XPos>0</XPos><YPos>271</YPos><SelStart>9596</SelStart><SelEnd>9596</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy2\Source\tasks.c</Filename><XPos>0</XPos><YPos>971</YPos><SelStart>32358</SelStart><SelEnd>32358</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-0088f570><key>iaridepm.enu1</key></Toolbar-0088f570><Toolbar-0317ee28><key>debuggergui.enu1</key></Toolbar-0317ee28></Sizes></Row0><Row1><Sizes><Toolbar-0317ece8><key>430fet1</key></Toolbar-0317ece8></Sizes></Row1><Row2><Sizes/></Row2><Row3><Sizes/></Row3><Row4><Sizes/></Row4><Row5><Sizes/></Row5><Row6><Sizes/></Row6><Row7><Sizes/></Row7><Row8><Sizes/></Row8><Row9><Sizes/></Row9><Row10><Sizes/></Row10><Row11><Sizes/></Row11><Row12><Sizes/></Row12></Top><Left><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>644</Bottom><Right>378</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>142857</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>271429</sizeVertCX><sizeVertCY>657841</sizeVertCY></Rect></Wnd3></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd2><Rect><Top>-2</Top><Left>-2</Left><Bottom>270</Bottom><Right>1402</Right><x>-2</x><y>-2</y><xscreen>1404</xscreen><yscreen>272</yscreen><sizeHorzCX>1002857</sizeHorzCX><sizeHorzCY>276986</sizeHorzCY><sizeVertCX>142857</sizeVertCX><sizeVertCY>203666</sizeVertCY></Rect></Wnd2></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>\r
+    <Top><Row0><Sizes><Toolbar-0088f570><key>iaridepm.enu1</key></Toolbar-0088f570><Toolbar-01b3c388><key>debuggergui.enu1</key></Toolbar-01b3c388></Sizes></Row0><Row1><Sizes><Toolbar-019e7308><key>430fet1</key></Toolbar-019e7308></Sizes></Row1><Row2><Sizes/></Row2><Row3><Sizes/></Row3></Top><Left><Row0><Sizes><Wnd4><Rect><Top>-2</Top><Left>-2</Left><Bottom>644</Bottom><Right>378</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>142857</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>271429</sizeVertCX><sizeVertCY>657841</sizeVertCY></Rect></Wnd4></Sizes></Row0></Left><Right><Row0><Sizes><Wnd5><Rect><Top>-2</Top><Left>-2</Left><Bottom>644</Bottom><Right>198</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>142857</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>142857</sizeVertCX><sizeVertCY>657841</sizeVertCY></Rect></Wnd5></Sizes></Row0></Right><Bottom><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>270</Bottom><Right>1402</Right><x>-2</x><y>-2</y><xscreen>1404</xscreen><yscreen>272</yscreen><sizeHorzCX>1002857</sizeHorzCX><sizeHorzCY>276986</sizeHorzCY><sizeVertCX>142857</sizeVertCX><sizeVertCY>203666</sizeVertCY></Rect></Wnd3></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>\r
   </Desktop>\r
 </Project>\r
 \r

diff --git a/Demo/msp430_IAR/settings/RTOSDemo.dni b/Demo/msp430_IAR/settings/RTOSDemo.dni
index 0711c9e26ade013ad2b3ae27c6aa18c45725cfe0..9c9543d84383b3d3bea4318de1330078efefb4a3 100644 (file)
--- a/Demo/msp430_IAR/settings/RTOSDemo.dni
+++ b/Demo/msp430_IAR/settings/RTOSDemo.dni
@@ -17,7 +17,7 @@ Control Register=0
 NextState0=0\r
 NextState1=0\r
 [Action Register]\r
-Break=3\r
+Break=5\r
 State Storage=0\r
 [DisAssemblyWindow]\r
 NumStates=_ 1\r
@@ -42,8 +42,7 @@ Category=_ 0
 LoggingEnabled=_ 0\r
 LogFile=_ ""\r
 [Breakpoints]\r
-Bp0=_ "Code" "{$PROJ_DIR$\main.c}.153.2@1" 1 0 0 0 "" 0 ""\r
-Count=1\r
+Count=0\r
 [FET]\r
 Clock mode=14\r
 Extended Clock mode=61663\r

diff --git a/Demo/msp430_IAR/settings/RTOSDemo.wsdt b/Demo/msp430_IAR/settings/RTOSDemo.wsdt
index a41292be7baef47015bac1e5da1308f610be87a2..35237de944f5ba06c6cd887ea19cc53b0250b318 100644 (file)
--- a/Demo/msp430_IAR/settings/RTOSDemo.wsdt
+++ b/Demo/msp430_IAR/settings/RTOSDemo.wsdt
@@ -24,7 +24,7 @@
     <Windows>\r
       \r
       \r
-    <Wnd2>\r
+    <Wnd0>\r
         <Tabs>\r
           <Tab>\r
             <Identity>TabID-14502-17068</Identity>\r
@@ -32,11 +32,11 @@
             <Factory>Workspace</Factory>\r
             <Session>\r
               \r
-            <NodeDict><ExpandedNode>RTOSDemo</ExpandedNode><ExpandedNode>RTOSDemo/Demo Source</ExpandedNode><ExpandedNode>RTOSDemo/FreeRTOS Source</ExpandedNode><ExpandedNode>RTOSDemo/Output</ExpandedNode></NodeDict></Session>\r
+            <NodeDict><ExpandedNode>RTOSDemo</ExpandedNode><ExpandedNode>RTOSDemo/Demo Source</ExpandedNode></NodeDict></Session>\r
           </Tab>\r
         </Tabs>\r
         \r
-      <SelectedTab>0</SelectedTab></Wnd2><Wnd3>\r
+      <SelectedTab>0</SelectedTab></Wnd0><Wnd1>\r
         <Tabs>\r
           <Tab>\r
             <Identity>TabID-7853-19854</Identity>\r
@@ -46,20 +46,20 @@
           </Tab>\r
         <Tab><Identity>TabID-9700-31468</Identity><TabName>Debug Log</TabName><Factory>Debug-Log</Factory><Session/></Tab><Tab><Identity>TabID-26943-7889</Identity><TabName>Breakpoints</TabName><Factory>Breakpoints</Factory></Tab></Tabs>\r
         \r
-      <SelectedTab>0</SelectedTab></Wnd3></Windows>\r
+      <SelectedTab>0</SelectedTab></Wnd1></Windows>\r
     <Editor>\r
       \r
       \r
       \r
       \r
-    <Pane><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy2\Demo\msp430_IAR\main.c</Filename><XPos>0</XPos><YPos>75</YPos><SelStart>0</SelStart><SelEnd>0</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\WorkingCopy2\Demo\msp430_IAR\main.c</Filename><XPos>0</XPos><YPos>142</YPos><SelStart>6346</SelStart><SelEnd>6346</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-0088f570><key>iaridepm.enu1</key></Toolbar-0088f570></Sizes></Row0></Top><Left><Row0><Sizes><Wnd2><Rect><Top>-2</Top><Left>-2</Left><Bottom>679</Bottom><Right>348</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>142857</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>250000</sizeVertCX><sizeVertCY>693483</sizeVertCY></Rect></Wnd2></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>259</Bottom><Right>1402</Right><x>-2</x><y>-2</y><xscreen>1404</xscreen><yscreen>261</yscreen><sizeHorzCX>1002857</sizeHorzCX><sizeHorzCY>265784</sizeHorzCY><sizeVertCX>142857</sizeVertCX><sizeVertCY>203666</sizeVertCY></Rect></Wnd3></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>\r
+    <Top><Row0><Sizes><Toolbar-0088f570><key>iaridepm.enu1</key></Toolbar-0088f570></Sizes></Row0><Row1><Sizes/></Row1><Row2><Sizes/></Row2><Row3><Sizes/></Row3><Row4><Sizes/></Row4></Top><Left><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>679</Bottom><Right>348</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>142857</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>250000</sizeVertCX><sizeVertCY>693483</sizeVertCY></Rect></Wnd0></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>259</Bottom><Right>1402</Right><x>-2</x><y>-2</y><xscreen>1404</xscreen><yscreen>261</yscreen><sizeHorzCX>1002857</sizeHorzCX><sizeHorzCY>265784</sizeHorzCY><sizeVertCX>142857</sizeVertCX><sizeVertCY>203666</sizeVertCY></Rect></Wnd1></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>\r
   </Desktop>\r
 </Workspace>\r
 \r