diff options
| author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2016-04-13 10:07:55 +0200 |
|---|---|---|
| committer | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2016-05-11 16:57:23 +0200 |
| commit | fca117fd3f598ad931318bceabbd4718fafc1fc7 (patch) | |
| tree | dd0dda6e330dd3e17616027a1b402d7b6dfea825 /ArmPlatformPkg/Library | |
| parent | 3ad72779aa97fcde5262b072edc69967da3bdc82 (diff) | |
| download | edk2-fca117fd3f598ad931318bceabbd4718fafc1fc7.tar.gz edk2-fca117fd3f598ad931318bceabbd4718fafc1fc7.tar.bz2 edk2-fca117fd3f598ad931318bceabbd4718fafc1fc7.zip | |
ArmPlatformPkg/PL031RealTimeClockLib: remove local copy of gRT pointer
Since the only reason for keeping a local copy mRT of the gRT pointer
is to be able to call GetVariable/SetVariable at runtime, use the
UefiRuntimeLib helpers instead, so that we can drop mRT altogether.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
Diffstat (limited to 'ArmPlatformPkg/Library')
| -rw-r--r-- | ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.c b/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.c index 516b45675c..4aa448b528 100644 --- a/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.c +++ b/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.c @@ -43,7 +43,6 @@ STATIC CONST CHAR16 mDaylightVariableName[] = L"PL031RtcDaylight"; STATIC BOOLEAN mPL031Initialized = FALSE;
STATIC EFI_EVENT mRtcVirtualAddrChangeEvent;
STATIC UINTN mPL031RtcBase;
-STATIC EFI_RUNTIME_SERVICES *mRT;
EFI_STATUS
IdentifyPL031 (
@@ -293,7 +292,7 @@ LibGetTime ( // Get the current time zone information from non-volatile storage
Size = sizeof (TimeZone);
- Status = mRT->GetVariable (
+ Status = EfiGetVariable (
(CHAR16 *)mTimeZoneVariableName,
&gEfiCallerIdGuid,
NULL,
@@ -311,7 +310,7 @@ LibGetTime ( // The time zone variable does not exist in non-volatile storage, so create it.
Time->TimeZone = EFI_UNSPECIFIED_TIMEZONE;
// Store it
- Status = mRT->SetVariable (
+ Status = EfiSetVariable (
(CHAR16 *)mTimeZoneVariableName,
&gEfiCallerIdGuid,
EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,
@@ -345,7 +344,7 @@ LibGetTime ( // Get the current daylight information from non-volatile storage
Size = sizeof (Daylight);
- Status = mRT->GetVariable (
+ Status = EfiGetVariable (
(CHAR16 *)mDaylightVariableName,
&gEfiCallerIdGuid,
NULL,
@@ -363,7 +362,7 @@ LibGetTime ( // The daylight variable does not exist in non-volatile storage, so create it.
Time->Daylight = 0;
// Store it
- Status = mRT->SetVariable (
+ Status = EfiSetVariable (
(CHAR16 *)mDaylightVariableName,
&gEfiCallerIdGuid,
EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,
@@ -497,7 +496,7 @@ LibSetTime ( // Do this after having set the RTC.
// Save the current time zone information into non-volatile storage
- Status = mRT->SetVariable (
+ Status = EfiSetVariable (
(CHAR16 *)mTimeZoneVariableName,
&gEfiCallerIdGuid,
EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,
@@ -515,7 +514,7 @@ LibSetTime ( }
// Save the current daylight information into non-volatile storage
- Status = mRT->SetVariable (
+ Status = EfiSetVariable (
(CHAR16 *)mDaylightVariableName,
&gEfiCallerIdGuid,
EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,
@@ -608,7 +607,6 @@ LibRtcVirtualNotifyEvent ( // runtime calls will be made in virtual mode.
//
EfiConvertPointer (0x0, (VOID**)&mPL031RtcBase);
- EfiConvertPointer (0x0, (VOID**)&mRT);
return;
}
@@ -650,8 +648,6 @@ LibRtcInitialize ( return Status;
}
- mRT = gRT;
-
// Install the protocol
Handle = NULL;
Status = gBS->InstallMultipleProtocolInterfaces (
|