Fix bug in InitCMOSCache that could cause CMOS to be erroneously reset if...

Fix bug in InitCMOSCache that could cause CMOS to be erroneously reset if NVRAM is of type 'MaybeIIC' (Cortex branch)

Detail:
  s/PMF/i2cutils - Kernel was checking if the full IIC flags word was equal to MaybeIIC instead of just checking if the Provision bits equalled MaybeIIC. Thus if any of the additional flags were set along with MaybeIIC the kernel would have skipped the probing code, skipped the IIC code, and then fallen through to using the (likely unimplemented) HAL interface for initialising the NVRAM cache.
Admin:
  Fix tested in HAL branch in IOMD build under RPCemu; kernel now takes the correct path for MaybeIIC + ProtectAtEnd.


Version 5.35, 4.79.2.98.2.22. Tagged as 'Kernel-5_35-4_79_2_98_2_22'

VersionASM

@@ -13,11 +13,11 @@
                         GBLS    Module_ComponentPath
 Module_MajorVersion     SETS    "5.35"
 Module_Version          SETA    535
-Module_MinorVersion     SETS    "4.79.2.98.2.21"
-Module_Date             SETS    "24 Jan 2010"
-Module_ApplicationDate  SETS    "24-Jan-10"
+Module_MinorVersion     SETS    "4.79.2.98.2.22"
+Module_Date             SETS    "02 Feb 2010"
+Module_ApplicationDate  SETS    "02-Feb-10"
 Module_ComponentName    SETS    "Kernel"
 Module_ComponentPath    SETS    "castle/RiscOS/Sources/Kernel"
-Module_FullVersion      SETS    "5.35 (4.79.2.98.2.21)"
-Module_HelpVersion      SETS    "5.35 (24 Jan 2010) 4.79.2.98.2.21"
+Module_FullVersion      SETS    "5.35 (4.79.2.98.2.22)"
+Module_HelpVersion      SETS    "5.35 (02 Feb 2010) 4.79.2.98.2.22"
                         END

VersionNum

@@ -5,19 +5,19 @@
  *
  */
 #define Module_MajorVersion_CMHG        5.35
-#define Module_MinorVersion_CMHG        4.79.2.98.2.21
-#define Module_Date_CMHG                24 Jan 2010
+#define Module_MinorVersion_CMHG        4.79.2.98.2.22
+#define Module_Date_CMHG                02 Feb 2010
 
 #define Module_MajorVersion             "5.35"
 #define Module_Version                  535
-#define Module_MinorVersion             "4.79.2.98.2.21"
-#define Module_Date                     "24 Jan 2010"
+#define Module_MinorVersion             "4.79.2.98.2.22"
+#define Module_Date                     "02 Feb 2010"
 
-#define Module_ApplicationDate          "24-Jan-10"
+#define Module_ApplicationDate          "02-Feb-10"
 
 #define Module_ComponentName            "Kernel"
 #define Module_ComponentPath            "castle/RiscOS/Sources/Kernel"
 
-#define Module_FullVersion              "5.35 (4.79.2.98.2.21)"
-#define Module_HelpVersion              "5.35 (24 Jan 2010) 4.79.2.98.2.21"
+#define Module_FullVersion              "5.35 (4.79.2.98.2.22)"
+#define Module_HelpVersion              "5.35 (02 Feb 2010) 4.79.2.98.2.22"
 #define Module_LibraryVersionInfo       "5:35"

s/PMF/i2cutils

@@ -1629,7 +1629,7 @@ InitCMOSCache	Entry "r1-r6, sb,r12"
         BEQ     InitCMOSCache_NoCMOS
 
     	; If it's only a maybe, then we probe
-    	TEQ 	R5, #NVMemoryFlag_MaybeIIC
+    	TEQ 	R0, #NVMemoryFlag_MaybeIIC
     	BEQ 	%FT03
 
     	; Else we read the size