Commit 76cb713f authored by Robert Sprowson's avatar Robert Sprowson Committed by Ben Avison
Browse files

More sensible abstraction

Give the ISPENDRn address directly, since its only the HAL that knows that iDev_GPU is encoded from 64+, rather than having to bake it into DWCDriver.
parent b1d217a2
...@@ -4,18 +4,18 @@ ...@@ -4,18 +4,18 @@
* *
*/ */
#define Module_MajorVersion_CMHG 0.82 #define Module_MajorVersion_CMHG 0.82
#define Module_MinorVersion_CMHG Pi4.17 #define Module_MinorVersion_CMHG Pi4.18
#define Module_Date_CMHG 18 Feb 2020 #define Module_Date_CMHG 18 Feb 2020
#define Module_MajorVersion "0.82" #define Module_MajorVersion "0.82"
#define Module_Version 82 #define Module_Version 82
#define Module_MinorVersion "Pi4.17" #define Module_MinorVersion "Pi4.18"
#define Module_Date "18 Feb 2020" #define Module_Date "18 Feb 2020"
#define Module_ApplicationDate "18-Feb-20" #define Module_ApplicationDate "18-Feb-20"
#define Module_ComponentName "HAL_BCM2835" #define Module_ComponentName "HAL_BCM2835"
#define Module_FullVersion "0.82 (Pi4.17)" #define Module_FullVersion "0.82 (Pi4.18)"
#define Module_HelpVersion "0.82 (18 Feb 2020) Pi4.17" #define Module_HelpVersion "0.82 (18 Feb 2020) Pi4.18"
#define Module_LibraryVersionInfo "0:82" #define Module_LibraryVersionInfo "0:82"
...@@ -66,7 +66,8 @@ HAL_USBControllerInfo ...@@ -66,7 +66,8 @@ HAL_USBControllerInfo
CPUDetect a3 CPUDetect a3
; Raspberry Pi 4 / BCM2838 has no MPHI to do FIQ downgrade, but ; Raspberry Pi 4 / BCM2838 has no MPHI to do FIQ downgrade, but
; does have a GIC which can fulfil the same requirement ; does have a GIC which can fulfil the same requirement
LDRHI a4, GICD_Base_Address LDRHI a4, GICD_Base_Address ; iDev_GPU GIC SPIs ---v v--- offset by GIC SGIs
ADDHI a4, a4, #GICD_ISPENDR + ((iDev_GPU_HostPort + 64 + 32) :SHR: 5) :SHL: 2
ADDLS a4, ip, #MPHI_Base ADDLS a4, ip, #MPHI_Base
STR a4, [a2, #HALUSBControllerInfo_HW_MPHI] STR a4, [a2, #HALUSBControllerInfo_HW_MPHI]
MOV a4, #iDev_GPU_HostPort MOV a4, #iDev_GPU_HostPort
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment