Continued development on NEC ports.

git-svn-id: https://freertos.svn.sourceforge.net/svnroot/freertos/trunk@693 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

7 files changed, 58 insertions, 37 deletions

diff --git a/Demo/NEC_78K0R_IAR/FreeRTOSConfig.h b/Demo/NEC_78K0R_IAR/FreeRTOSConfig.h
index 03a726b8..385133be 100644
--- a/Demo/NEC_78K0R_IAR/FreeRTOSConfig.h
+++ b/Demo/NEC_78K0R_IAR/FreeRTOSConfig.h
@@ -64,7 +64,7 @@
  *

  * This setting must match the setting in the IAR project options.

  */

-#define configMEMORY_MODE               1

+#define configMEMORY_MODE               0

 

 /*

  * Application specific definitions.

@@ -135,7 +135,7 @@
 			#include <io78f1009_64.h>

 			#include <io78f1009_64_ext.h>

 		

-			#define configTOTAL_HEAP_SIZE			( (size_t ) ( 2400 ) )

+			#define configTOTAL_HEAP_SIZE			( (size_t ) ( 2500 ) )

 		

 		#endif /* _IAR_78K0R_Kx3L__ */

 	

diff --git a/Demo/NEC_78K0R_IAR/main.c b/Demo/NEC_78K0R_IAR/main.c
index 7c2c2e46..4274a4e3 100644
--- a/Demo/NEC_78K0R_IAR/main.c
+++ b/Demo/NEC_78K0R_IAR/main.c
@@ -168,9 +168,6 @@ short main( void )
 	/* First create the 'standard demo' tasks.  These are used to demonstrate

 	API functions being used and also to test the kernel port.  More information

 	is provided on the FreeRTOS.org WEB site. */

-	vStartPolledQueueTasks( mainQUEUE_POLL_PRIORITY );

-	vStartSemaphoreTasks(mainSEMTEST_PRIORITY);

-	vStartGenericQueueTasks( mainGEN_QUEUE_PRIORITY );

 	vStartDynamicPriorityTasks();

 	vCreateBlockTimeTasks();

 

@@ -184,6 +181,15 @@ short main( void )
 	/* Create the 'check' task as described at the top of this file. */

 	xTaskCreate( vErrorChecks, "Check", configMINIMAL_STACK_SIZE, ( void* )mainCHECK_PARAMETER_VALUE, mainCHECK_TASK_PRIORITY, NULL );

 

+	#ifdef __IAR_78K0R_Kx3__

+	{

+		/* The Kx3 has enough RAM to create more of the standard demo tasks. */

+		vStartPolledQueueTasks( mainQUEUE_POLL_PRIORITY );

+		vStartSemaphoreTasks(mainSEMTEST_PRIORITY);

+		vStartGenericQueueTasks( mainGEN_QUEUE_PRIORITY );

+	}

+	#endif

+	

 	/* Finally start the scheduler running. */

 	vTaskStartScheduler();

 

@@ -217,21 +223,6 @@ portTickType xToggleRate = mainNO_ERROR_TOGGLE_PERIOD, xLastWakeTime;
 		/* Wait until it is time to check all the other tasks again. */

 		vTaskDelayUntil( &xLastWakeTime, xToggleRate );

 

-		if( xAreGenericQueueTasksStillRunning() != pdTRUE )

-		{

-			xToggleRate = mainERROR_TOGGLE_PERIOD;

-		}

-

-		if( xArePollingQueuesStillRunning() != pdTRUE)

-		{

-			xToggleRate = mainERROR_TOGGLE_PERIOD;

-		}

-

-		if( xAreSemaphoreTasksStillRunning() != pdTRUE)

-		{

-			xToggleRate = mainERROR_TOGGLE_PERIOD;

-		}

-		

 		if( xAreDynamicPriorityTasksStillRunning() != pdTRUE )

 		{

 			xToggleRate = mainERROR_TOGGLE_PERIOD;

@@ -247,6 +238,26 @@ portTickType xToggleRate = mainNO_ERROR_TOGGLE_PERIOD, xLastWakeTime;
 			xToggleRate = mainERROR_TOGGLE_PERIOD;

 		}

 

+		#ifdef __IAR_78K0R_Kx3__

+		{

+			/* Only the Kx3 runs all the tasks. */

+			if( xArePollingQueuesStillRunning() != pdTRUE)

+			{

+				xToggleRate = mainERROR_TOGGLE_PERIOD;

+			}

+		

+			if( xAreSemaphoreTasksStillRunning() != pdTRUE)

+			{

+				xToggleRate = mainERROR_TOGGLE_PERIOD;

+			}

+			

+			if( xAreGenericQueueTasksStillRunning() != pdTRUE )

+			{

+				xToggleRate = mainERROR_TOGGLE_PERIOD;

+			}	

+		}

+		#endif

+		

 		/* Toggle the LED.  The toggle rate will depend on whether or not an

 		error has been found in any tasks. */

 		mainLED_0 = !mainLED_0;

diff --git a/Demo/NEC_78K0R_IAR/rtosdemo.ewd b/Demo/NEC_78K0R_IAR/rtosdemo.ewd
index 602fa5b1..db935ff2 100644
--- a/Demo/NEC_78K0R_IAR/rtosdemo.ewd
+++ b/Demo/NEC_78K0R_IAR/rtosdemo.ewd
@@ -297,7 +297,7 @@
         </option>

         <option>

           <name>DDFFile</name>

-          <state>$TOOLKIT_DIR$\CONFIG\DDF\io78f1166_a0.ddf</state>

+          <state>$TOOLKIT_DIR$\CONFIG\DDF\io78f1009_64.ddf</state>

         </option>

         <option>

           <name>DebuggerNearConstLocation</name>

diff --git a/Demo/NEC_78K0R_IAR/rtosdemo.ewp b/Demo/NEC_78K0R_IAR/rtosdemo.ewp
index d994f506..6d371fd3 100644
--- a/Demo/NEC_78K0R_IAR/rtosdemo.ewp
+++ b/Demo/NEC_78K0R_IAR/rtosdemo.ewp
@@ -969,7 +969,7 @@
         </option>

         <option>

           <name>RTLibraryPath</name>

-          <state>$TOOLKIT_DIR$\LIB\CLIB\cl78kff3.r26</state>

+          <state>$TOOLKIT_DIR$\LIB\CLIB\cl78knn3.r26</state>

         </option>

         <option>

           <name>Input variant</name>

@@ -991,7 +991,7 @@
         </option>

         <option>

           <name>GHeapSize</name>

-          <state>512</state>

+          <state>4</state>

         </option>

         <option>

           <name>GRuntimeLibSelectSlave</name>

@@ -1370,8 +1370,8 @@
         </option>

         <option>

           <name>ADefines</name>

-          <state>__FAR_MODEL__</state>

-          <state>__FAR_DATA_MODEL__</state>

+          <state>__NEAR_MODEL__</state>

+          <state>__NEAR_DATA_MODEL__</state>

         </option>

         <option>

           <name>Debug</name>

diff --git a/Demo/NEC_78K0R_IAR/settings/rtosdemo.dbgdt b/Demo/NEC_78K0R_IAR/settings/rtosdemo.dbgdt
index 9717d1e1..1ea2a65c 100644
--- a/Demo/NEC_78K0R_IAR/settings/rtosdemo.dbgdt
+++ b/Demo/NEC_78K0R_IAR/settings/rtosdemo.dbgdt
@@ -28,11 +28,11 @@
         

         

       <MixedMode>1</MixedMode><CodeCovShow>0</CodeCovShow></Disassembly>

-    <Register><PreferedWindows><Position>2</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows/></PreferedWindows></Register><Watch><Format><struct_types/><watch_formats><Fmt><Key>{W}Watch-1:usCriticalNesting</Key><Value>3</Value></Fmt></watch_formats></Format><PreferedWindows><Position>3</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows><Window><Factory>Debug-Log</Factory></Window><Window><Factory>Watch</Factory></Window><Window><Factory>Breakpoints</Factory></Window></Windows></PreferedWindows><Column0>203</Column0><Column1>122</Column1><Column2>100</Column2><Column3>100</Column3></Watch><Memory><PreferedWindows><Position>3</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows/></PreferedWindows><FindDirection>1</FindDirection><FindAsHex>0</FindAsHex></Memory><Breakpoints><PreferedWindows><Position>3</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows><Window><Factory>Debug-Log</Factory></Window><Window><Factory>Watch</Factory></Window><Window><Factory>Watch</Factory></Window></Windows></PreferedWindows></Breakpoints></Static>

+    <Register><PreferedWindows><Position>2</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows/></PreferedWindows></Register><Watch><Format><struct_types/><watch_formats><Fmt><Key>{W}Watch-1:usCriticalNesting</Key><Value>3</Value></Fmt><Fmt><Key>{W}Watch-1:xNextFreeByte</Key><Value>3</Value></Fmt></watch_formats></Format><PreferedWindows><Position>3</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows><Window><Factory>Debug-Log</Factory></Window><Window><Factory>Watch</Factory></Window><Window><Factory>Breakpoints</Factory></Window></Windows></PreferedWindows><Column0>203</Column0><Column1>122</Column1><Column2>100</Column2><Column3>100</Column3></Watch><Memory><PreferedWindows><Position>3</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows/></PreferedWindows><FindDirection>1</FindDirection><FindAsHex>0</FindAsHex></Memory><Breakpoints><PreferedWindows><Position>3</Position><ScreenPosX>0</ScreenPosX><ScreenPosY>0</ScreenPosY><Windows><Window><Factory>Debug-Log</Factory></Window><Window><Factory>Watch</Factory></Window><Window><Factory>Watch</Factory></Window></Windows></PreferedWindows></Breakpoints></Static>

     <Windows>

       

       

-    <Wnd3>

+    <Wnd2>

         <Tabs>

           <Tab>

             <Identity>TabID-26641-1982</Identity>

@@ -44,20 +44,20 @@
           </Tab>

         </Tabs>

         

-      <SelectedTab>0</SelectedTab></Wnd3><Wnd4><Tabs><Tab><Identity>TabID-12022-5554</Identity><TabName>Memory</TabName><Factory>Memory</Factory><Session><ZoneNumber>5</ZoneNumber><SelectionAnchor>104832064d</SelectionAnchor><SelectionEnd>104832064d</SelectionEnd><UnitsPerGroup>2</UnitsPerGroup><EndianMode>0</EndianMode><DataCovEnabled>0</DataCovEnabled><DataCovShown>0</DataCovShown><HScroll>064d</HScroll><VScroll>6549664d</VScroll></Session></Tab><Tab><Identity>TabID-12503-6978</Identity><TabName>Watch</TabName><Factory>Watch</Factory><Session><Expressions><Expression><Expression>usCriticalNesting</Expression></Expression></Expressions><TabId>1</TabId><Column0>203</Column0><Column1>122</Column1><Column2>100</Column2><Column3>100</Column3></Session></Tab><Tab><Identity>TabID-27225-8954</Identity><TabName>Debug Log</TabName><Factory>Debug-Log</Factory><Session/></Tab><Tab><Identity>TabID-5499-14538</Identity><TabName>Breakpoints</TabName><Factory>Breakpoints</Factory></Tab></Tabs><SelectedTab>2</SelectedTab></Wnd4></Windows>

+      <SelectedTab>0</SelectedTab></Wnd2><Wnd3><Tabs><Tab><Identity>TabID-12022-5554</Identity><TabName>Memory</TabName><Factory>Memory</Factory><Session><ZoneNumber>5</ZoneNumber><SelectionAnchor>104832064d</SelectionAnchor><SelectionEnd>104832064d</SelectionEnd><UnitsPerGroup>2</UnitsPerGroup><EndianMode>0</EndianMode><DataCovEnabled>0</DataCovEnabled><DataCovShown>0</DataCovShown><HScroll>064d</HScroll><VScroll>6549664d</VScroll></Session></Tab><Tab><Identity>TabID-12503-6978</Identity><TabName>Watch</TabName><Factory>Watch</Factory><Session><Expressions><Expression><Expression>xNextFreeByte</Expression></Expression><Expression><Expression>pvReturn</Expression></Expression></Expressions><TabId>1</TabId><Column0>203</Column0><Column1>122</Column1><Column2>100</Column2><Column3>100</Column3></Session></Tab><Tab><Identity>TabID-27225-8954</Identity><TabName>Debug Log</TabName><Factory>Debug-Log</Factory><Session/></Tab><Tab><Identity>TabID-5499-14538</Identity><TabName>Breakpoints</TabName><Factory>Breakpoints</Factory></Tab></Tabs><SelectedTab>1</SelectedTab></Wnd3></Windows>

     <Editor>

       

       

       

       

-    <Pane><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_78K0R_IAR\main.c</Filename><XPos>0</XPos><YPos>340</YPos><SelStart>9843</SelStart><SelEnd>9861</SelEnd></Tab><ActiveTab>0</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Source\tasks.c</Filename><XPos>0</XPos><YPos>342</YPos><SelStart>14654</SelStart><SelEnd>14654</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_78K0R_IAR\FreeRTOSConfig.h</Filename><XPos>0</XPos><YPos>44</YPos><SelStart>2540</SelStart><SelEnd>2558</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_78K0R_IAR\RegTest.s26</Filename><XPos>0</XPos><YPos>69</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_78K0R_IAR\ButtonISR.s26</Filename><XPos>0</XPos><YPos>43</YPos><SelStart>1947</SelStart><SelEnd>2345</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_78K0R_IAR\ButtonTask.c</Filename><XPos>0</XPos><YPos>93</YPos><SelStart>4200</SelStart><SelEnd>4786</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Source\portable\IAR\78K0R\port.c</Filename><XPos>0</XPos><YPos>198</YPos><SelStart>0</SelStart><SelEnd>0</SelEnd></Tab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>

+    <Pane><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_78K0R_IAR\main.c</Filename><XPos>0</XPos><YPos>167</YPos><SelStart>7284</SelStart><SelEnd>7284</SelEnd></Tab><ActiveTab>0</ActiveTab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Source\tasks.c</Filename><XPos>0</XPos><YPos>351</YPos><SelStart>14708</SelStart><SelEnd>14708</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_78K0R_IAR\FreeRTOSConfig.h</Filename><XPos>0</XPos><YPos>121</YPos><SelStart>5015</SelStart><SelEnd>5015</SelEnd></Tab><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Source\portable\MemMang\heap_1.c</Filename><XPos>0</XPos><YPos>117</YPos><SelStart>4647</SelStart><SelEnd>4647</SelEnd></Tab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>

     <Positions>

       

       

       

       

       

-    <Top><Row0><Sizes><Toolbar-00aa9c30><key>iaridepm.enu1</key></Toolbar-00aa9c30><Toolbar-02882698><key>debuggergui.enu1</key></Toolbar-02882698></Sizes></Row0></Top><Left><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>550</Bottom><Right>212</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>142857</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>152857</sizeVertCX><sizeVertCY>562118</sizeVertCY></Rect></Wnd3></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd4><Rect><Top>-2</Top><Left>-2</Left><Bottom>388</Bottom><Right>1402</Right><x>-2</x><y>-2</y><xscreen>1404</xscreen><yscreen>390</yscreen><sizeHorzCX>1002857</sizeHorzCX><sizeHorzCY>397149</sizeHorzCY><sizeVertCX>119286</sizeVertCX><sizeVertCY>203666</sizeVertCY></Rect></Wnd4></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>

+    <Top><Row0><Sizes><Toolbar-00aa98f0><key>iaridepm.enu1</key></Toolbar-00aa98f0><Toolbar-03afc638><key>debuggergui.enu1</key></Toolbar-03afc638></Sizes></Row0></Top><Left><Row0><Sizes><Wnd2><Rect><Top>-2</Top><Left>-2</Left><Bottom>550</Bottom><Right>212</Right><x>-2</x><y>-2</y><xscreen>200</xscreen><yscreen>200</yscreen><sizeHorzCX>142857</sizeHorzCX><sizeHorzCY>203666</sizeHorzCY><sizeVertCX>152857</sizeVertCX><sizeVertCY>562118</sizeVertCY></Rect></Wnd2></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>388</Bottom><Right>1402</Right><x>-2</x><y>-2</y><xscreen>1404</xscreen><yscreen>390</yscreen><sizeHorzCX>1002857</sizeHorzCX><sizeHorzCY>397149</sizeHorzCY><sizeVertCX>119286</sizeVertCX><sizeVertCY>203666</sizeVertCY></Rect></Wnd3></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>

   </Desktop>

 </Project>

 

diff --git a/Demo/NEC_78K0R_IAR/settings/rtosdemo.dni b/Demo/NEC_78K0R_IAR/settings/rtosdemo.dni
index c137aaa0..31178125 100644
--- a/Demo/NEC_78K0R_IAR/settings/rtosdemo.dni
+++ b/Demo/NEC_78K0R_IAR/settings/rtosdemo.dni
@@ -78,8 +78,18 @@ Category=_ 0
 [TermIOLog]

 LoggingEnabled=_ 0

 LogFile=_ ""

+[Interrupts]

+Enabled=1

+[MemoryMap]

+Enabled=0

+Base=0

+UseAuto=0

+TypeViolation=1

+UnspecRange=1

+ActionState=1

 [TraceHelper]

 Enabled=0

 ShowSource=1

 [Breakpoints]

-Count=0

+Bp0=_ "STD_CODE" "{C:\E\Dev\FreeRTOS\WorkingCopy3\Source\portable\MemMang\heap_1.c}.135.2@1" 1 0 0 0 "" 0 ""

+Count=1

diff --git a/Demo/NEC_78K0R_IAR/settings/rtosdemo.wsdt b/Demo/NEC_78K0R_IAR/settings/rtosdemo.wsdt
index 29388943..3da57c21 100644
--- a/Demo/NEC_78K0R_IAR/settings/rtosdemo.wsdt
+++ b/Demo/NEC_78K0R_IAR/settings/rtosdemo.wsdt
@@ -24,7 +24,7 @@
     <Windows>

       

       

-    <Wnd2>

+    <Wnd0>

         <Tabs>

           <Tab>

             <Identity>TabID-28554-14697</Identity>

@@ -32,11 +32,11 @@
             <Factory>Workspace</Factory>

             <Session>

               

-            <NodeDict><ExpandedNode>rtosdemo</ExpandedNode><ExpandedNode>rtosdemo/Demo Source</ExpandedNode><ExpandedNode>rtosdemo/Kernel Source</ExpandedNode></NodeDict></Session>

+            <NodeDict><ExpandedNode>rtosdemo</ExpandedNode><ExpandedNode>rtosdemo/Demo Source</ExpandedNode><ExpandedNode>rtosdemo/Kernel Source</ExpandedNode><ExpandedNode>rtosdemo/Output</ExpandedNode></NodeDict></Session>

           </Tab>

         </Tabs>

         

-      <SelectedTab>0</SelectedTab></Wnd2><Wnd3>

+      <SelectedTab>0</SelectedTab></Wnd0><Wnd1>

         <Tabs>

           <Tab>

             <Identity>TabID-24371-14776</Identity>

@@ -46,20 +46,20 @@
           </Tab>

         <Tab><Identity>TabID-2405-1208</Identity><TabName>Debug Log</TabName><Factory>Debug-Log</Factory><Session/></Tab><Tab><Identity>TabID-11455-24944</Identity><TabName>Find in Files</TabName><Factory>Find-in-Files</Factory><Session/></Tab></Tabs>

         

-      <SelectedTab>0</SelectedTab></Wnd3></Windows>

+      <SelectedTab>0</SelectedTab></Wnd1></Windows>

     <Editor>

       

       

       

       

-    <Pane><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_78K0R_IAR\main.c</Filename><XPos>0</XPos><YPos>340</YPos><SelStart>9843</SelStart><SelEnd>9861</SelEnd></Tab><ActiveTab>0</ActiveTab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>

+    <Pane><Tab><Factory>TextEditor</Factory><Filename>C:\E\Dev\FreeRTOS\WorkingCopy3\Demo\NEC_78K0R_IAR\main.c</Filename><XPos>0</XPos><YPos>158</YPos><SelStart>6760</SelStart><SelEnd>6786</SelEnd></Tab><ActiveTab>0</ActiveTab></Pane><ActivePane>0</ActivePane><Sizes><Pane><X>1000000</X><Y>1000000</Y></Pane></Sizes><SplitMode>1</SplitMode></Editor>

     <Positions>

       

       

       

       

       

-    <Top><Row0><Sizes><Toolbar-00aa9c30><key>iaridepm.enu1</key></Toolbar-00aa9c30></Sizes></Row0><Row1><Sizes/></Row1></Top><Left><Row0><Sizes><Wnd2><Rect><Top>-2</Top><Left>-2</Left><Bottom>535</Bottom><Right>351</Right><x>-2</x><y>-2</y><xscreen>218</xscreen><yscreen>205</yscreen><sizeHorzCX>155714</sizeHorzCX><sizeHorzCY>208758</sizeHorzCY><sizeVertCX>252143</sizeVertCX><sizeVertCY>546843</sizeVertCY></Rect></Wnd2></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd3><Rect><Top>-2</Top><Left>-2</Left><Bottom>403</Bottom><Right>1402</Right><x>-2</x><y>-2</y><xscreen>1404</xscreen><yscreen>405</yscreen><sizeHorzCX>1002857</sizeHorzCX><sizeHorzCY>412424</sizeHorzCY><sizeVertCX>155714</sizeVertCX><sizeVertCY>208758</sizeVertCY></Rect></Wnd3></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>

+    <Top><Row0><Sizes><Toolbar-00aa98f0><key>iaridepm.enu1</key></Toolbar-00aa98f0></Sizes></Row0></Top><Left><Row0><Sizes><Wnd0><Rect><Top>-2</Top><Left>-2</Left><Bottom>713</Bottom><Right>351</Right><x>-2</x><y>-2</y><xscreen>218</xscreen><yscreen>205</yscreen><sizeHorzCX>155714</sizeHorzCX><sizeHorzCY>208758</sizeHorzCY><sizeVertCX>252143</sizeVertCX><sizeVertCY>728106</sizeVertCY></Rect></Wnd0></Sizes></Row0></Left><Right><Row0><Sizes/></Row0></Right><Bottom><Row0><Sizes><Wnd1><Rect><Top>-2</Top><Left>-2</Left><Bottom>225</Bottom><Right>1402</Right><x>-2</x><y>-2</y><xscreen>1404</xscreen><yscreen>227</yscreen><sizeHorzCX>1002857</sizeHorzCX><sizeHorzCY>231161</sizeHorzCY><sizeVertCX>155714</sizeVertCX><sizeVertCY>208758</sizeVertCY></Rect></Wnd1></Sizes></Row0></Bottom><Float><Sizes/></Float></Positions>

   </Desktop>

 </Workspace>