From 562302474fc1d9c93abcbb63e4c906e614cbbfb4 Mon Sep 17 00:00:00 2001
From: Robert Sprowson <rsprowson@gitlab.riscosopen.org>
Date: Thu, 27 Feb 2020 08:27:56 +0000
Subject: [PATCH] Assign a USB flag
The XHCIDriver module adds 64k to get the register address. In an attempt to phase this out (so the registers are the true base address), assign a flag so that loading a suitable XHCIDriver on an old HAL still works.
Version 6.33. Not tagged
---
VersionASM | 6 +++---
VersionNum | 8 ++++----
hdr/HALEntries | 1 +
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/VersionASM b/VersionASM
index 1666ce5..f49b70b 100644
--- a/VersionASM
+++ b/VersionASM
@@ -12,9 +12,9 @@
Module_MajorVersion SETS "6.33"
Module_Version SETA 633
Module_MinorVersion SETS ""
-Module_Date SETS "12 Feb 2020"
-Module_ApplicationDate SETS "12-Feb-20"
+Module_Date SETS "27 Feb 2020"
+Module_ApplicationDate SETS "27-Feb-20"
Module_ComponentName SETS "Kernel"
Module_FullVersion SETS "6.33"
-Module_HelpVersion SETS "6.33 (12 Feb 2020)"
+Module_HelpVersion SETS "6.33 (27 Feb 2020)"
END
diff --git a/VersionNum b/VersionNum
index 1f9a95d..5944237 100644
--- a/VersionNum
+++ b/VersionNum
@@ -5,17 +5,17 @@
*/
#define Module_MajorVersion_CMHG 6.33
#define Module_MinorVersion_CMHG
-#define Module_Date_CMHG 12 Feb 2020
+#define Module_Date_CMHG 27 Feb 2020
#define Module_MajorVersion "6.33"
#define Module_Version 633
#define Module_MinorVersion ""
-#define Module_Date "12 Feb 2020"
+#define Module_Date "27 Feb 2020"
-#define Module_ApplicationDate "12-Feb-20"
+#define Module_ApplicationDate "27-Feb-20"
#define Module_ComponentName "Kernel"
#define Module_FullVersion "6.33"
-#define Module_HelpVersion "6.33 (12 Feb 2020)"
+#define Module_HelpVersion "6.33 (27 Feb 2020)"
#define Module_LibraryVersionInfo "6:33"
diff --git a/hdr/HALEntries b/hdr/HALEntries
index a370613..2625b7a 100644
--- a/hdr/HALEntries
+++ b/hdr/HALEntries
@@ -249,6 +249,7 @@ HALUSBControllerType_XHCI * 4
HALUSBControllerFlag_HAL_Port_Power * 1 ; Use HAL_USBPortPower
HALUSBControllerFlag_HAL_Over_Current * 2 ; Use HAL_USBPortDevice/IRQStatus/IRQClear
HALUSBControllerFlag_32bit_Regs * 8 ; Must use 32bit access for all registers
+HALUSBControllerFlag_XHCI_No_Offset * &40000000 ; The HW base address is true
HALUSBControllerFlag_EHCI_ETTF * &80000000 ; EHCI controller has embedded TT
; IRQ
--
GitLab