Start to adjust to support both small and large memory models in the MSP430X IAR...

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

diff --git a/Demo/MSP430X_MSP430F5438_IAR/FreeRTOSConfig.h b/Demo/MSP430X_MSP430F5438_IAR/FreeRTOSConfig.h
index 654e7c847bae03a58b8b55133843f34571f2c88b..275b90df3dab14850a0fb641f0d4692a902b81f6 100644 (file)
--- a/Demo/MSP430X_MSP430F5438_IAR/FreeRTOSConfig.h
+++ b/Demo/MSP430X_MSP430F5438_IAR/FreeRTOSConfig.h
@@ -72,7 +72,6 @@
 #define configCPU_CLOCK_HZ                             ( 16000000UL )  \r
 #define configTICK_RATE_HZ                             ( ( portTickType ) 1000 )\r
 #define configMAX_PRIORITIES                   ( ( unsigned portBASE_TYPE ) 5 )\r
-#define configMINIMAL_STACK_SIZE               ( ( unsigned short ) 70 )\r
 #define configTOTAL_HEAP_SIZE                  ( ( size_t ) ( 10 * 1024 ) )\r
 #define configMAX_TASK_NAME_LEN                        ( 10 )\r
 #define configUSE_TRACE_FACILITY               0\r
@@ -86,6 +85,12 @@
 #define configUSE_MALLOC_FAILED_HOOK   1\r
 #define configUSE_APPLICATION_TASK_TAG 0\r
 \r
+#if __DATA_MODEL__ == __DATA_MODEL_SMALL__\r
+       #define configMINIMAL_STACK_SIZE                ( ( unsigned short ) 100 )\r
+#else\r
+       #define configMINIMAL_STACK_SIZE                ( ( unsigned short ) 70 )\r
+#endif\r
+\r
 /* Co-routine definitions. */\r
 #define configUSE_CO_ROUTINES          0\r
 #define configMAX_CO_ROUTINE_PRIORITIES ( 2 )\r

diff --git a/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewd b/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewd
index 0828b08a0f96be36ec507992f44a2561a0334b3e..59fce204a17357229b8021e8dced1975b80016a7 100644 (file)
--- a/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewd
+++ b/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewd
@@ -3,7 +3,7 @@
 <project>\r
   <fileVersion>2</fileVersion>\r
   <configuration>\r
-    <name>Debug</name>\r
+    <name>Debug_Large_Data_Model</name>\r
     <toolchain>\r
       <name>MSP430</name>\r
     </toolchain>\r
@@ -368,372 +368,6 @@
       </plugin>\r
     </debuggerPlugins>\r
   </configuration>\r
-  <configuration>\r
-    <name>Release</name>\r
-    <toolchain>\r
-      <name>MSP430</name>\r
-    </toolchain>\r
-    <debug>1</debug>\r
-    <settings>\r
-      <name>C-SPY</name>\r
-      <archiveVersion>4</archiveVersion>\r
-      <data>\r
-        <version>25</version>\r
-        <wantNonLocal>1</wantNonLocal>\r
-        <debug>1</debug>\r
-        <option>\r
-          <name>CInput</name>\r
-          <state>1</state>\r
-        </option>\r
-        <option>\r
-          <name>MacOverride</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>MacFile</name>\r
-          <state></state>\r
-        </option>\r
-        <option>\r
-          <name>IProcessor</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>GoToEnable</name>\r
-          <state>1</state>\r
-        </option>\r
-        <option>\r
-          <name>GoToName</name>\r
-          <state>main</state>\r
-        </option>\r
-        <option>\r
-          <name>DynDriver</name>\r
-          <state>430FET</state>\r
-        </option>\r
-        <option>\r
-          <name>dDllSlave</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>DdfFileSlave</name>\r
-          <state>1</state>\r
-        </option>\r
-        <option>\r
-          <name>DdfOverride</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>DdfFileName</name>\r
-          <state>$TOOLKIT_DIR$\config\MSP430F5438A.ddf</state>\r
-        </option>\r
-        <option>\r
-          <name>ProcTMS</name>\r
-          <state>1</state>\r
-        </option>\r
-        <option>\r
-          <name>CExtraOptionsCheck</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>CExtraOptions</name>\r
-          <state></state>\r
-        </option>\r
-        <option>\r
-          <name>ProcMSP430X</name>\r
-          <state>1</state>\r
-        </option>\r
-        <option>\r
-          <name>CompilerDataModel</name>\r
-          <state>1</state>\r
-        </option>\r
-        <option>\r
-          <name>IVBASE</name>\r
-          <state>1</state>\r
-        </option>\r
-        <option>\r
-          <name>OCImagesSuppressCheck1</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>OCImagesPath1</name>\r
-          <state></state>\r
-        </option>\r
-        <option>\r
-          <name>OCImagesSuppressCheck2</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>OCImagesPath2</name>\r
-          <state></state>\r
-        </option>\r
-        <option>\r
-          <name>OCImagesSuppressCheck3</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>OCImagesPath3</name>\r
-          <state></state>\r
-        </option>\r
-        <option>\r
-          <name>CPUTAG</name>\r
-          <state>1</state>\r
-        </option>\r
-        <option>\r
-          <name>L092Mode</name>\r
-          <state>1</state>\r
-        </option>\r
-        <option>\r
-          <name>OCImagesOffset1</name>\r
-          <state></state>\r
-        </option>\r
-        <option>\r
-          <name>OCImagesOffset2</name>\r
-          <state></state>\r
-        </option>\r
-        <option>\r
-          <name>OCImagesOffset3</name>\r
-          <state></state>\r
-        </option>\r
-        <option>\r
-          <name>OCImagesUse1</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>OCImagesUse2</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>OCImagesUse3</name>\r
-          <state>0</state>\r
-        </option>\r
-      </data>\r
-    </settings>\r
-    <settings>\r
-      <name>430FET</name>\r
-      <archiveVersion>1</archiveVersion>\r
-      <data>\r
-        <version>22</version>\r
-        <wantNonLocal>1</wantNonLocal>\r
-        <debug>1</debug>\r
-        <option>\r
-          <name>CFetMandatory</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>Erase</name>\r
-          <state>1</state>\r
-        </option>\r
-        <option>\r
-          <name>EMUVerifyDownloadP7</name>\r
-          <state>1</state>\r
-        </option>\r
-        <option>\r
-          <name>EraseOptionSlaveP7</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>GetcharBreakpointP7</name>\r
-          <state>1</state>\r
-        </option>\r
-        <option>\r
-          <name>derivativeP7</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>ParallelPortP7</name>\r
-          <version>0</version>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>TargetVoltage</name>\r
-          <state>3.3</state>\r
-        </option>\r
-        <option>\r
-          <name>AllowLockedFlashAccessP7</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>EMUAttach</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>AttachOptionSlave</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>CRadioProtocolType</name>\r
-          <state>1</state>\r
-        </option>\r
-        <option>\r
-          <name>CCRadioModuleTypeSlave</name>\r
-          <state>1</state>\r
-        </option>\r
-        <option>\r
-          <name>EEMLevel</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>DiasbleMemoryCache</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>NeedLockedFlashAccess</name>\r
-          <state>1</state>\r
-        </option>\r
-        <option>\r
-          <name>UsbComPort</name>\r
-          <state>Automatic</state>\r
-        </option>\r
-        <option>\r
-          <name>FetConnection</name>\r
-          <version>2</version>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>SoftwareBreakpointEnable</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>RadioSoftwareBreakpointType</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>TargetSettlingtime</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>AllowAccessToBSL</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>OTargetVccTypeDefault</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>CCBetaDll</name>\r
-          <state>1</state>\r
-        </option>\r
-        <option>\r
-          <name>GPassword</name>\r
-          <state></state>\r
-        </option>\r
-        <option>\r
-          <name>DebugLPM5</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>LPM5Slave</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>CRadioAutoManualType</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>ExternalCodeDownload</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>CCVCCDefault</name>\r
-          <state>1</state>\r
-        </option>\r
-      </data>\r
-    </settings>\r
-    <settings>\r
-      <name>SIM430</name>\r
-      <archiveVersion>1</archiveVersion>\r
-      <data>\r
-        <version>4</version>\r
-        <wantNonLocal>1</wantNonLocal>\r
-        <debug>1</debug>\r
-        <option>\r
-          <name>SimOddAddressCheckP7</name>\r
-          <state>1</state>\r
-        </option>\r
-        <option>\r
-          <name>CSimMandatory</name>\r
-          <state>1</state>\r
-        </option>\r
-        <option>\r
-          <name>derivativeSim</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>SimEnablePSP</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>SimPspOverrideConfig</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>SimPspConfigFile</name>\r
-          <state>$TOOLKIT_DIR$\CONFIG\test.psp.config</state>\r
-        </option>\r
-      </data>\r
-    </settings>\r
-    <debuggerPlugins>\r
-      <plugin>\r
-        <file>$TOOLKIT_DIR$\plugins\Lcd\lcd.ewplugin</file>\r
-        <loadFlag>1</loadFlag>\r
-      </plugin>\r
-      <plugin>\r
-        <file>$TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin</file>\r
-        <loadFlag>0</loadFlag>\r
-      </plugin>\r
-      <plugin>\r
-        <file>$TOOLKIT_DIR$\plugins\rtos\OpenRTOS\OpenRTOSPlugin.ewplugin</file>\r
-        <loadFlag>1</loadFlag>\r
-      </plugin>\r
-      <plugin>\r
-        <file>$TOOLKIT_DIR$\plugins\rtos\PowerPac\PowerPacRTOS.ewplugin</file>\r
-        <loadFlag>0</loadFlag>\r
-      </plugin>\r
-      <plugin>\r
-        <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-II\uCOS-II-286-KA-CSpy.ewplugin</file>\r
-        <loadFlag>0</loadFlag>\r
-      </plugin>\r
-      <plugin>\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\FreeRTOS\FreeRTOSPlugin.ewplugin</file>\r
-        <loadFlag>0</loadFlag>\r
-      </plugin>\r
-      <plugin>\r
-        <file>$EW_DIR$\common\plugins\OpenRTOS\OpenRTOSPlugin.ewplugin</file>\r
-        <loadFlag>0</loadFlag>\r
-      </plugin>\r
-      <plugin>\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.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\SymList\SymList.ENU.ewplugin</file>\r
-        <loadFlag>1</loadFlag>\r
-      </plugin>\r
-    </debuggerPlugins>\r
-  </configuration>\r
 </project>\r
 \r
 \r

diff --git a/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewp b/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewp
index 2d3fc825c642f4f4dce8049d8fb50cd946f96415..6dd4adb01d5630aef9b861b06bdea5493627f7c6 100644 (file)
--- a/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewp
+++ b/Demo/MSP430X_MSP430F5438_IAR/RTOSDemo.ewp
@@ -3,7 +3,7 @@
 <project>\r
   <fileVersion>2</fileVersion>\r
   <configuration>\r
-    <name>Debug</name>\r
+    <name>Debug_Large_Data_Model</name>\r
     <toolchain>\r
       <name>MSP430</name>\r
     </toolchain>\r
@@ -17,15 +17,15 @@
         <debug>1</debug>\r
         <option>\r
           <name>ExePath</name>\r
-          <state>Debug\Exe</state>\r
+          <state>Debug_Large_Data_Model\Exe</state>\r
         </option>\r
         <option>\r
           <name>ObjPath</name>\r
-          <state>Debug\Obj</state>\r
+          <state>Debug_Large_Data_Model\Obj</state>\r
         </option>\r
         <option>\r
           <name>ListPath</name>\r
-          <state>Debug\List</state>\r
+          <state>Debug_Large_Data_Model\List</state>\r
         </option>\r
         <option>\r
           <name>PosIndCode</name>\r
@@ -58,11 +58,11 @@
         </option>\r
         <option>\r
           <name>RTConfigPath</name>\r
-          <state>$TOOLKIT_DIR$\LIB\DLIB\dl430xmff.h</state>\r
+          <state>$TOOLKIT_DIR$\LIB\DLIB\dl430xlff.h</state>\r
         </option>\r
         <option>\r
           <name>RTLibraryPath</name>\r
-          <state>$TOOLKIT_DIR$\LIB\DLIB\dl430xmff.r43</state>\r
+          <state>$TOOLKIT_DIR$\LIB\DLIB\dl430xlff.r43</state>\r
         </option>\r
         <option>\r
           <name>Input variant</name>\r
@@ -561,897 +561,7 @@
         <option>\r
           <name>AUserIncludes</name>\r
           <state>$PROJ_DIR$</state>\r
-        </option>\r
-      </data>\r
-    </settings>\r
-    <settings>\r
-      <name>CUSTOM</name>\r
-      <archiveVersion>3</archiveVersion>\r
-      <data>\r
-        <extensions></extensions>\r
-        <cmdline></cmdline>\r
-      </data>\r
-    </settings>\r
-    <settings>\r
-      <name>BICOMP</name>\r
-      <archiveVersion>0</archiveVersion>\r
-      <data/>\r
-    </settings>\r
-    <settings>\r
-      <name>BUILDACTION</name>\r
-      <archiveVersion>1</archiveVersion>\r
-      <data>\r
-        <prebuild></prebuild>\r
-        <postbuild></postbuild>\r
-      </data>\r
-    </settings>\r
-    <settings>\r
-      <name>XLINK</name>\r
-      <archiveVersion>4</archiveVersion>\r
-      <data>\r
-        <version>22</version>\r
-        <wantNonLocal>1</wantNonLocal>\r
-        <debug>1</debug>\r
-        <option>\r
-          <name>XOutOverride</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>OutputFile</name>\r
-          <state>RTOSDemo.d43</state>\r
-        </option>\r
-        <option>\r
-          <name>OutputFormat</name>\r
-          <version>11</version>\r
-          <state>33</state>\r
-        </option>\r
-        <option>\r
-          <name>FormatVariant</name>\r
-          <version>8</version>\r
-          <state>2</state>\r
-        </option>\r
-        <option>\r
-          <name>SecondaryOutputFile</name>\r
-          <state>(None for the selected format)</state>\r
-        </option>\r
-        <option>\r
-          <name>XDefines</name>\r
-          <state></state>\r
-        </option>\r
-        <option>\r
-          <name>AlwaysOutput</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>OverlapWarnings</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>NoGlobalCheck</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>XList</name>\r
-          <state>1</state>\r
-        </option>\r
-        <option>\r
-          <name>SegmentMap</name>\r
-          <state>1</state>\r
-        </option>\r
-        <option>\r
-          <name>ListSymbols</name>\r
-          <state>2</state>\r
-        </option>\r
-        <option>\r
-          <name>PageLengthCheck</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>PageLength</name>\r
-          <state>80</state>\r
-        </option>\r
-        <option>\r
-          <name>XIncludes</name>\r
-          <state>$TOOLKIT_DIR$\LIB\</state>\r
-        </option>\r
-        <option>\r
-          <name>ModuleStatus</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>XclOverride</name>\r
-          <state>1</state>\r
-        </option>\r
-        <option>\r
-          <name>XclFile</name>\r
-          <state>$PROJ_DIR$\lnk430F5438A_mod.xcl</state>\r
-        </option>\r
-        <option>\r
-          <name>XclFileSlave</name>\r
-          <state></state>\r
-        </option>\r
-        <option>\r
-          <name>DoFill</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>FillerByte</name>\r
-          <state>0xFF</state>\r
-        </option>\r
-        <option>\r
-          <name>DoCrc</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>CrcSize</name>\r
-          <version>0</version>\r
-          <state>1</state>\r
-        </option>\r
-        <option>\r
-          <name>CrcAlgo</name>\r
-          <state>1</state>\r
-        </option>\r
-        <option>\r
-          <name>CrcPoly</name>\r
-          <state>0x11021</state>\r
-        </option>\r
-        <option>\r
-          <name>CrcCompl</name>\r
-          <version>0</version>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>RangeCheckAlternatives</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>SuppressAllWarn</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>SuppressDiags</name>\r
-          <state>w6</state>\r
-        </option>\r
-        <option>\r
-          <name>TreatAsWarn</name>\r
-          <state></state>\r
-        </option>\r
-        <option>\r
-          <name>TreatAsErr</name>\r
-          <state></state>\r
-        </option>\r
-        <option>\r
-          <name>ModuleLocalSym</name>\r
-          <version>0</version>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>CrcBitOrder</name>\r
-          <version>0</version>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>XHardwareMul</name>\r
-          <state>1</state>\r
-        </option>\r
-        <option>\r
-          <name>IncludeSuppressed</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>ModuleSummary</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>XlinkStackSize</name>\r
-          <state>1</state>\r
-        </option>\r
-        <option>\r
-          <name>XlinkCodeModel</name>\r
-          <state>1</state>\r
-        </option>\r
-        <option>\r
-          <name>xcProgramEntryLabel</name>\r
-          <state>__program_start</state>\r
-        </option>\r
-        <option>\r
-          <name>DebugInformation</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>RuntimeControl</name>\r
-          <state>1</state>\r
-        </option>\r
-        <option>\r
-          <name>IoEmulation</name>\r
-          <state>1</state>\r
-        </option>\r
-        <option>\r
-          <name>XcRTLibraryFile</name>\r
-          <state>1</state>\r
-        </option>\r
-        <option>\r
-          <name>OXLibIOConfig</name>\r
-          <state>1</state>\r
-        </option>\r
-        <option>\r
-          <name>XLibraryHeap</name>\r
-          <state>1</state>\r
-        </option>\r
-        <option>\r
-          <name>AllowExtraOutput</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>GenerateExtraOutput</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>XExtraOutOverride</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>ExtraOutputFile</name>\r
-          <state>RTOSDemo.a43</state>\r
-        </option>\r
-        <option>\r
-          <name>ExtraOutputFormat</name>\r
-          <version>11</version>\r
-          <state>23</state>\r
-        </option>\r
-        <option>\r
-          <name>ExtraFormatVariant</name>\r
-          <version>8</version>\r
-          <state>2</state>\r
-        </option>\r
-        <option>\r
-          <name>xcOverrideProgramEntryLabel</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>xcProgramEntryLabelSelect</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>ListOutputFormat</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>BufferedTermOutput</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>XExtraOptionsCheck</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>XExtraOptions</name>\r
-          <state></state>\r
-        </option>\r
-        <option>\r
-          <name>OverlaySystemMap</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>RawBinaryFile</name>\r
-          <state></state>\r
-        </option>\r
-        <option>\r
-          <name>RawBinarySymbol</name>\r
-          <state></state>\r
-        </option>\r
-        <option>\r
-          <name>RawBinarySegment</name>\r
-          <state></state>\r
-        </option>\r
-        <option>\r
-          <name>RawBinaryAlign</name>\r
-          <state></state>\r
-        </option>\r
-        <option>\r
-          <name>XLinkMisraHandler</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>CrcAlign</name>\r
-          <state>2</state>\r
-        </option>\r
-        <option>\r
-          <name>CrcInitialValue</name>\r
-          <state>0x0</state>\r
-        </option>\r
-        <option>\r
-          <name>XLibraryHeap20</name>\r
-          <state>1</state>\r
-        </option>\r
-      </data>\r
-    </settings>\r
-    <settings>\r
-      <name>XAR</name>\r
-      <archiveVersion>4</archiveVersion>\r
-      <data>\r
-        <version>0</version>\r
-        <wantNonLocal>1</wantNonLocal>\r
-        <debug>1</debug>\r
-        <option>\r
-          <name>XAROutOverride</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>XARInputs</name>\r
-          <state></state>\r
-        </option>\r
-        <option>\r
-          <name>OutputFile</name>\r
-          <state></state>\r
-        </option>\r
-      </data>\r
-    </settings>\r
-    <settings>\r
-      <name>BILINK</name>\r
-      <archiveVersion>0</archiveVersion>\r
-      <data/>\r
-    </settings>\r
-  </configuration>\r
-  <configuration>\r
-    <name>Release</name>\r
-    <toolchain>\r
-      <name>MSP430</name>\r
-    </toolchain>\r
-    <debug>1</debug>\r
-    <settings>\r
-      <name>General</name>\r
-      <archiveVersion>7</archiveVersion>\r
-      <data>\r
-        <version>27</version>\r
-        <wantNonLocal>1</wantNonLocal>\r
-        <debug>1</debug>\r
-        <option>\r
-          <name>ExePath</name>\r
-          <state>Release\Exe</state>\r
-        </option>\r
-        <option>\r
-          <name>ObjPath</name>\r
-          <state>Release\Obj</state>\r
-        </option>\r
-        <option>\r
-          <name>ListPath</name>\r
-          <state>Release\List</state>\r
-        </option>\r
-        <option>\r
-          <name>PosIndCode</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>Hardware Multiplier</name>\r
-          <state>1</state>\r
-        </option>\r
-        <option>\r
-          <name>GOutputBinary</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>AssemblerOnly</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>OGDouble</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>GRuntimeLibSelect</name>\r
-          <version>0</version>\r
-          <state>2</state>\r
-        </option>\r
-        <option>\r
-          <name>RTDescription</name>\r
-          <state>Use the full configuration of the C/EC++ runtime library. Full locale interface, C locale, file descriptor support, multibytes in printf and scanf, and hex floats in strtod.</state>\r
-        </option>\r
-        <option>\r
-          <name>RTConfigPath</name>\r
-          <state>$TOOLKIT_DIR$\LIB\DLIB\dl430xlff.h</state>\r
-        </option>\r
-        <option>\r
-          <name>RTLibraryPath</name>\r
-          <state>$TOOLKIT_DIR$\LIB\DLIB\dl430xlff.r43</state>\r
-        </option>\r
-        <option>\r
-          <name>Input variant</name>\r
-          <version>0</version>\r
-          <state>3</state>\r
-        </option>\r
-        <option>\r
-          <name>Input description</name>\r
-          <state>No specifier n, no float or long long, no scan set, no assignment suppressing.</state>\r
-        </option>\r
-        <option>\r
-          <name>Output variant</name>\r
-          <version>0</version>\r
-          <state>4</state>\r
-        </option>\r
-        <option>\r
-          <name>Output description</name>\r
-          <state>No specifier a or A, no specifier n, no float or long long, no flags.</state>\r
-        </option>\r
-        <option>\r
-          <name>GRuntimeLibSelectSlave</name>\r
-          <version>0</version>\r
-          <state>2</state>\r
-        </option>\r
-        <option>\r
-          <name>OGCore</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>GeneralEnableMisra</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>GeneralMisraVerbose</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>OGChipSelectMenu</name>\r
-          <state>MSP430F5438A  MSP430F5438A</state>\r
-        </option>\r
-        <option>\r
-          <name>GStackHeapOverride</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>GStackSize2</name>\r
-          <state>160</state>\r
-        </option>\r
-        <option>\r
-          <name>GHeapSize2</name>\r
-          <state>160</state>\r
-        </option>\r
-        <option>\r
-          <name>RadioDataModelType</name>\r
-          <state>2</state>\r
-        </option>\r
-        <option>\r
-          <name>GHeap20Size</name>\r
-          <state>80</state>\r
-        </option>\r
-        <option>\r
-          <name>GeneralMisraRules98</name>\r
-          <version>0</version>\r
-          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>\r
-        </option>\r
-        <option>\r
-          <name>RadioHeapSizeType</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>RadioHardwareMultiplierType</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>GeneralMisraVer</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>GeneralMisraRules04</name>\r
-          <version>0</version>\r
-          <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>\r
-        </option>\r
-        <option>\r
-          <name>RadioL092ModelType</name>\r
-          <state>0</state>\r
-        </option>\r
-      </data>\r
-    </settings>\r
-    <settings>\r
-      <name>ICC430</name>\r
-      <archiveVersion>4</archiveVersion>\r
-      <data>\r
-        <version>30</version>\r
-        <wantNonLocal>1</wantNonLocal>\r
-        <debug>1</debug>\r
-        <option>\r
-          <name>CCDefines</name>\r
-          <state></state>\r
-        </option>\r
-        <option>\r
-          <name>CCPreprocFile</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>CCPreprocComments</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>CCPreprocLine</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>CCListCFile</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>CCListCMnemonics</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>CCListCMessages</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>CCListAssFile</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>CCListAssSource</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>CCEnableRemarks</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>CCDiagSuppress</name>\r
-          <state>Pa082</state>\r
-        </option>\r
-        <option>\r
-          <name>CCDiagRemark</name>\r
-          <state></state>\r
-        </option>\r
-        <option>\r
-          <name>CCDiagWarning</name>\r
-          <state></state>\r
-        </option>\r
-        <option>\r
-          <name>CCDiagError</name>\r
-          <state></state>\r
-        </option>\r
-        <option>\r
-          <name>IObjPrefix2</name>\r
-          <state>1</state>\r
-        </option>\r
-        <option>\r
-          <name>CCRequirePrototypes</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>CCAllowList</name>\r
-          <version>1</version>\r
-          <state>11111</state>\r
-        </option>\r
-        <option>\r
-          <name>CCObjUseModuleName</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>CCObjModuleName</name>\r
-          <state></state>\r
-        </option>\r
-        <option>\r
-          <name>CCDebugInfo</name>\r
-          <state>1</state>\r
-        </option>\r
-        <option>\r
-          <name>IProcessor</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>CCDiagWarnAreErr</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>CCCharIs</name>\r
-          <state>1</state>\r
-        </option>\r
-        <option>\r
-          <name>CCExt</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>CCMultibyteSupport</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>CCMigrationPreprocExtentions</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>CCCompilerRuntimeInfo</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>IDoubleSize</name>\r
-          <state>1</state>\r
-        </option>\r
-        <option>\r
-          <name>OutputFile</name>\r
-          <state>$FILE_BNAME$.r43</state>\r
-        </option>\r
-        <option>\r
-          <name>CCLibConfigHeader</name>\r
-          <state>1</state>\r
-        </option>\r
-        <option>\r
-          <name>OCCR4Utilize</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>OCCR5Utilize</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>CPIC</name>\r
-          <state>1</state>\r
-        </option>\r
-        <option>\r
-          <name>IExtraOptionsCheck</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>IExtraOptions</name>\r
-          <state></state>\r
-        </option>\r
-        <option>\r
-          <name>PreInclude</name>\r
-          <state></state>\r
-        </option>\r
-        <option>\r
-          <name>CCOverrideModuleTypeDefault</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>CCRadioModuleType</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>CCRadioModuleTypeSlave</name>\r
-          <state>1</state>\r
-        </option>\r
-        <option>\r
-          <name>newCCIncludePaths</name>\r
-          <state>$PROJ_DIR$\F5XX_6XX_Core_Lib</state>\r
-          <state>$PROJ_DIR$\MSP-EXP430F5438_HAL</state>\r
-          <state>$PROJ_DIR$\UserExperienceDemo</state>\r
-          <state>$PROJ_DIR$\..\Common\include</state>\r
-          <state>$PROJ_DIR$\..\..\Source\include</state>\r
           <state>$PROJ_DIR$\..\..\Source\portable\IAR\MSP430X</state>\r
-          <state>$PROJ_DIR$</state>\r
-        </option>\r
-        <option>\r
-          <name>CCStdIncCheck</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>CompilerMisraOverride</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>OI430X</name>\r
-          <state>1</state>\r
-        </option>\r
-        <option>\r
-          <name>ReduceStack</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>Save20bit</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>CompilerDataModel</name>\r
-          <state>1</state>\r
-        </option>\r
-        <option>\r
-          <name>CCOptLevel</name>\r
-          <state>3</state>\r
-        </option>\r
-        <option>\r
-          <name>CCOptStrategy</name>\r
-          <version>0</version>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>CCOptLevelSlave</name>\r
-          <state>3</state>\r
-        </option>\r
-        <option>\r
-          <name>CInput</name>\r
-          <state>1</state>\r
-        </option>\r
-        <option>\r
-          <name>CompilerMisraRules98</name>\r
-          <version>0</version>\r
-          <state>1000111110110101101110011100111111101110011011000101110111101101100111111111111100110011111001110111001111111111111111111111111</state>\r
-        </option>\r
-        <option>\r
-          <name>CompilerMisraRules04</name>\r
-          <version>0</version>\r
-          <state>111101110010111111111000110111111111111111111111111110010111101111010101111111111111111111111111101111111011111001111011111011111111111111111</state>\r
-        </option>\r
-        <option>\r
-          <name>IccLang</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>IccCDialect</name>\r
-          <state>1</state>\r
-        </option>\r
-        <option>\r
-          <name>IccAllowVLA</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>IccCppDialect</name>\r
-          <state>1</state>\r
-        </option>\r
-        <option>\r
-          <name>IccRelaxedFpPrecision</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>CCPUTAG</name>\r
-          <state>1</state>\r
-        </option>\r
-      </data>\r
-    </settings>\r
-    <settings>\r
-      <name>A430</name>\r
-      <archiveVersion>4</archiveVersion>\r
-      <data>\r
-        <version>13</version>\r
-        <wantNonLocal>1</wantNonLocal>\r
-        <debug>1</debug>\r
-        <option>\r
-          <name>AObjPrefix</name>\r
-          <state>1</state>\r
-        </option>\r
-        <option>\r
-          <name>ACaseSensitivity</name>\r
-          <state>1</state>\r
-        </option>\r
-        <option>\r
-          <name>MacroChars</name>\r
-          <version>0</version>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>AWarnEnable</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>AWarnWhat</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>AWarnOne</name>\r
-          <state></state>\r
-        </option>\r
-        <option>\r
-          <name>AWarnRange1</name>\r
-          <state></state>\r
-        </option>\r
-        <option>\r
-          <name>AWarnRange2</name>\r
-          <state></state>\r
-        </option>\r
-        <option>\r
-          <name>ADefines</name>\r
-          <state></state>\r
-        </option>\r
-        <option>\r
-          <name>AList</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>AListHeader</name>\r
-          <state>1</state>\r
-        </option>\r
-        <option>\r
-          <name>AListing</name>\r
-          <state>1</state>\r
-        </option>\r
-        <option>\r
-          <name>Includes</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>MacDefs</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>MacExps</name>\r
-          <state>1</state>\r
-        </option>\r
-        <option>\r
-          <name>MacExec</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>OnlyAssed</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>MultiLine</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>PageLengthCheck</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>PageLength</name>\r
-          <state>80</state>\r
-        </option>\r
-        <option>\r
-          <name>TabSpacing</name>\r
-          <state>8</state>\r
-        </option>\r
-        <option>\r
-          <name>AXRef</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>AXRefDefines</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>AXRefInternal</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>AXRefDual</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>ADebug</name>\r
-          <state>1</state>\r
-        </option>\r
-        <option>\r
-          <name>ADebugType</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>IProcessor</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>AMaxErrOn</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>AMaxErrNum</name>\r
-          <state>100</state>\r
-        </option>\r
-        <option>\r
-          <name>OutputFile</name>\r
-          <state>$FILE_BNAME$.r43</state>\r
-        </option>\r
-        <option>\r
-          <name>AMultibyteSupport</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>AExtraOptionsCheck</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>AExtraOptions</name>\r
-          <state></state>\r
-        </option>\r
-        <option>\r
-          <name>OA1M</name>\r
-          <state>1</state>\r
-        </option>\r
-        <option>\r
-          <name>AIgnoreStdInclude</name>\r
-          <state>0</state>\r
-        </option>\r
-        <option>\r
-          <name>AStdIncludes</name>\r
-          <state>$TOOLKIT_DIR$\INC\</state>\r
-        </option>\r
-        <option>\r
-          <name>AUserIncludes</name>\r
-          <state>$PROJ_DIR$</state>\r
         </option>\r
       </data>\r
     </settings>\r

diff --git a/Demo/MSP430X_MSP430F5438_IAR/RegTest.s43 b/Demo/MSP430X_MSP430F5438_IAR/RegTest.s43
index 98478adc668ae3a08b61723195a1f4c01df6d88a..bbebf160452dc6d25ca5b562af01f8b682a16eb8 100644 (file)
--- a/Demo/MSP430X_MSP430F5438_IAR/RegTest.s43
+++ b/Demo/MSP430X_MSP430F5438_IAR/RegTest.s43
@@ -52,6 +52,7 @@
 */\r
 #include "msp430.h"\r
 #include "FreeRTOSConfig.h"\r
+#include "data_model.h"\r
 \r
 /*\r
  * The definition of the "register test" tasks, as described at the top of\r
@@ -72,47 +73,47 @@
 vRegTest1Task:\r
 \r
        /* Fill each general purpose register with a known value. */\r
-       movx.a  #0x44444, r4\r
-       movx.a  #0x55555, r5\r
-       movx.a  #0x66666, r6\r
-       movx.a  #0x77777, r7\r
-       movx.a  #0x88888, r8\r
-       movx.a  #0x99999, r9\r
-       movx.a  #0xaaaaa, r10\r
-       movx.a  #0xbbbbb, r11\r
-       movx.a  #0xccccc, r12\r
-       movx.a  #0xddddd, r13\r
-       movx.a  #0xeeeee, r14\r
-       movx.a  #0xfffff, r15\r
+       mov_x   #0x4444, r4\r
+       mov_x   #0x5555, r5\r
+       mov_x   #0x6666, r6\r
+       mov_x   #0x7777, r7\r
+       mov_x   #0x8888, r8\r
+       mov_x   #0x9999, r9\r
+       mov_x   #0xaaaa, r10\r
+       mov_x   #0xbbbb, r11\r
+       mov_x   #0xcccc, r12\r
+       mov_x   #0xdddd, r13\r
+       mov_x   #0xeeee, r14\r
+       mov_x   #0xffff, r15\r
        \r
 prvRegTest1Loop:\r
 \r
        /* Test each general purpose register to check that it still contains the\r
        expected known value, jumping to vRegTest1Error if any register contains\r
        an unexpected value. */\r
-       cmpx.a  #0x44444, r4\r
+       cmp_x   #0x4444, r4\r
        jne             vRegTest1Error\r
-       cmpx.a  #0x55555, r5\r
+       cmp_x   #0x5555, r5\r
        jne             vRegTest1Error\r
-       cmpx.a  #0x66666, r6\r
+       cmp_x   #0x6666, r6\r
        jne             vRegTest1Error\r
-       cmpx.a  #0x77777, r7\r
+       cmp_x   #0x7777, r7\r
        jne             vRegTest1Error\r
-       cmpx.a  #0x88888, r8\r
+       cmp_x   #0x8888, r8\r
        jne             vRegTest1Error\r
-       cmpx.a  #0x99999, r9\r
+       cmp_x   #0x9999, r9\r
        jne             vRegTest1Error\r
-       cmpx.a  #0xaaaaa, r10\r
+       cmp_x   #0xaaaa, r10\r
        jne             vRegTest1Error\r
-       cmpx.a  #0xbbbbb, r11\r
+       cmp_x   #0xbbbb, r11\r
        jne             vRegTest1Error\r
-       cmpx.a  #0xccccc, r12\r
+       cmp_x   #0xcccc, r12\r
        jne             vRegTest1Error\r
-       cmpx.a  #0xddddd, r13\r
+       cmp_x   #0xdddd, r13\r
        jne             vRegTest1Error\r
-       cmpx.a  #0xeeeee, r14\r
+       cmp_x   #0xeeee, r14\r
        jne             vRegTest1Error\r
-       cmpx.a  #0xfffff, r15\r
+       cmp_x   #0xffff, r15\r
        jne             vRegTest1Error\r
        \r
        /* This task is still running without jumping to vRegTest1Error, so increment\r
@@ -134,44 +135,44 @@ vRegTest1Error:
 different values in its registers. */\r
 vRegTest2Task:\r
 \r
-       movx.a  #0x14441, r4\r
-       movx.a  #0x15551, r5\r
-       movx.a  #0x16661, r6\r
-       movx.a  #0x17771, r7\r
-       movx.a  #0x18881, r8\r
-       movx.a  #0x19991, r9\r
-       movx.a  #0x1aaa1, r10\r
-       movx.a  #0x1bbb1, r11\r
-       movx.a  #0x1ccc1, r12\r
-       movx.a  #0x1ddd1, r13\r
-       movx.a  #0x1eee1, r14\r
-       movx.a  #0x1fff1, r15\r
+       mov_x   #0x4441, r4\r
+       mov_x   #0x5551, r5\r
+       mov_x   #0x6661, r6\r
+       mov_x   #0x7771, r7\r
+       mov_x   #0x8881, r8\r
+       mov_x   #0x9991, r9\r
+       mov_x   #0xaaa1, r10\r
+       mov_x   #0xbbb1, r11\r
+       mov_x   #0xccc1, r12\r
+       mov_x   #0xddd1, r13\r
+       mov_x   #0xeee1, r14\r
+       mov_x   #0xfff1, r15\r
        \r
 prvRegTest2Loop:\r
 \r
-       cmpx.a  #0x14441, r4\r
+       cmp_x   #0x4441, r4\r
        jne             vRegTest2Error\r
-       cmpx.a  #0x15551, r5\r
+       cmp_x   #0x5551, r5\r
        jne             vRegTest2Error\r
-       cmpx.a  #0x16661, r6\r
+       cmp_x   #0x6661, r6\r
        jne             vRegTest2Error\r
-       cmpx.a  #0x17771, r7\r
+       cmp_x   #0x7771, r7\r
        jne             vRegTest2Error\r
-       cmpx.a  #0x18881, r8\r
+       cmp_x   #0x8881, r8\r
        jne             vRegTest2Error\r
-       cmpx.a  #0x19991, r9\r
+       cmp_x   #0x9991, r9\r
        jne             vRegTest2Error\r
-       cmpx.a  #0x1aaa1, r10\r
+       cmp_x   #0xaaa1, r10\r
        jne             vRegTest2Error\r
-       cmpx.a  #0x1bbb1, r11\r
+       cmp_x   #0xbbb1, r11\r
        jne             vRegTest2Error\r
-       cmpx.a  #0x1ccc1, r12\r
+       cmp_x   #0xccc1, r12\r
        jne             vRegTest2Error\r
-       cmpx.a  #0x1ddd1, r13\r
+       cmp_x   #0xddd1, r13\r
        jne             vRegTest2Error\r
-       cmpx.a  #0x1eee1, r14\r
+       cmp_x   #0xeee1, r14\r
        jne             vRegTest2Error\r
-       cmpx.a  #0x1fff1, r15\r
+       cmp_x   #0xfff1, r15\r
        jne             vRegTest2Error\r
        \r
        /* Also perform a manual yield, just to increase the scope of the test. */\r

diff --git a/Demo/MSP430X_MSP430F5438_IAR/lnk430F5438A_mod.xcl b/Demo/MSP430X_MSP430F5438_IAR/lnk430F5438A_mod.xcl
index 999d1f6e093a13877c6d378e9e7d81dae208b7b5..fd9ddefd884a1bfeba8f0fb14de9f14684073e78 100644 (file)
--- a/Demo/MSP430X_MSP430F5438_IAR/lnk430F5438A_mod.xcl
+++ b/Demo/MSP430X_MSP430F5438_IAR/lnk430F5438A_mod.xcl
@@ -207,9 +207,9 @@
 \r
 // *** Modified to place code in high memory and insodoing, testing the port.\r
 // Original code\r
-//-Z(CONST)DATA20_C,DATA20_ID=5C00-FF7F,10000-45BFF\r
+-Z(CONST)DATA20_C,DATA20_ID=5C00-FF7F,10000-45BFF\r
 // Modified code\r
--Z(CONST)DATA20_C,DATA20_ID=10000-45BFF\r
+//-Z(CONST)DATA20_C,DATA20_ID=10000-45BFF\r
 \r
 \r
 // -------------------------------------\r

diff --git a/Demo/MSP430X_MSP430F5438_IAR/main.c b/Demo/MSP430X_MSP430F5438_IAR/main.c
index b904b10bd6fe46be0747c4cf2a59063354a2cdb7..e38845e629e38e2c2b935f34757ebc85ad7d99bc 100644 (file)
--- a/Demo/MSP430X_MSP430F5438_IAR/main.c
+++ b/Demo/MSP430X_MSP430F5438_IAR/main.c
@@ -183,6 +183,9 @@ information.  */
 \r
 /* The maximum number of lines of text that can be displayed on the LCD. */\r
 #define mainMAX_LCD_LINES                              ( 8 )\r
+\r
+/* Just used to ensure parameters are passed into tasks correctly. */\r
+#define mainTASK_PARAMETER_CHECK_VALUE ( ( void * ) 0xDEAD )\r
 /*-----------------------------------------------------------*/\r
 \r
 /*\r
@@ -266,7 +269,7 @@ void main( void )
                \r
                /* Create the LCD, button poll and register test tasks, as described at\r
                the top of this file. */\r
-               xTaskCreate( prvLCDTask, ( signed char * ) "LCD", configMINIMAL_STACK_SIZE * 2, NULL, mainLCD_TASK_PRIORITY, NULL );\r
+               xTaskCreate( prvLCDTask, ( signed char * ) "LCD", configMINIMAL_STACK_SIZE * 2, mainTASK_PARAMETER_CHECK_VALUE, mainLCD_TASK_PRIORITY, NULL );\r
                xTaskCreate( prvButtonPollTask, ( signed char * ) "BPoll", configMINIMAL_STACK_SIZE, NULL, tskIDLE_PRIORITY, NULL );\r
                xTaskCreate( vRegTest1Task, ( signed char * ) "Reg1", configMINIMAL_STACK_SIZE, NULL, 0, NULL );\r
                xTaskCreate( vRegTest2Task, ( signed char * ) "Reg2", configMINIMAL_STACK_SIZE, NULL, 0, NULL );\r
@@ -304,6 +307,15 @@ unsigned char ucLine = 1;
        First print out the number of bytes that remain in the FreeRTOS heap.  This\r
        can be viewed in the terminal IO window within the IAR Embedded Workbench. */\r
        printf( "%d bytes of heap space remain unallocated\n", ( int ) xPortGetFreeHeapSize() );\r
+       fflush( stdout );\r
+       \r
+       /* Just as a test of the port, and for no functional reason, check the task\r
+       parameter contains its expected value. */\r
+       if( pvParameters != mainTASK_PARAMETER_CHECK_VALUE )\r
+       {\r
+               halLcdPrintLine( "Invalid parameter", ucLine,  OVERWRITE_TEXT );\r
+               ucLine++;               \r
+       }\r
 \r
        for( ;; )\r
        {\r

diff --git a/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.dbgdt b/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.dbgdt
index a5ae7b67e8a625b151a76a7d6a8327334c2e9718..a4de2e74918e27174198b0c1f304d5f2f3aef4b0 100644 (file)
--- a/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.dbgdt
+++ b/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.dbgdt
@@ -26,12 +26,12 @@
         \r
         \r
       <PreferedWindows><Position>2</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows/></PreferedWindows><MixedMode>1</MixedMode><CodeCovShow>1</CodeCovShow><InstrProfShow>1</InstrProfShow></Disassembly>\r
-    <Register><PreferedWindows><Position>2</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows/></PreferedWindows></Register><Memory><PreferedWindows><Position>3</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows/></PreferedWindows><FindDirection>1</FindDirection><FindAsHex>0</FindAsHex></Memory><Watch><Format><struct_types/><watch_formats><Fmt><Key>{W}Watch-0:TA1CTL</Key><Value>4</Value></Fmt><Fmt><Key>{W}Watch-0:ulSP_PC_Combined</Key><Value>4</Value></Fmt></watch_formats></Format><PreferedWindows><Position>3</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows/></PreferedWindows><Column0>134</Column0><Column1>139</Column1><Column2>124</Column2><Column3>100</Column3></Watch><Breakpoints><PreferedWindows><Position>3</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows><Window><Factory>Debug-Log</Factory></Window></Windows></PreferedWindows></Breakpoints><TASKVIEW><PreferedWindows><Position>3</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows/></PreferedWindows><Column0>200</Column0><Column1>100</Column1><Column2>100</Column2><Column3>100</Column3><Column4>100</Column4><Column5>100</Column5><Column6>100</Column6><Column7>150</Column7></TASKVIEW><TerminalIO><InputSource>1</InputSource><InputMode>10</InputMode><Filename>$PROJ_DIR$\TermIOInput.txt</Filename><InputEcho>1</InputEcho><ShowReset>0</ShowReset></TerminalIO><DeviceInformationWindow><PreferedWindows><Position>3</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows/></PreferedWindows><Column0>150</Column0><Column1>150</Column1></DeviceInformationWindow><StateStorageDialog><PreferedWindows><Position>3</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows/></PreferedWindows></StateStorageDialog><SequencerDialog><PreferedWindows><Position>3</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows/></PreferedWindows><SequencerMask>0</SequencerMask><Advanced>0</Advanced></SequencerDialog><CallStack><PreferedWindows><Position>1</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows/></PreferedWindows><ViewArgs>1</ViewArgs></CallStack><QUEUEVIEW><Column0>300</Column0><Column1>100</Column1><Column2>100</Column2><Column3>100</Column3><Column4>100</Column4><Column5>100</Column5><Column6>100</Column6></QUEUEVIEW></Static>\r
+    <Register><PreferedWindows><Position>2</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows/></PreferedWindows></Register><Memory><PreferedWindows><Position>3</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows/></PreferedWindows><FindDirection>1</FindDirection><FindAsHex>0</FindAsHex></Memory><Watch><Format><struct_types/><watch_formats><Fmt><Key>{W}Watch-0:TA1CTL</Key><Value>4</Value></Fmt><Fmt><Key>{W}Watch-0:ulSP_PC_Combined</Key><Value>4</Value></Fmt></watch_formats></Format><PreferedWindows><Position>3</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows/></PreferedWindows><Column0>134</Column0><Column1>139</Column1><Column2>124</Column2><Column3>100</Column3></Watch><Breakpoints><PreferedWindows><Position>3</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows><Window><Factory>Debug-Log</Factory></Window></Windows></PreferedWindows></Breakpoints><TASKVIEW><PreferedWindows><Position>3</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows/></PreferedWindows><Column0>200</Column0><Column1>100</Column1><Column2>100</Column2><Column3>100</Column3><Column4>100</Column4><Column5>100</Column5><Column6>100</Column6><Column7>150</Column7></TASKVIEW><TerminalIO><PreferedWindows><Position>2</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows/></PreferedWindows><InputSource>1</InputSource><InputMode>10</InputMode><Filename>$PROJ_DIR$\TermIOInput.txt</Filename><InputEcho>1</InputEcho><ShowReset>0</ShowReset></TerminalIO><DeviceInformationWindow><PreferedWindows><Position>3</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows/></PreferedWindows><Column0>150</Column0><Column1>150</Column1></DeviceInformationWindow><StateStorageDialog><PreferedWindows><Position>3</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows/></PreferedWindows></StateStorageDialog><SequencerDialog><PreferedWindows><Position>3</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows/></PreferedWindows><SequencerMask>0</SequencerMask><Advanced>0</Advanced></SequencerDialog><CallStack><PreferedWindows><Position>1</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows/></PreferedWindows><ViewArgs>1</ViewArgs></CallStack><QUEUEVIEW><Column0>300</Column0><Column1>100</Column1><Column2>100</Column2><Column3>100</Column3><Column4>100</Column4><Column5>100</Column5><Column6>100</Column6></QUEUEVIEW></Static>\r
     <Windows>\r
       \r
       \r
       \r
-    <Wnd1>\r
+    <Wnd2>\r
         <Tabs>\r
           <Tab>\r
             <Identity>TabID-11539-27703</Identity>\r
@@ -39,24 +39,24 @@
             <Factory>Workspace</Factory>\r
             <Session>\r
               \r
-            <NodeDict><ExpandedNode>RTOSDemo</ExpandedNode></NodeDict></Session>\r
+            <NodeDict><ExpandedNode>RTOSDemo</ExpandedNode><ExpandedNode>RTOSDemo/FreeRTOS_Source</ExpandedNode><ExpandedNode>RTOSDemo/FreeRTOS_Source/Portable</ExpandedNode></NodeDict></Session>\r
           </Tab>\r
         </Tabs>\r
         \r
-      <SelectedTab>0</SelectedTab></Wnd1><Wnd5><Tabs><Tab><Identity>TabID-12395-27916</Identity><TabName>Terminal I/O</TabName><Factory>TerminalIO</Factory><Session/></Tab></Tabs><SelectedTab>0</SelectedTab></Wnd5><Wnd6/><Wnd7/><Wnd0><Tabs><Tab><Identity>TabID-26682-3495</Identity><TabName>Debug Log</TabName><Factory>Debug-Log</Factory><Session/></Tab></Tabs><SelectedTab>0</SelectedTab></Wnd0></Windows>\r
+      <SelectedTab>0</SelectedTab></Wnd2><Wnd3><Tabs><Tab><Identity>TabID-31440-8210</Identity><TabName>Debug Log</TabName><Factory>Debug-Log</Factory><Session/></Tab></Tabs><SelectedTab>0</SelectedTab></Wnd3><Wnd4><Tabs><Tab><Identity>TabID-22030-8386</Identity><TabName>Terminal I/O</TabName><Factory>TerminalIO</Factory><Session/></Tab></Tabs><SelectedTab>0</SelectedTab></Wnd4></Windows>\r
     <Editor>\r
       \r
       \r
       \r
       \r
-    <Pane><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\main.c</Filename><XPos>0</XPos><YPos>227</YPos><SelStart>12065</SelStart><SelEnd>12065</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>$WS_DIR$\main.c</Filename><XPos>0</XPos><YPos>242</YPos><SelStart>12197</SelStart><SelEnd>12197</SelEnd></Tab><ActiveTab>0</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\Source\portable\IAR\MSP430X\portext.s43</Filename><XPos>0</XPos><YPos>143</YPos><SelStart>5339</SelStart><SelEnd>5339</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\FreeRTOSConfig.h</Filename><XPos>0</XPos><YPos>70</YPos><SelStart>4385</SelStart><SelEnd>4385</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\Source\tasks.c</Filename><XPos>0</XPos><YPos>1601</YPos><SelStart>51267</SelStart><SelEnd>51267</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\Source\portable\IAR\MSP430X\portmacro.h</Filename><XPos>0</XPos><YPos>48</YPos><SelStart>3652</SelStart><SelEnd>3697</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\RegTest.s43</Filename><XPos>0</XPos><YPos>39</YPos><SelStart>3150</SelStart><SelEnd>3150</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\Source\portable\IAR\MSP430X\data_model.h</Filename><XPos>0</XPos><YPos>40</YPos><SelStart>3124</SelStart><SelEnd>3124</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\..\..\Source\portable\IAR\MSP430X\port.c</Filename><XPos>0</XPos><YPos>116</YPos><SelStart>5789</SelStart><SelEnd>5789</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\lnk430F5438A_mod.xcl</Filename><XPos>0</XPos><YPos>177</YPos><SelStart>5123</SelStart><SelEnd>5123</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-012aad38><key>iaridepm.enu1</key></Toolbar-012aad38><Toolbar-07577b20><key>430fet1</key></Toolbar-07577b20></Sizes></Row0><Row1><Sizes><Toolbar-07550460><key>debuggergui.enu1</key></Toolbar-07550460></Sizes></Row1></Top><Left><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>716</Bottom><Right>191</Right><x>-2</x><y>-2</y><xscreen>121</xscreen><yscreen>150</yscreen><sizeHorzCX>72024</sizeHorzCX><sizeHorzCY>152749</sizeHorzCY><sizeVertCX>114881</sizeVertCX><sizeVertCY>731161</sizeVertCY></Rect></Wnd1></Sizes></Row0></Left><Right><Row0><Sizes><Wnd5><Rect><Top>-2</Top><Left>-2</Left><Bottom>716</Bottom><Right>376</Right><x>-2</x><y>-2</y><xscreen>121</xscreen><yscreen>150</yscreen><sizeHorzCX>72024</sizeHorzCX><sizeHorzCY>152749</sizeHorzCY><sizeVertCX>225000</sizeVertCX><sizeVertCY>731161</sizeVertCY></Rect></Wnd5></Sizes></Row0></Right><Bottom><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>198</Bottom><Right>1682</Right><x>-2</x><y>-2</y><xscreen>1684</xscreen><yscreen>200</yscreen><sizeHorzCX>1002381</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>119048</sizeVertCX><sizeVertCY>203666</sizeVertCY></Rect></Wnd0></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>\r
+    <Top><Row0><Sizes><Toolbar-012aad60><key>iaridepm.enu1</key></Toolbar-012aad60><Toolbar-09037e08><key>430fet1</key></Toolbar-09037e08></Sizes></Row0><Row1><Sizes><Toolbar-069688b8><key>debuggergui.enu1</key></Toolbar-069688b8></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><Wnd2><Rect><Top>-2</Top><Left>-2</Left><Bottom>716</Bottom><Right>191</Right><x>-2</x><y>-2</y><xscreen>121</xscreen><yscreen>150</yscreen><sizeHorzCX>72024</sizeHorzCX><sizeHorzCY>152749</sizeHorzCY><sizeVertCX>114881</sizeVertCX><sizeVertCY>731161</sizeVertCY></Rect></Wnd2></Sizes></Row0></Left><Right><Row0><Sizes><Wnd4><Rect><Top>-2</Top><Left>-2</Left><Bottom>716</Bottom><Right>470</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>119048</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>280952</sizeVertCX><sizeVertCY>731161</sizeVertCY></Rect></Wnd4></Sizes></Row0></Right><Bottom><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>198</Bottom><Right>1682</Right><x>-2</x><y>-2</y><xscreen>1684</xscreen><yscreen>200</yscreen><sizeHorzCX>1002381</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>119048</sizeVertCX><sizeVertCY>203666</sizeVertCY></Rect></Wnd3></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>\r
   </Desktop>\r
 </Project>\r
 \r

diff --git a/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.dni b/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.dni
index e460b1315e92942b28c9905e8e0531141054738b..855b4641b19a1a3e3ac9997a64c8dda21dc8ed31 100644 (file)
--- a/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.dni
+++ b/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.dni
@@ -1,5 +1,5 @@
 [DebugChecksum]\r
-Checksum=-1276943022\r
+Checksum=-130781403\r
 [DisAssemblyWindow]\r
 NumStates=_ 1\r
 State 1=_ 1\r
@@ -39,7 +39,7 @@ LogFile=_ ""
 Enabled=0\r
 [DriverProfiling]\r
 Enabled=0\r
-Mode=20158624\r
+Mode=151407352\r
 Graph=0\r
 Symbiont=0\r
 [Breakpoints]\r

diff --git a/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.wsdt b/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.wsdt
index 41f77d35e73c09e018963e294a016e1071983b0d..ede8c1352459d4bb98730c59f303fe3a23a2c240 100644 (file)
--- a/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.wsdt
+++ b/Demo/MSP430X_MSP430F5438_IAR/settings/RTOSDemo.wsdt
@@ -3,7 +3,7 @@
 <Workspace>\r
   <ConfigDictionary>\r
     \r
-  <CurrentConfigs><Project>RTOSDemo/Debug</Project></CurrentConfigs></ConfigDictionary>\r
+  <CurrentConfigs><Project>RTOSDemo/Debug_Large_Data_Model</Project></CurrentConfigs></ConfigDictionary>\r
   <Desktop>\r
     <Static>\r
       <Workspace>\r
@@ -53,14 +53,14 @@
       \r
       \r
       \r
-    <Pane><Tab><Factory>TextEditor</Factory><Filename>$WS_DIR$\main.c</Filename><XPos>0</XPos><YPos>227</YPos><SelStart>12065</SelStart><SelEnd>12065</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>$WS_DIR$\main.c</Filename><XPos>0</XPos><YPos>41</YPos><SelStart>12561</SelStart><SelEnd>12561</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-012aad38><key>iaridepm.enu1</key></Toolbar-012aad38></Sizes></Row0><Row1><Sizes/></Row1><Row2><Sizes/></Row2><Row3><Sizes/></Row3><Row4><Sizes/></Row4><Row5><Sizes/></Row5><Row6><Sizes/></Row6></Top><Left><Row0><Sizes><Wnd2><Rect><Top>-2</Top><Left>-2</Left><Bottom>645</Bottom><Right>309</Right><x>-2</x><y>-2</y><xscreen>331</xscreen><yscreen>267</yscreen><sizeHorzCX>197024</sizeHorzCX><sizeHorzCY>271894</sizeHorzCY><sizeVertCX>185119</sizeVertCX><sizeVertCY>658859</sizeVertCY></Rect></Wnd2></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>293</Bottom><Right>1682</Right><x>-2</x><y>-2</y><xscreen>1684</xscreen><yscreen>295</yscreen><sizeHorzCX>1002381</sizeHorzCX><sizeHorzCY>300407</sizeHorzCY><sizeVertCX>197024</sizeVertCX><sizeVertCY>271894</sizeVertCY></Rect></Wnd3></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>\r
+    <Top><Row0><Sizes><Toolbar-012aad60><key>iaridepm.enu1</key></Toolbar-012aad60></Sizes></Row0><Row1><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><Row13><Sizes/></Row13><Row14><Sizes/></Row14><Row15><Sizes/></Row15><Row16><Sizes/></Row16></Top><Left><Row0><Sizes><Wnd2><Rect><Top>-2</Top><Left>-2</Left><Bottom>645</Bottom><Right>309</Right><x>-2</x><y>-2</y><xscreen>331</xscreen><yscreen>267</yscreen><sizeHorzCX>197024</sizeHorzCX><sizeHorzCY>271894</sizeHorzCY><sizeVertCX>185119</sizeVertCX><sizeVertCY>658859</sizeVertCY></Rect></Wnd2></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>293</Bottom><Right>1682</Right><x>-2</x><y>-2</y><xscreen>1684</xscreen><yscreen>295</yscreen><sizeHorzCX>1002381</sizeHorzCX><sizeHorzCY>300407</sizeHorzCY><sizeVertCX>197024</sizeVertCX><sizeVertCY>271894</sizeVertCY></Rect></Wnd3></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>\r
   </Desktop>\r
 </Workspace>\r
 \r