mirror of https://github.com/acidanthera/audk.git
ArmPlatformPkg/PL031RealTimeClockLib: ignore DST setting when timezone is set
According to the UEFI spec, the timezone setting which the platform needs to record in addition to the actual date and time already reflects the current DST setting. In other words, moving the clock from standard time to daylight saving time also involves adding or subtracting 60 minutes from the timezone setting, as well as flicking the EFI_TIME_IN_DAYLIGHT bit in the DST setting. This means we need to disregard the DST setting if the timezone is specified, and only add or subtract the additional hour if we are on local time. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
This commit is contained in:
parent
26f9ef3ab3
commit
207bc6a38c
|
@ -164,12 +164,10 @@ LibGetTime (
|
|||
}
|
||||
|
||||
// Adjust for the correct time zone
|
||||
// The timezone setting also reflects the DST setting of the clock
|
||||
if (Time->TimeZone != EFI_UNSPECIFIED_TIMEZONE) {
|
||||
EpochSeconds += Time->TimeZone * SEC_PER_MIN;
|
||||
}
|
||||
|
||||
// Adjust for the correct period
|
||||
if ((Time->Daylight & EFI_TIME_IN_DAYLIGHT) == EFI_TIME_IN_DAYLIGHT) {
|
||||
} else if ((Time->Daylight & EFI_TIME_IN_DAYLIGHT) == EFI_TIME_IN_DAYLIGHT) {
|
||||
// Convert to adjusted time, i.e. spring forwards one hour
|
||||
EpochSeconds += SEC_PER_HOUR;
|
||||
}
|
||||
|
@ -229,12 +227,10 @@ LibSetTime (
|
|||
EpochSeconds = EfiTimeToEpoch (Time);
|
||||
|
||||
// Adjust for the correct time zone, i.e. convert to UTC time zone
|
||||
// The timezone setting also reflects the DST setting of the clock
|
||||
if (Time->TimeZone != EFI_UNSPECIFIED_TIMEZONE) {
|
||||
EpochSeconds -= Time->TimeZone * SEC_PER_MIN;
|
||||
}
|
||||
|
||||
// Adjust for the correct period
|
||||
if ((Time->Daylight & EFI_TIME_IN_DAYLIGHT) == EFI_TIME_IN_DAYLIGHT) {
|
||||
} else if ((Time->Daylight & EFI_TIME_IN_DAYLIGHT) == EFI_TIME_IN_DAYLIGHT) {
|
||||
// Convert to un-adjusted time, i.e. fall back one hour
|
||||
EpochSeconds -= SEC_PER_HOUR;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue