From 77d5848c487e1bb302774943b15bbb2d5a9d25bd Mon Sep 17 00:00:00 2001
From: Jeffrey Lee <jlee@gitlab.riscosopen.org>
Date: Sun, 22 May 2011 20:35:00 +0000
Subject: [PATCH] Add C version of Hdr.OSEntries to HAL kernel header export
Detail:
Makefile - now exports a C version of hdr.OSEntries
Admin:
Tested in Iyonix ROM softload.
Needed for latest USB drivers to build.
Version 5.35, 4.79.2.112. Tagged as 'Kernel-5_35-4_79_2_112'
---
Makefile | 7 ++++++-
VersionASM | 10 +++++-----
VersionNum | 14 +++++++-------
3 files changed, 18 insertions(+), 13 deletions(-)
diff --git a/Makefile b/Makefile
index 040145c..9edd45f 100644
--- a/Makefile
+++ b/Makefile
@@ -68,7 +68,8 @@ EXPORTS = ${EXP_HDR}.EnvNumbers \
${EXP_HDR}.OSEntries \
${C_EXP_HDR}.RISCOS \
${C_EXP_HDR}.HALEntries \
- ${C_EXP_HDR}.HALDevice
+ ${C_EXP_HDR}.HALDevice \
+ ${C_EXP_HDR}.OSEntries
#
# Generic rules:
@@ -179,6 +180,10 @@ ${C_EXP_HDR}.HALDevice: o.Global.h.HALDevice h.HALDevice
${CP} h.HALDevice $@ ${CPFLAGS}
print o.Global.h.HALDevice { >> $@ }
+${C_EXP_HDR}.OSEntries: hdr.OSEntries
+ ${MKDIR} ${C_EXP_HDR}
+ perl Build:Hdr2H hdr.OSEntries $@
+
o.Global.h.HALDevice: hdr.HALDevice
${MKDIR} o.Global.h
dir o
diff --git a/VersionASM b/VersionASM
index ef9bfd1..dcadba0 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.111"
-Module_Date SETS "20 Mar 2010"
-Module_ApplicationDate SETS "20-Mar-10"
+Module_MinorVersion SETS "4.79.2.112"
+Module_Date SETS "22 May 2011"
+Module_ApplicationDate SETS "22-May-11"
Module_ComponentName SETS "Kernel"
Module_ComponentPath SETS "castle/RiscOS/Sources/Kernel"
-Module_FullVersion SETS "5.35 (4.79.2.111)"
-Module_HelpVersion SETS "5.35 (20 Mar 2010) 4.79.2.111"
+Module_FullVersion SETS "5.35 (4.79.2.112)"
+Module_HelpVersion SETS "5.35 (22 May 2011) 4.79.2.112"
END
diff --git a/VersionNum b/VersionNum
index edbe13e..f21c8c1 100644
--- a/VersionNum
+++ b/VersionNum
@@ -5,19 +5,19 @@
*
*/
#define Module_MajorVersion_CMHG 5.35
-#define Module_MinorVersion_CMHG 4.79.2.111
-#define Module_Date_CMHG 20 Mar 2010
+#define Module_MinorVersion_CMHG 4.79.2.112
+#define Module_Date_CMHG 22 May 2011
#define Module_MajorVersion "5.35"
#define Module_Version 535
-#define Module_MinorVersion "4.79.2.111"
-#define Module_Date "20 Mar 2010"
+#define Module_MinorVersion "4.79.2.112"
+#define Module_Date "22 May 2011"
-#define Module_ApplicationDate "20-Mar-10"
+#define Module_ApplicationDate "22-May-11"
#define Module_ComponentName "Kernel"
#define Module_ComponentPath "castle/RiscOS/Sources/Kernel"
-#define Module_FullVersion "5.35 (4.79.2.111)"
-#define Module_HelpVersion "5.35 (20 Mar 2010) 4.79.2.111"
+#define Module_FullVersion "5.35 (4.79.2.112)"
+#define Module_HelpVersion "5.35 (22 May 2011) 4.79.2.112"
#define Module_LibraryVersionInfo "5:35"
--
GitLab