From 3076256ead7cf5301ee79aa928b1052420412b4b Mon Sep 17 00:00:00 2001
From: Jeffrey Lee <jlee@gitlab.riscosopen.org>
Date: Mon, 20 Aug 2012 20:48:24 +0000
Subject: [PATCH] Bring hdr/HALDevice in line with RPi branch
Detail:
hdr/HALDevice - Added new HAL devices and types from RPi branch
Admin:
Untested!
Version 5.35, 4.79.2.164. Tagged as 'Kernel-5_35-4_79_2_164'
---
VersionASM | 10 +++++-----
VersionNum | 14 +++++++-------
hdr/HALDevice | 19 ++++++++++++++-----
3 files changed, 26 insertions(+), 17 deletions(-)
diff --git a/VersionASM b/VersionASM
index a75ad10..0715685 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.163"
-Module_Date SETS "15 Aug 2012"
-Module_ApplicationDate SETS "15-Aug-12"
+Module_MinorVersion SETS "4.79.2.164"
+Module_Date SETS "20 Aug 2012"
+Module_ApplicationDate SETS "20-Aug-12"
Module_ComponentName SETS "Kernel"
Module_ComponentPath SETS "castle/RiscOS/Sources/Kernel"
-Module_FullVersion SETS "5.35 (4.79.2.163)"
-Module_HelpVersion SETS "5.35 (15 Aug 2012) 4.79.2.163"
+Module_FullVersion SETS "5.35 (4.79.2.164)"
+Module_HelpVersion SETS "5.35 (20 Aug 2012) 4.79.2.164"
END
diff --git a/VersionNum b/VersionNum
index 8d86694..d5aa4e8 100644
--- a/VersionNum
+++ b/VersionNum
@@ -5,19 +5,19 @@
*
*/
#define Module_MajorVersion_CMHG 5.35
-#define Module_MinorVersion_CMHG 4.79.2.163
-#define Module_Date_CMHG 15 Aug 2012
+#define Module_MinorVersion_CMHG 4.79.2.164
+#define Module_Date_CMHG 20 Aug 2012
#define Module_MajorVersion "5.35"
#define Module_Version 535
-#define Module_MinorVersion "4.79.2.163"
-#define Module_Date "15 Aug 2012"
+#define Module_MinorVersion "4.79.2.164"
+#define Module_Date "20 Aug 2012"
-#define Module_ApplicationDate "15-Aug-12"
+#define Module_ApplicationDate "20-Aug-12"
#define Module_ComponentName "Kernel"
#define Module_ComponentPath "castle/RiscOS/Sources/Kernel"
-#define Module_FullVersion "5.35 (4.79.2.163)"
-#define Module_HelpVersion "5.35 (15 Aug 2012) 4.79.2.163"
+#define Module_FullVersion "5.35 (4.79.2.164)"
+#define Module_HelpVersion "5.35 (20 Aug 2012) 4.79.2.164"
#define Module_LibraryVersionInfo "5:35"
diff --git a/hdr/HALDevice b/hdr/HALDevice
index 5912d70..da61c57 100644
--- a/hdr/HALDevice
+++ b/hdr/HALDevice
@@ -60,11 +60,12 @@ HALDeviceSysPeri_DMAL # 1 ; DMA channel - list type
HALDeviceSysPeri_RTC # 1 ; RTCDevice
HALDeviceSysPeri_CPUClk # 1 ; CPU clock generator
-HALDeviceType_Comms * 4 :SHL: 8
- ^ 1
-HALDeviceComms_UART # 1 ; UART
-HALDeviceComms_EtherNIC # 1 ; Ethernet NIC
-HALDeviceComms_GPIO # 1 ; GPIO interface
+HALDeviceType_Comms * 4 :SHL: 8
+ ^ 1
+HALDeviceComms_UART # 1 ; UART
+HALDeviceComms_EtherNIC # 1 ; Ethernet NIC
+HALDeviceComms_GPIO # 1 ; GPIO interface
+HALDeviceComms_InterProc # 1 ; Inter-processor mailboxes, etc.
HALDeviceType_ExpCtl * 5 :SHL: 8
^ 1
@@ -107,17 +108,20 @@ HALDeviceInterconnectBus_L4 * 1 :SHL: 24
HALDeviceID_AudC_M5451 # 1
HALDeviceID_AudC_TPS65950 # 1
HALDeviceID_AudC_TWL6040 # 1
+HALDeviceID_AudC_VCHIQ # 1
^ 0
HALDeviceID_Mixer_STAC9750 # 1
HALDeviceID_Mixer_TPS65950 # 1
HALDeviceID_Mixer_TWL6040 # 1
+HALDeviceID_Mixer_VCHIQ # 1
^ 0
HALDeviceID_DMAC_M1535 # 1
HALDeviceID_DMAC_M5229 # 1
HALDeviceID_DMAC_OMAP3 # 1
HALDeviceID_DMAC_OMAP4 # 1
+HALDeviceID_DMAC_BCM2835 # 1
^ 0
HALDeviceID_DMAB_M1535 # 1
@@ -126,6 +130,7 @@ HALDeviceID_DMAB_OMAP4 # 1
^ 0
HALDeviceID_DMAL_M5229 # 1
+HALDeviceID_DMAL_BCM2835 # 1
^ 0
HALDeviceID_RTC_TPS65950 # 1
@@ -149,6 +154,10 @@ HALDeviceID_EtherNIC_DM9000 # 1
^ 0
HALDeviceID_GPIO_OMAP3 # 1
HALDeviceID_GPIO_OMAP4 # 1
+HALDeviceID_GPIO_BCM2835 # 1
+
+ ^ 0
+HALDeviceID_InterProc_VCHIQ # 1
^ 0
HALDeviceID_SDIO_SDHCI # 1
--
GitLab