Commit ed3cc555 authored by Jeffrey Lee's avatar Jeffrey Lee
Browse files

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

Fix bug in InitCMOSCache that could cause CMOS to be errouneously reset if NVRAM is of type 'MaybeIIC'

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 fallen through to using the (likely unimplemented) HAL interface for initialising the NVRAM cache.
Admin:
  Tested in IOMD build under RPCemu; kernel now takes the correct path for MaybeIIC + ProtectAtEnd.


Version 5.35, 4.79.2.109. Tagged as 'Kernel-5_35-4_79_2_109'
parent dc03d9c3
......@@ -13,11 +13,11 @@
GBLS Module_ComponentPath
Module_MajorVersion SETS "5.35"
Module_Version SETA 535
Module_MinorVersion SETS "4.79.2.108"
Module_Date SETS "19 Jan 2010"
Module_ApplicationDate SETS "19-Jan-10"
Module_MinorVersion SETS "4.79.2.109"
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.108)"
Module_HelpVersion SETS "5.35 (19 Jan 2010) 4.79.2.108"
Module_FullVersion SETS "5.35 (4.79.2.109)"
Module_HelpVersion SETS "5.35 (02 Feb 2010) 4.79.2.109"
END
......@@ -5,19 +5,19 @@
*
*/
#define Module_MajorVersion_CMHG 5.35
#define Module_MinorVersion_CMHG 4.79.2.108
#define Module_Date_CMHG 19 Jan 2010
#define Module_MinorVersion_CMHG 4.79.2.109
#define Module_Date_CMHG 02 Feb 2010
#define Module_MajorVersion "5.35"
#define Module_Version 535
#define Module_MinorVersion "4.79.2.108"
#define Module_Date "19 Jan 2010"
#define Module_MinorVersion "4.79.2.109"
#define Module_Date "02 Feb 2010"
#define Module_ApplicationDate "19-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.108)"
#define Module_HelpVersion "5.35 (19 Jan 2010) 4.79.2.108"
#define Module_FullVersion "5.35 (4.79.2.109)"
#define Module_HelpVersion "5.35 (02 Feb 2010) 4.79.2.109"
#define Module_LibraryVersionInfo "5:35"
......@@ -1474,7 +1474,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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment