Add XHCIDriver to the keyboard scan modules

Version 0.90. Tagged as 'HAL_BCM2835-0_90'

Add XHCIDriver to the keyboard scan modules
Version 0.90. Tagged as 'HAL_BCM2835-0_90'
31ff23ae · Robert Sprowson · ROOL · 9b93ceaf · 31ff23ae · 31ff23ae
Commit 31ff23ae authored Aug 29, 2020 by Robert Sprowson Committed by ROOL Sep 09, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 18 additions and 11 deletions

VersionNum VersionNum +10 -10

s/KbdScan s/KbdScan +8 -1

No files found.
--- a/VersionNum
+++ b/VersionNum
-/* (0.89)
+/* (0.90)
 *
 * This file is automatically maintained by srccommit, do not edit manually.
 *
 */
-#define Module_MajorVersion_CMHG        0.89
+#define Module_MajorVersion_CMHG        0.90
 #define Module_MinorVersion_CMHG
-#define Module_Date_CMHG                01 Aug 2020
+#define Module_Date_CMHG                09 Sep 2020

-#define Module_MajorVersion             "0.89"
-#define Module_Version                  89
+#define Module_MajorVersion             "0.90"
+#define Module_Version                  90
 #define Module_MinorVersion             ""
-#define Module_Date                     "01 Aug 2020"
+#define Module_Date                     "09 Sep 2020"

-#define Module_ApplicationDate          "01-Aug-20"
+#define Module_ApplicationDate          "09-Sep-20"

 #define Module_ComponentName            "HAL_BCM2835"

-#define Module_FullVersion              "0.89"
-#define Module_HelpVersion              "0.89 (01 Aug 2020)"
-#define Module_LibraryVersionInfo       "0:89"
+#define Module_FullVersion              "0.90"
+#define Module_HelpVersion              "0.90 (09 Sep 2020)"
+#define Module_LibraryVersionInfo       "0:90"
--- a/s/KbdScan
+++ b/s/KbdScan
@@ -32,16 +32,23 @@
        GET     Hdr:Macros
        GET     Hdr:Proc
        GET     Hdr:HALEntries
+        GET     hdr.BCM2835

        EXPORT  HAL_KbdScanDependencies

 HAL_KbdScanDependencies ROUT
-        ADR     a1, %FT10
+        CPUDetect a1
+        ADRLS   a1, %FT10
+        ADRHI   a1, %FT20
        MOV     pc, lr
 10
        ; Modules needed for keyboard scanning, no need to list those
        ; before 'FirstUnpluggableModule' since they can't be unplugged
        DCB     "SharedCLibrary,BufferManager,DeviceFS,RTSupport,USBDriver,"
        DCB     "DWCDriver,InternationalKeyboard", 0
+20
+        ; Two USB controllers on Pi 4
+        DCB     "SharedCLibrary,BufferManager,DeviceFS,RTSupport,USBDriver,"
+        DCB     "DWCDriver,XHCIDriver,InternationalKeyboard", 0

        END