From c95a9fff26ed3f79ad28cd871cf8ade8766f66bf Mon Sep 17 00:00:00 2001
From: Jeffrey Lee <jlee@gitlab.riscosopen.org>
Date: Sat, 18 Oct 2014 19:06:25 +0000
Subject: [PATCH] Update HAL device ID allocations
Detail:
hdr/HALDevice - Added some extra HAL device IDs
Admin:
Tested by building BCM2835 ROM
Version 5.35, 4.79.2.241. Tagged as 'Kernel-5_35-4_79_2_241'
---
VersionASM | 10 +++++-----
VersionNum | 14 +++++++-------
hdr/HALDevice | 4 ++++
3 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/VersionASM b/VersionASM
index 0ed1d5f..9a2a199 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.240"
-Module_Date SETS "15 Oct 2014"
-Module_ApplicationDate SETS "15-Oct-14"
+Module_MinorVersion SETS "4.79.2.241"
+Module_Date SETS "18 Oct 2014"
+Module_ApplicationDate SETS "18-Oct-14"
Module_ComponentName SETS "Kernel"
Module_ComponentPath SETS "castle/RiscOS/Sources/Kernel"
-Module_FullVersion SETS "5.35 (4.79.2.240)"
-Module_HelpVersion SETS "5.35 (15 Oct 2014) 4.79.2.240"
+Module_FullVersion SETS "5.35 (4.79.2.241)"
+Module_HelpVersion SETS "5.35 (18 Oct 2014) 4.79.2.241"
END
diff --git a/VersionNum b/VersionNum
index e5232dd..f962922 100644
--- a/VersionNum
+++ b/VersionNum
@@ -5,19 +5,19 @@
*
*/
#define Module_MajorVersion_CMHG 5.35
-#define Module_MinorVersion_CMHG 4.79.2.240
-#define Module_Date_CMHG 15 Oct 2014
+#define Module_MinorVersion_CMHG 4.79.2.241
+#define Module_Date_CMHG 18 Oct 2014
#define Module_MajorVersion "5.35"
#define Module_Version 535
-#define Module_MinorVersion "4.79.2.240"
-#define Module_Date "15 Oct 2014"
+#define Module_MinorVersion "4.79.2.241"
+#define Module_Date "18 Oct 2014"
-#define Module_ApplicationDate "15-Oct-14"
+#define Module_ApplicationDate "18-Oct-14"
#define Module_ComponentName "Kernel"
#define Module_ComponentPath "castle/RiscOS/Sources/Kernel"
-#define Module_FullVersion "5.35 (4.79.2.240)"
-#define Module_HelpVersion "5.35 (15 Oct 2014) 4.79.2.240"
+#define Module_FullVersion "5.35 (4.79.2.241)"
+#define Module_HelpVersion "5.35 (18 Oct 2014) 4.79.2.241"
#define Module_LibraryVersionInfo "5:35"
diff --git a/hdr/HALDevice b/hdr/HALDevice
index c42ecff..75b6d01 100644
--- a/hdr/HALDevice
+++ b/hdr/HALDevice
@@ -119,12 +119,14 @@ HALDeviceID_AudC_TPS65950 # 1
HALDeviceID_AudC_TWL6040 # 1
HALDeviceID_AudC_VCHIQ # 1
HALDeviceID_AudC_Pandora # 1
+HALDeviceID_AudC_SGTL5000 # 1
^ 0
HALDeviceID_Mixer_STAC9750 # 1
HALDeviceID_Mixer_TPS65950 # 1
HALDeviceID_Mixer_TWL6040 # 1
HALDeviceID_Mixer_VCHIQ # 1
+HALDeviceID_Mixer_SGTL5000 # 1
^ 0
HALDeviceID_DMAC_M1535 # 1
@@ -133,6 +135,7 @@ HALDeviceID_DMAC_OMAP3 # 1
HALDeviceID_DMAC_OMAP4 # 1
HALDeviceID_DMAC_BCM2835 # 1
HALDeviceID_DMAC_IOMD21 # 1
+HALDeviceID_DMAC_IMX6 # 1
^ 0
HALDeviceID_DMAB_M1535 # 1
@@ -143,6 +146,7 @@ HALDeviceID_DMAB_IOMD21 # 1
^ 0
HALDeviceID_DMAL_M5229 # 1
HALDeviceID_DMAL_BCM2835 # 1
+HALDeviceID_DMAL_IMX6 # 1
^ 0
HALDeviceID_RTC_TPS65950 # 1
--
GitLab