From abcadc7c34bf16623753b4908948c1d09631bfb7 Mon Sep 17 00:00:00 2001
From: Robert Sprowson <rsprowson@gitlab.riscosopen.org>
Date: Thu, 12 Mar 2015 18:33:23 +0000
Subject: [PATCH] Ensure HAL cache device is initialised
The Cache_HALDevice is in the RAM clear skip table, so when there's no controller found and the kernel is doing the RAM clear it's unset, leading to probable aborts when typing *CACHE Om|Off.
Version 5.35, 4.79.2.259. Tagged as 'Kernel-5_35-4_79_2_259'
---
VersionASM | 10 +++++-----
VersionNum | 14 +++++++-------
s/ARMops | 2 ++
3 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/VersionASM b/VersionASM
index 3e11733..dec6eae 100644
--- a/VersionASM
+++ b/VersionASM
@@ -13,11 +13,11 @@
GBLS Module_ComponentPath
Module_MajorVersion SETS "5.35"
Module_Version SETA 535
-Module_MinorVersion SETS "4.79.2.258"
-Module_Date SETS "26 Feb 2015"
-Module_ApplicationDate SETS "26-Feb-15"
+Module_MinorVersion SETS "4.79.2.259"
+Module_Date SETS "12 Mar 2015"
+Module_ApplicationDate SETS "12-Mar-15"
Module_ComponentName SETS "Kernel"
Module_ComponentPath SETS "castle/RiscOS/Sources/Kernel"
-Module_FullVersion SETS "5.35 (4.79.2.258)"
-Module_HelpVersion SETS "5.35 (26 Feb 2015) 4.79.2.258"
+Module_FullVersion SETS "5.35 (4.79.2.259)"
+Module_HelpVersion SETS "5.35 (12 Mar 2015) 4.79.2.259"
END
diff --git a/VersionNum b/VersionNum
index f893141..286ee01 100644
--- a/VersionNum
+++ b/VersionNum
@@ -5,19 +5,19 @@
*
*/
#define Module_MajorVersion_CMHG 5.35
-#define Module_MinorVersion_CMHG 4.79.2.258
-#define Module_Date_CMHG 26 Feb 2015
+#define Module_MinorVersion_CMHG 4.79.2.259
+#define Module_Date_CMHG 12 Mar 2015
#define Module_MajorVersion "5.35"
#define Module_Version 535
-#define Module_MinorVersion "4.79.2.258"
-#define Module_Date "26 Feb 2015"
+#define Module_MinorVersion "4.79.2.259"
+#define Module_Date "12 Mar 2015"
-#define Module_ApplicationDate "26-Feb-15"
+#define Module_ApplicationDate "12-Mar-15"
#define Module_ComponentName "Kernel"
#define Module_ComponentPath "castle/RiscOS/Sources/Kernel"
-#define Module_FullVersion "5.35 (4.79.2.258)"
-#define Module_HelpVersion "5.35 (26 Feb 2015) 4.79.2.258"
+#define Module_FullVersion "5.35 (4.79.2.259)"
+#define Module_HelpVersion "5.35 (12 Mar 2015) 4.79.2.259"
#define Module_LibraryVersionInfo "5:35"
diff --git a/s/ARMops b/s/ARMops
index 263af0d..95da10b 100644
--- a/s/ARMops
+++ b/s/ARMops
@@ -2457,6 +2457,8 @@ LookForHALCacheController ROUT
; controller
LDR r0, =(0:SHL:16)+HALDeviceType_SysPeri+HALDeviceSysPeri_CacheC
MOV r1, #0
+ LDR r12, =ZeroPage
+ STR r1, [r12, #Cache_HALDevice] ; In case none found
10
MOV r8, #OSHW_DeviceEnumerate
SWI XOS_Hardware
--
GitLab