From 68f458335d97795e73f6c202a8457be06e472fe6 Mon Sep 17 00:00:00 2001
From: Ben Avison <bavison@gitlab.riscosopen.org>
Date: Sat, 24 Mar 2012 14:16:46 +0000
Subject: [PATCH] Retired *Configure options, and a new header export
Detail:
* As noted in recent commits to ADFS, the *Configure options Dir and NoDir
haven't done anything since RISC OS 2, so ADFS has stopped reading the
CMOS bit. Unusually, these options are implemented by the kernel, so this
is the accompanying change to remove the *Configure options. This frees
up a bit of CMOS for future re-use.
* Now exports a C version of Hdr:ModHand.
Admin:
Builds OK, but not tested in a ROM build yet (should be fairly safe though)
Version 5.35, 4.79.2.143. Tagged as 'Kernel-5_35-4_79_2_143'
---
Makefile | 5 +++++
VersionASM | 6 +++---
VersionNum | 8 ++++----
s/Arthur3 | 34 +++++++++++++++++-----------------
4 files changed, 29 insertions(+), 24 deletions(-)
diff --git a/Makefile b/Makefile
index f7b714e..6bd669c 100644
--- a/Makefile
+++ b/Makefile
@@ -70,6 +70,7 @@ EXPORTS = ${EXP_HDR}.EnvNumbers \
${EXP_HDR}.GPIODevice \
${EXP_HDR}.OSEntries \
${EXP_HDR}.OSRSI6 \
+ ${C_EXP_HDR}.ModHand \
${C_EXP_HDR}.RISCOS \
${C_EXP_HDR}.HALEntries \
${C_EXP_HDR}.HALDevice \
@@ -185,6 +186,10 @@ ${EXP_HDR}.GPIODevice: hdr.GPIODevice
${EXP_HDR}.OSRSI6: hdr.OSRSI6
${CP} hdr.OSRSI6 $@ ${CPFLAGS}
+${C_EXP_HDR}.ModHand: hdr.ModHand
+ ${MKDIR} ${C_EXP_HDR}
+ ${PERL} Build:Hdr2H hdr.ModHand $@
+
${C_EXP_HDR}.RISCOS: hdr.RISCOS
${MKDIR} ${C_EXP_HDR}
${PERL} Build:Hdr2H hdr.RISCOS $@
diff --git a/VersionASM b/VersionASM
index 4979868..0b486f4 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.142"
+Module_MinorVersion SETS "4.79.2.143"
Module_Date SETS "24 Mar 2012"
Module_ApplicationDate SETS "24-Mar-12"
Module_ComponentName SETS "Kernel"
Module_ComponentPath SETS "castle/RiscOS/Sources/Kernel"
-Module_FullVersion SETS "5.35 (4.79.2.142)"
-Module_HelpVersion SETS "5.35 (24 Mar 2012) 4.79.2.142"
+Module_FullVersion SETS "5.35 (4.79.2.143)"
+Module_HelpVersion SETS "5.35 (24 Mar 2012) 4.79.2.143"
END
diff --git a/VersionNum b/VersionNum
index 285bbcf..19e4c19 100644
--- a/VersionNum
+++ b/VersionNum
@@ -5,12 +5,12 @@
*
*/
#define Module_MajorVersion_CMHG 5.35
-#define Module_MinorVersion_CMHG 4.79.2.142
+#define Module_MinorVersion_CMHG 4.79.2.143
#define Module_Date_CMHG 24 Mar 2012
#define Module_MajorVersion "5.35"
#define Module_Version 535
-#define Module_MinorVersion "4.79.2.142"
+#define Module_MinorVersion "4.79.2.143"
#define Module_Date "24 Mar 2012"
#define Module_ApplicationDate "24-Mar-12"
@@ -18,6 +18,6 @@
#define Module_ComponentName "Kernel"
#define Module_ComponentPath "castle/RiscOS/Sources/Kernel"
-#define Module_FullVersion "5.35 (4.79.2.142)"
-#define Module_HelpVersion "5.35 (24 Mar 2012) 4.79.2.142"
+#define Module_FullVersion "5.35 (4.79.2.143)"
+#define Module_HelpVersion "5.35 (24 Mar 2012) 4.79.2.143"
#define Module_LibraryVersionInfo "5:35"
diff --git a/s/Arthur3 b/s/Arthur3
index 12bef03..d52420d 100644
--- a/s/Arthur3
+++ b/s/Arthur3
@@ -1237,10 +1237,10 @@ ExpandShCaps
EndListCapsFrig
Config_Field Data, 5, 2, DBTBCMOS
Config_Field Delay, 0, 7, KeyDelCMOS
-ExpandDir
- Config_NoParm Dir, 6, 0, StartCMOS, 0
-ExpandNoDir
- Config_NoParm NoDir, 6, 0, StartCMOS, 1
+;ExpandDir
+; Config_NoParm Dir, 6, 0, StartCMOS, 0
+;ExpandNoDir
+; Config_NoParm NoDir, 6, 0, StartCMOS, 1
Config_Field DumpFormat, 0, 4, TutuCMOS
Config_Size FontSize, 0, 7, FontCMOS
FontSizeFrig
@@ -1275,18 +1275,18 @@ AlternateNoScroll
Config_Special WimpMode
= 0
-NoDirString = "No"
-DirString = "Directory", 0
+;NoDirString = "No"
+;DirString = "Directory", 0
ShCapsString = "ShiftCaps", 0
ALIGN
ExpandFrig * 8 ; see code that shows NoParm options.
ExpandTab
- & ExpandDir - ExpandFrig-.
- & DirString - .-1 ; another printing fudge!
- & ExpandNoDir - ExpandFrig-.
- & NoDirString - .-1
+; & ExpandDir - ExpandFrig-.
+; & DirString - .-1 ; another printing fudge!
+; & ExpandNoDir - ExpandFrig-.
+; & NoDirString - .-1
& ExpandShCaps - ExpandFrig-.
& ShCapsString - .-1
& 0
@@ -1977,10 +1977,10 @@ AlternateTab
& %FT92 -.
& ExpandShCaps - ExpandFrig-.
& %FT92 -.
- & ExpandDir - ExpandFrig-.
- & %FT93 -.
- & ExpandNoDir - ExpandFrig-.
- & %FT93 -.
+; & ExpandDir - ExpandFrig-.
+; & %FT93 -.
+; & ExpandNoDir - ExpandFrig-.
+; & %FT93 -.
& AlternateLoud - ExpandFrig-.
& %FT95 -.
& AlternateQuiet - ExpandFrig-.
@@ -2002,9 +2002,9 @@ AlternateTab
& AlternateCaps -%BT92
& AlternateCaps -%BT92
& AlternateCaps -%BT92
-93
- & DirString -%BT93-1
- & NoDirString -%BT93-1
+;93
+; & DirString -%BT93-1
+; & NoDirString -%BT93-1
95
& AlternateQuiet -%BT95
& AlternateLoud -%BT95
--
GitLab