From 0c77dd31591ae2605fb4df6a3daf801ddd136765 Mon Sep 17 00:00:00 2001
From: Robert Catherall <rcathera@gitlab.riscosopen.org>
Date: Fri, 8 Sep 2000 14:15:21 +0000
Subject: [PATCH] Checked for occurences of NVRam specific workspace and put in
guard condition
[ E2ROMSupport
.....
]
Detail:
Changes to s.Middle (SysReadInfo routine that used #NVRamSpeed) and
s.PMF.i2cutils #NVRamSpeed again
Admin:
Compiles okay
Requires HdrSrc-0_99 or greater (for MaxI2Cspeed variable)
Version 5.35. Tagged as 'Kernel-5_35'
---
VersionASM | 12 ++++++------
VersionNum | 18 +++++++++---------
s/PMF/i2cutils | 4 ++++
3 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/VersionASM b/VersionASM
index 29102a08..ec88ecd2 100644
--- a/VersionASM
+++ b/VersionASM
@@ -8,11 +8,11 @@
GBLS Module_FullVersion
GBLS Module_ApplicationDate2
GBLS Module_ApplicationDate4
-Module_MajorVersion SETS "5.34"
-Module_Version SETA 534
+Module_MajorVersion SETS "5.35"
+Module_Version SETA 535
Module_MinorVersion SETS ""
-Module_Date SETS "07 Sep 2000"
-Module_ApplicationDate2 SETS "07-Sep-00"
-Module_ApplicationDate4 SETS "07-Sep-2000"
-Module_FullVersion SETS "5.34"
+Module_Date SETS "08 Sep 2000"
+Module_ApplicationDate2 SETS "08-Sep-00"
+Module_ApplicationDate4 SETS "08-Sep-2000"
+Module_FullVersion SETS "5.35"
END
diff --git a/VersionNum b/VersionNum
index 726a076d..df2d35ea 100644
--- a/VersionNum
+++ b/VersionNum
@@ -1,18 +1,18 @@
-/* (5.34)
+/* (5.35)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
-#define Module_MajorVersion_CMHG 5.34
+#define Module_MajorVersion_CMHG 5.35
#define Module_MinorVersion_CMHG
-#define Module_Date_CMHG 07 Sep 2000
+#define Module_Date_CMHG 08 Sep 2000
-#define Module_MajorVersion "5.34"
-#define Module_Version 534
+#define Module_MajorVersion "5.35"
+#define Module_Version 535
#define Module_MinorVersion ""
-#define Module_Date "07 Sep 2000"
+#define Module_Date "08 Sep 2000"
-#define Module_ApplicationDate2 "07-Sep-00"
-#define Module_ApplicationDate4 "07-Sep-2000"
+#define Module_ApplicationDate2 "08-Sep-00"
+#define Module_ApplicationDate4 "08-Sep-2000"
-#define Module_FullVersion "5.34"
+#define Module_FullVersion "5.35"
diff --git a/s/PMF/i2cutils b/s/PMF/i2cutils
index 008479f9..f87ab27e 100644
--- a/s/PMF/i2cutils
+++ b/s/PMF/i2cutils
@@ -131,6 +131,7 @@ SetC1C0 ROUT
MOV R2, #IOC
STRB R0, [R2, #IOCControl]
+ [ E2ROMSupport
[ :LNOT: :DEF: TestHarness
MOV R0, #0
LDRB R0, [R0, #NVRamSpeed]
@@ -139,6 +140,9 @@ SetC1C0 ROUT
]
TEQ R0, #0
MOVEQ R0, #10 ; default value if speed not checked yet
+ |
+ MOV R0, #10 ; default to slowest value if we have E2ROMSupport is false
+ ]
BL DoMicroDelay
[ No26bitCode
--
GitLab