Commit 117f576d authored by Robert Sprowson's avatar Robert Sprowson Committed by ROOL
Browse files

Accept old & new table format

Just in case anyone tries loading this on an old HAL, remap 28 byte address table format to 40 byte.

Version 0.18. Tagged as 'PCI-0_18'
parent c490d235
......@@ -9,12 +9,12 @@
GBLS Module_ApplicationDate
GBLS Module_HelpVersion
GBLS Module_ComponentName
Module_MajorVersion SETS "0.17"
Module_Version SETA 17
Module_MajorVersion SETS "0.18"
Module_Version SETA 18
Module_MinorVersion SETS ""
Module_Date SETS "21 Nov 2019"
Module_ApplicationDate SETS "21-Nov-19"
Module_Date SETS "04 Jan 2020"
Module_ApplicationDate SETS "04-Jan-20"
Module_ComponentName SETS "PCI"
Module_FullVersion SETS "0.17"
Module_HelpVersion SETS "0.17 (21 Nov 2019)"
Module_FullVersion SETS "0.18"
Module_HelpVersion SETS "0.18 (04 Jan 2020)"
END
/* (0.17)
/* (0.18)
*
* This file is automatically maintained by srccommit, do not edit manually.
*
*/
#define Module_MajorVersion_CMHG 0.17
#define Module_MajorVersion_CMHG 0.18
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 21 Nov 2019
#define Module_Date_CMHG 04 Jan 2020
#define Module_MajorVersion "0.17"
#define Module_Version 17
#define Module_MajorVersion "0.18"
#define Module_Version 18
#define Module_MinorVersion ""
#define Module_Date "21 Nov 2019"
#define Module_Date "04 Jan 2020"
#define Module_ApplicationDate "21-Nov-19"
#define Module_ApplicationDate "04-Jan-20"
#define Module_ComponentName "PCI"
#define Module_FullVersion "0.17"
#define Module_HelpVersion "0.17 (21 Nov 2019)"
#define Module_LibraryVersionInfo "0:17"
#define Module_FullVersion "0.18"
#define Module_HelpVersion "0.18 (04 Jan 2020)"
#define Module_LibraryVersionInfo "0:18"
......@@ -179,6 +179,15 @@ SetUpHAL ROUT
MOV r8, #OSHW_CallHAL
MOV r9, #EntryNo_HAL_PCIAddresses
SWI XOS_Hardware
TEQ a1, #7*4 ; Old HAL_PCIAddresses layout?
Push "r4-r7", EQ
ADREQ lr, pci_mem_to_phys_offset
LDMEQIA lr, {r0, r2-r4, r6-r8} ; Read in old layout
MOVEQ r1, #0
MOVEQ r5, #0
MOVEQ r9, #0
STMEQIA lr, {r0-r9} ; Write out in new layout with upper words 0
Pull "r4-r7", EQ
99
Pull "r8,r9,pc"
......
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