Commit 2bfa4eae authored by Robert Sprowson's avatar Robert Sprowson
Browse files

Leave clock alone if RTC driver is active

Might fix problem of time jumping backwards on Pis fitted with RTC expansion hardware.

Version 0.12. Tagged as 'SDCMOS-0_12'
parent 3d5ba2a8
......@@ -11,13 +11,13 @@
GBLS Module_HelpVersion
GBLS Module_ComponentName
GBLS Module_ComponentPath
Module_MajorVersion SETS "0.11"
Module_Version SETA 11
Module_MajorVersion SETS "0.12"
Module_Version SETA 12
Module_MinorVersion SETS ""
Module_Date SETS "18 Nov 2013"
Module_ApplicationDate SETS "18-Nov-13"
Module_Date SETS "22 Dec 2013"
Module_ApplicationDate SETS "22-Dec-13"
Module_ComponentName SETS "SDCMOS"
Module_ComponentPath SETS "cddl/RiscOS/Sources/HWSupport/SD/SDCMOS"
Module_FullVersion SETS "0.11"
Module_HelpVersion SETS "0.11 (18 Nov 2013)"
Module_FullVersion SETS "0.12"
Module_HelpVersion SETS "0.12 (22 Dec 2013)"
END
/* (0.11)
/* (0.12)
*
* This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1.
*
*/
#define Module_MajorVersion_CMHG 0.11
#define Module_MajorVersion_CMHG 0.12
#define Module_MinorVersion_CMHG
#define Module_Date_CMHG 18 Nov 2013
#define Module_Date_CMHG 22 Dec 2013
#define Module_MajorVersion "0.11"
#define Module_Version 11
#define Module_MajorVersion "0.12"
#define Module_Version 12
#define Module_MinorVersion ""
#define Module_Date "18 Nov 2013"
#define Module_Date "22 Dec 2013"
#define Module_ApplicationDate "18-Nov-13"
#define Module_ApplicationDate "22-Dec-13"
#define Module_ComponentName "SDCMOS"
#define Module_ComponentPath "cddl/RiscOS/Sources/HWSupport/SD/SDCMOS"
#define Module_FullVersion "0.11"
#define Module_HelpVersion "0.11 (18 Nov 2013)"
#define Module_LibraryVersionInfo "0:11"
#define Module_FullVersion "0.12"
#define Module_HelpVersion "0.12 (22 Dec 2013)"
#define Module_LibraryVersionInfo "0:12"
......@@ -43,6 +43,7 @@ StoreInHAL SETL {FALSE};
GET Hdr:FileTypes
GET Hdr:Services
GET Hdr:MsgTrans
GET Hdr:RTC
GET Hdr:HALDevice
GET Hdr:HALEntries
GET VersionASM
......@@ -298,7 +299,11 @@ TryInit ROUT
TEQ r14, r5
BNE %B50
; Read size of block in HAL
; If there's no RTC, try restoring the time from the HAL timestamp
SWI XRTC_Features
BVC %F60 ; V clear -> RTC driver is active
; Read size of pseudo CMOS in HAL
MOV r2, sp
MOV r3, #4
SWI XOS_GBPB
......
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