From d58cdce20cf6eae0003d4f3568b09d02a7010f23 Mon Sep 17 00:00:00 2001
From: Kevin Bracey <kbracey@gitlab.riscosopen.org>
Date: Thu, 13 Apr 2000 14:29:25 +0000
Subject: [PATCH] * POST now correctly run-time checks for the emulator (missed
on last check-in).
* IOMD register listing removed from POST (for Tom).
This version seems to be pretty stable in a 26-bit desktop build. Apart from
silly modules relying on the manner in which SWIs corrupt R14_svc :(
Version 5.24. Tagged as 'Kernel-5_24'
---
TestSrc/Begin | 13 +++++++------
VersionASM | 6 +++---
VersionNum | 10 +++++-----
3 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/TestSrc/Begin b/TestSrc/Begin
index b91600a1..9768f76a 100644
--- a/TestSrc/Begin
+++ b/TestSrc/Begin
@@ -92,9 +92,6 @@
; 19 Jun 97 BAR 2.25 Remove un-necessary mov r13,r14's
; When completed flashing LED's restore the
; faultcode flag from fiq_regs.
-; 04 Apr 00 KJB 2.30 Converted to run in 32-bit mode always.
-; ShowIOMDRegs set to FALSE (request from
-; Tom Clay)
;
;------------------------------------------------------------------------
;
@@ -107,8 +104,8 @@
TS_STATUS * "R" ; Medusa POST version 2.0x
;
-TS_RELEASE * 23
-TS_CHANGES * 0
+TS_RELEASE * 22
+TS_CHANGES * 4
GBLL POSTenabled
@@ -118,7 +115,7 @@ POSTenabled SETL {TRUE} ; don't permit POST for ordinary startup
AlwaysShortPOST SETL {TRUE} :LAND: STB ; always do a short POST
GBLL ShowIOMDRegs
-ShowIOMDRegs SETL (IO_Type = "IOMD") :LAND: {FALSE} :LAND: STB ; show IOMD regs
+ShowIOMDRegs SETL (IO_Type = "IOMD") :LAND: {TRUE} :LAND: STB ; show IOMD regs
GBLL DontShowProgressColours
DontShowProgressColours SETL {TRUE} :LAND: STB ; Do not show the progress colour screens.
@@ -490,6 +487,10 @@ doffset SETA doffset + 8
OPT OldOpt
+ [ EmulatorSupport
+ ARM_on_emulator r0 ; we skip the rest of POST if
+ BEQ CONT ; on the emulator
+ ]
;
; External interface drivers -
diff --git a/VersionASM b/VersionASM
index 4de13b01..d2b0fdf3 100644
--- a/VersionASM
+++ b/VersionASM
@@ -6,9 +6,9 @@
GBLS Module_MinorVersion
GBLS Module_Date
GBLS Module_FullVersion
-Module_MajorVersion SETS "5.23"
-Module_Version SETA 523
+Module_MajorVersion SETS "5.24"
+Module_Version SETA 524
Module_MinorVersion SETS ""
Module_Date SETS "13 Apr 2000"
-Module_FullVersion SETS "5.23"
+Module_FullVersion SETS "5.24"
END
diff --git a/VersionNum b/VersionNum
index 6ccc7cbb..e01243ba 100644
--- a/VersionNum
+++ b/VersionNum
@@ -1,15 +1,15 @@
-/* (5.23)
+/* (5.24)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
-#define Module_MajorVersion_CMHG 5.23
+#define Module_MajorVersion_CMHG 5.24
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 13 Apr 2000
-#define Module_MajorVersion "5.23"
-#define Module_Version 523
+#define Module_MajorVersion "5.24"
+#define Module_Version 524
#define Module_MinorVersion ""
#define Module_Date "13 Apr 2000"
-#define Module_FullVersion "5.23"
+#define Module_FullVersion "5.24"
--
GitLab