From 2f8b545910e8ee0a7f67565a47fba79c764c4d02 Mon Sep 17 00:00:00 2001
From: Jeffrey Lee <jlee@gitlab.riscosopen.org>
Date: Sat, 19 Mar 2011 18:25:05 +0000
Subject: [PATCH] Add ID's for CPUClk HAL device. Trim dead code.
Detail:
hdr/HALDevice - Added device type & ID for new CPUClk device, as used by the new OMAP3 HAL/PortableHAL versions.
s/PMF/osinit - Disable a block of dead code that was getting compiled in.
Admin:
Tested on rev C2 BB, rev A2 BB-xM, rev C1 TouchBook
These changes are needed by the latest OMAP3 HAL & PortableHAL versions.
Version 5.35, 4.79.2.98.2.36. Tagged as 'Kernel-5_35-4_79_2_98_2_36'
---
VersionASM | 10 +++++-----
VersionNum | 14 +++++++-------
hdr/HALDevice | 4 ++++
s/PMF/osinit | 2 +-
4 files changed, 17 insertions(+), 13 deletions(-)
diff --git a/VersionASM b/VersionASM
index 230f742..6c3f46c 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.98.2.35"
-Module_Date SETS "20 Feb 2011"
-Module_ApplicationDate SETS "20-Feb-11"
+Module_MinorVersion SETS "4.79.2.98.2.36"
+Module_Date SETS "19 Mar 2011"
+Module_ApplicationDate SETS "19-Mar-11"
Module_ComponentName SETS "Kernel"
Module_ComponentPath SETS "castle/RiscOS/Sources/Kernel"
-Module_FullVersion SETS "5.35 (4.79.2.98.2.35)"
-Module_HelpVersion SETS "5.35 (20 Feb 2011) 4.79.2.98.2.35"
+Module_FullVersion SETS "5.35 (4.79.2.98.2.36)"
+Module_HelpVersion SETS "5.35 (19 Mar 2011) 4.79.2.98.2.36"
END
diff --git a/VersionNum b/VersionNum
index fb6a928..e550516 100644
--- a/VersionNum
+++ b/VersionNum
@@ -5,19 +5,19 @@
*
*/
#define Module_MajorVersion_CMHG 5.35
-#define Module_MinorVersion_CMHG 4.79.2.98.2.35
-#define Module_Date_CMHG 20 Feb 2011
+#define Module_MinorVersion_CMHG 4.79.2.98.2.36
+#define Module_Date_CMHG 19 Mar 2011
#define Module_MajorVersion "5.35"
#define Module_Version 535
-#define Module_MinorVersion "4.79.2.98.2.35"
-#define Module_Date "20 Feb 2011"
+#define Module_MinorVersion "4.79.2.98.2.36"
+#define Module_Date "19 Mar 2011"
-#define Module_ApplicationDate "20-Feb-11"
+#define Module_ApplicationDate "19-Mar-11"
#define Module_ComponentName "Kernel"
#define Module_ComponentPath "castle/RiscOS/Sources/Kernel"
-#define Module_FullVersion "5.35 (4.79.2.98.2.35)"
-#define Module_HelpVersion "5.35 (20 Feb 2011) 4.79.2.98.2.35"
+#define Module_FullVersion "5.35 (4.79.2.98.2.36)"
+#define Module_HelpVersion "5.35 (19 Mar 2011) 4.79.2.98.2.36"
#define Module_LibraryVersionInfo "5:35"
diff --git a/hdr/HALDevice b/hdr/HALDevice
index 8e4fb9e..90aeb85 100644
--- a/hdr/HALDevice
+++ b/hdr/HALDevice
@@ -58,6 +58,7 @@ HALDeviceSysPeri_DMAC # 1 ; DMA controller
HALDeviceSysPeri_DMAB # 1 ; DMA channel - buffer type
HALDeviceSysPeri_DMAL # 1 ; DMA channel - list type
HALDeviceSysPeri_RTC # 1 ; RTCDevice
+HALDeviceSysPeri_CPUClk # 1 ; CPU clock generator
HALDeviceType_Comms * 4 :SHL: 8
^ 1
@@ -120,6 +121,9 @@ HALDeviceID_DMAL_M5229 # 1
^ 0
HALDeviceID_RTC_TPS65950 # 1
+ ^ 0
+HALDeviceID_CPUClk_OMAP3 # 1
+
^ 0
HALDeviceID_VDU_OMAP3 # 1
diff --git a/s/PMF/osinit b/s/PMF/osinit
index 49296d1..2bc870d 100644
--- a/s/PMF/osinit
+++ b/s/PMF/osinit
@@ -877,7 +877,7 @@ MonitorLeadList
]; STB
- [ StorkPowerSave
+ [ StorkPowerSave :LAND: :LNOT: HAL
;
; List of latch addresses and initial values.
;
--
GitLab