Apply change from IIC-0_21 to HAL branch.

Version 0.18, 4.5.2.7. Tagged as 'IIC-0_18-4_5_2_7'

Apply change from IIC-0_21 to HAL branch.
Version 0.18, 4.5.2.7. Tagged as 'IIC-0_18-4_5_2_7'
8319b80a · Robert Sprowson · 1480d652 · 8319b80a · 8319b80a · 8319b80a
Commit 8319b80a authored Jan 01, 2012 by Robert Sprowson
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 14 deletions

VersionASM VersionASM +5 -5

VersionNum VersionNum +7 -7

s/IICMod s/IICMod +2 -2

No files found.
--- a/VersionASM
+++ b/VersionASM
@@ -13,11 +13,11 @@
                        GBLS    Module_ComponentPath
 Module_MajorVersion     SETS    "0.18"
 Module_Version          SETA    18
-Module_MinorVersion     SETS    "4.5.2.6"
-Module_Date             SETS    "04 Aug 2011"
-Module_ApplicationDate  SETS    "04-Aug-11"
+Module_MinorVersion     SETS    "4.5.2.7"
+Module_Date             SETS    "01 Jan 2012"
+Module_ApplicationDate  SETS    "01-Jan-12"
 Module_ComponentName    SETS    "IIC"
 Module_ComponentPath    SETS    "castle/RiscOS/Sources/HWSupport/IIC"
-Module_FullVersion      SETS    "0.18 (4.5.2.6)"
-Module_HelpVersion      SETS    "0.18 (04 Aug 2011) 4.5.2.6"
+Module_FullVersion      SETS    "0.18 (4.5.2.7)"
+Module_HelpVersion      SETS    "0.18 (01 Jan 2012) 4.5.2.7"
                        END
--- a/VersionNum
+++ b/VersionNum
@@ -5,19 +5,19 @@
 *
 */
 #define Module_MajorVersion_CMHG        0.18
-#define Module_MinorVersion_CMHG        4.5.2.6
-#define Module_Date_CMHG                04 Aug 2011
+#define Module_MinorVersion_CMHG        4.5.2.7
+#define Module_Date_CMHG                01 Jan 2012

 #define Module_MajorVersion             "0.18"
 #define Module_Version                  18
-#define Module_MinorVersion             "4.5.2.6"
-#define Module_Date                     "04 Aug 2011"
+#define Module_MinorVersion             "4.5.2.7"
+#define Module_Date                     "01 Jan 2012"

-#define Module_ApplicationDate          "04-Aug-11"
+#define Module_ApplicationDate          "01-Jan-12"

 #define Module_ComponentName            "IIC"
 #define Module_ComponentPath            "castle/RiscOS/Sources/HWSupport/IIC"

-#define Module_FullVersion              "0.18 (4.5.2.6)"
-#define Module_HelpVersion              "0.18 (04 Aug 2011) 4.5.2.6"
+#define Module_FullVersion              "0.18 (4.5.2.7)"
+#define Module_HelpVersion              "0.18 (01 Jan 2012) 4.5.2.7"
 #define Module_LibraryVersionInfo       "0:18"
--- a/s/IICMod
+++ b/s/IICMod
@@ -363,12 +363,12 @@ inspect_IRQ_stack

        ; Kernel IIC code is threaded!
        ; Can't easily do a OS_Heap type trick, so just report an error instead
-        RestPSR R2,, c
+        RestPSR R2,, cf
        Pull    "R0-R2,R14"
        B       ReturnIICInUseError

 iis_end
-        RestPSR R2,, c
+        RestPSR R2,, cf
        Pull    "R0-R2,R14"
      ]
        LDR     R11, IICSWIThreaded