From 22a5af0eae2302ee43b0ed51b3b815bf40f79c44 Mon Sep 17 00:00:00 2001
From: Kelvin Lawson <kelvin.a.lawson@gmail.com>
Date: Fri, 16 Sep 2011 22:55:40 +0100
Subject: [PATCH] Use near_func to work with later versions of IAR EWSTM8
 (1.20+). Project files upgraded to EWSTM8 1.30.

---
 ports/stm8/atomport-asm-iar.s         |  2 +-
 ports/stm8/atomthreads-sample-iar.ewd | 68 +++++++++++++++++++++++----
 ports/stm8/atomthreads-sample-iar.ewp | 44 +++++++++++------
 3 files changed, 89 insertions(+), 25 deletions(-)

diff --git a/ports/stm8/atomport-asm-iar.s b/ports/stm8/atomport-asm-iar.s
index dc7c286..1c79d1d 100644
--- a/ports/stm8/atomport-asm-iar.s
+++ b/ports/stm8/atomport-asm-iar.s
@@ -32,7 +32,7 @@
 
 
   NAME ATOMPORTASM
-  SECTION .text:code
+  SECTION .near_func.text:code
 
 ; Get definitions for virtual registers used by the compiler
 #include "vregs.inc"
diff --git a/ports/stm8/atomthreads-sample-iar.ewd b/ports/stm8/atomthreads-sample-iar.ewd
index 5dc3141..9858dbd 100644
--- a/ports/stm8/atomthreads-sample-iar.ewd
+++ b/ports/stm8/atomthreads-sample-iar.ewd
@@ -12,7 +12,7 @@
       <name>C-SPY</name>
       <archiveVersion>1</archiveVersion>
       <data>
-        <version>0</version>
+        <version>1</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>1</debug>
         <option>
@@ -83,6 +83,30 @@
           <name>CSpyImagesPath3</name>
           <state></state>
         </option>
+        <option>
+          <name>CSpyImagesOffset1</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CSpyImagesOffset2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CSpyImagesOffset3</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CSpyImagesUse1</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CSpyImagesUse2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CSpyImagesUse3</name>
+          <state>0</state>
+        </option>
       </data>
     </settings>
     <settings>
@@ -161,6 +185,10 @@
       </data>
     </settings>
     <debuggerPlugins>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
       <plugin>
         <file>$EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin</file>
         <loadFlag>1</loadFlag>
@@ -169,10 +197,6 @@
         <file>$EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin</file>
         <loadFlag>0</loadFlag>
       </plugin>
-      <plugin>
-        <file>$EW_DIR$\common\plugins\Profiling\Profiling.ENU.ewplugin</file>
-        <loadFlag>1</loadFlag>
-      </plugin>
       <plugin>
         <file>$EW_DIR$\common\plugins\Stack\Stack.ENU.ewplugin</file>
         <loadFlag>1</loadFlag>
@@ -193,7 +217,7 @@
       <name>C-SPY</name>
       <archiveVersion>1</archiveVersion>
       <data>
-        <version>0</version>
+        <version>1</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>0</debug>
         <option>
@@ -264,6 +288,30 @@
           <name>CSpyImagesPath3</name>
           <state></state>
         </option>
+        <option>
+          <name>CSpyImagesOffset1</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CSpyImagesOffset2</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CSpyImagesOffset3</name>
+          <state></state>
+        </option>
+        <option>
+          <name>CSpyImagesUse1</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CSpyImagesUse2</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>CSpyImagesUse3</name>
+          <state>0</state>
+        </option>
       </data>
     </settings>
     <settings>
@@ -342,6 +390,10 @@
       </data>
     </settings>
     <debuggerPlugins>
+      <plugin>
+        <file>$TOOLKIT_DIR$\plugins\rtos\embOS\embOSPlugin.ewplugin</file>
+        <loadFlag>0</loadFlag>
+      </plugin>
       <plugin>
         <file>$EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin</file>
         <loadFlag>1</loadFlag>
@@ -350,10 +402,6 @@
         <file>$EW_DIR$\common\plugins\Orti\Orti.ENU.ewplugin</file>
         <loadFlag>0</loadFlag>
       </plugin>
-      <plugin>
-        <file>$EW_DIR$\common\plugins\Profiling\Profiling.ENU.ewplugin</file>
-        <loadFlag>1</loadFlag>
-      </plugin>
       <plugin>
         <file>$EW_DIR$\common\plugins\Stack\Stack.ENU.ewplugin</file>
         <loadFlag>1</loadFlag>
diff --git a/ports/stm8/atomthreads-sample-iar.ewp b/ports/stm8/atomthreads-sample-iar.ewp
index ae76bf8..8a8d48a 100644
--- a/ports/stm8/atomthreads-sample-iar.ewp
+++ b/ports/stm8/atomthreads-sample-iar.ewp
@@ -10,7 +10,7 @@
     <debug>1</debug>
     <settings>
       <name>General</name>
-      <archiveVersion>1</archiveVersion>
+      <archiveVersion>2</archiveVersion>
       <data>
         <version>1</version>
         <wantNonLocal>1</wantNonLocal>
@@ -115,7 +115,7 @@
     </settings>
     <settings>
       <name>ICCSTM8</name>
-      <archiveVersion>1</archiveVersion>
+      <archiveVersion>2</archiveVersion>
       <data>
         <version>8</version>
         <wantNonLocal>1</wantNonLocal>
@@ -306,7 +306,7 @@
     </settings>
     <settings>
       <name>ASTM8</name>
-      <archiveVersion>1</archiveVersion>
+      <archiveVersion>2</archiveVersion>
       <data>
         <version>1</version>
         <wantNonLocal>1</wantNonLocal>
@@ -499,9 +499,9 @@
     </settings>
     <settings>
       <name>ILINK</name>
-      <archiveVersion>1</archiveVersion>
+      <archiveVersion>2</archiveVersion>
       <data>
-        <version>0</version>
+        <version>1</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>1</debug>
         <option>
@@ -723,11 +723,19 @@
           <name>IlinkLogUnusedFragments</name>
           <state>0</state>
         </option>
+        <option>
+          <name>IlinkCrcReverseByteOrder</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCrcUseAsInput</name>
+          <state>1</state>
+        </option>
       </data>
     </settings>
     <settings>
       <name>IARCHIVE</name>
-      <archiveVersion>1</archiveVersion>
+      <archiveVersion>2</archiveVersion>
       <data>
         <version>0</version>
         <wantNonLocal>1</wantNonLocal>
@@ -760,7 +768,7 @@
     <debug>0</debug>
     <settings>
       <name>General</name>
-      <archiveVersion>1</archiveVersion>
+      <archiveVersion>2</archiveVersion>
       <data>
         <version>1</version>
         <wantNonLocal>1</wantNonLocal>
@@ -865,7 +873,7 @@
     </settings>
     <settings>
       <name>ICCSTM8</name>
-      <archiveVersion>1</archiveVersion>
+      <archiveVersion>2</archiveVersion>
       <data>
         <version>8</version>
         <wantNonLocal>1</wantNonLocal>
@@ -1056,7 +1064,7 @@
     </settings>
     <settings>
       <name>ASTM8</name>
-      <archiveVersion>1</archiveVersion>
+      <archiveVersion>2</archiveVersion>
       <data>
         <version>1</version>
         <wantNonLocal>1</wantNonLocal>
@@ -1249,9 +1257,9 @@
     </settings>
     <settings>
       <name>ILINK</name>
-      <archiveVersion>1</archiveVersion>
+      <archiveVersion>2</archiveVersion>
       <data>
-        <version>0</version>
+        <version>1</version>
         <wantNonLocal>1</wantNonLocal>
         <debug>0</debug>
         <option>
@@ -1473,11 +1481,19 @@
           <name>IlinkLogUnusedFragments</name>
           <state>0</state>
         </option>
+        <option>
+          <name>IlinkCrcReverseByteOrder</name>
+          <state>0</state>
+        </option>
+        <option>
+          <name>IlinkCrcUseAsInput</name>
+          <state>1</state>
+        </option>
       </data>
     </settings>
     <settings>
       <name>IARCHIVE</name>
-      <archiveVersion>1</archiveVersion>
+      <archiveVersion>2</archiveVersion>
       <data>
         <version>0</version>
         <wantNonLocal>1</wantNonLocal>
@@ -2332,7 +2348,7 @@
       <name>$PROJ_DIR$\stm8s-periphs\stm8s_clk.c</name>
     </file>
     <file>
-      <name>$PROJ_DIR$\stm8s-periphs\stm8s_clk.h</name>
+      <name>$PROJ_DIR$\STM8S-PERIPHS\stm8s_clk.h</name>
     </file>
     <file>
       <name>$PROJ_DIR$\stm8s-periphs\stm8s_gpio.c</name>
@@ -2359,7 +2375,7 @@
       <name>$PROJ_DIR$\STM8S-PERIPHS\stm8s_uart2.c</name>
     </file>
     <file>
-      <name>$PROJ_DIR$\stm8s-periphs\stm8s_uart2.h</name>
+      <name>$PROJ_DIR$\STM8S-PERIPHS\stm8s_uart2.h</name>
     </file>
     <configuration>
       <name>Debug</name>