Commit 006e1696 authored by John Ballance's avatar John Ballance Committed by ROOL
Browse files

Add ability to read disc address of CMOS from a ROM location

The ROM location is initialised as part of the write-ROM-to-SD process. This enables a single ROM image to be used with loaders of different sizes on disc.

Version 0.21. Tagged as 'SDCMOS-0_21'
parent c762d288
;
; This file is automatically maintained by srccommit, do not edit manually.
; Last processed by srccommit version: 1.1.
;
GBLS Module_MajorVersion
GBLA Module_Version
......@@ -10,14 +9,12 @@
GBLS Module_ApplicationDate
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "0.20"
Module_Version SETA 20
Module_MajorVersion SETS "0.21"
Module_Version SETA 21
Module_MinorVersion SETS ""
Module_Date SETS "21 Jun 2018"
Module_ApplicationDate SETS "21-Jun-18"
Module_Date SETS "12 Jun 2021"
Module_ApplicationDate SETS "12-Jun-21"
Module_ComponentName SETS "SDCMOS"
Module_ComponentPath SETS "cddl/RiscOS/Sources/HWSupport/SD/SDCMOS"
Module_FullVersion SETS "0.20"
Module_HelpVersion SETS "0.20 (21 Jun 2018)"
Module_FullVersion SETS "0.21"
Module_HelpVersion SETS "0.21 (12 Jun 2021)"
END
/* (0.20)
/* (0.21)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 0.20
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 21 Jun 2018
#define Module_MajorVersion_CMHG 0.21
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 12 Jun 2021
#define Module_MajorVersion "0.20"
#define Module_Version 20
#define Module_MajorVersion "0.21"
#define Module_Version 21
#define Module_MinorVersion ""
#define Module_Date "21 Jun 2018"
#define Module_Date "12 Jun 2021"
#define Module_ApplicationDate "21-Jun-18"
#define Module_ApplicationDate "12-Jun-21"
#define Module_ComponentName "SDCMOS"
#define Module_ComponentPath "cddl/RiscOS/Sources/HWSupport/SD/SDCMOS"
#define Module_FullVersion "0.20"
#define Module_HelpVersion "0.20 (21 Jun 2018)"
#define Module_LibraryVersionInfo "0:20"
#define Module_FullVersion "0.21"
#define Module_HelpVersion "0.21 (12 Jun 2021)"
#define Module_LibraryVersionInfo "0:21"
......@@ -34,7 +34,8 @@
; Otherwise it is stored in file on disc.
; Where UBoot loading is used this file is loaded before the ROM image is loaded
; Where StoreAtDiscAddress is used the disc address used is typically part of
; the rom image that gets loaded.
; the rom image that gets loaded. ReadDiscAddressFromRom defines a rom location
; that holds the disc address
GET Hdr:ListOpts
GET Hdr:Macros
......@@ -336,7 +337,13 @@ MyByteV
Push "r0-r4,r6"
MOV r6, #0
MOV r0, #1
[ :DEF: ReadDiscAddressFromRom
LDR r1, = ReadDiscAddressFromRom
LDR r1, [r1]
MOV r1, r1, lsr #29
|
MOV r1, #StoreAtDiscAddress :SHR: 29
]
MOV r2, #0
SWI XSDFS_MiscOp
BVS %F75
......@@ -347,7 +354,12 @@ MyByteV
BL CMOSToStack
MOV r1, #2
[ :DEF: ReadDiscAddressFromRom
LDR r2, = ReadDiscAddressFromRom
LDR r2, [r2]
|
LDR r2, =StoreAtDiscAddress
]
MOV r3, sp
MOV r4, r6
SWI XSDFS_DiscOp
......
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