From c3b6d97563982940a2af26671c371998684a2fd9 Mon Sep 17 00:00:00 2001 From: Olivier Martin Date: Fri, 1 Aug 2014 18:33:17 +0000 Subject: ArmPlatformPkg: Removed the global ImageHandle when UefiBootServicesTableLib is included UefiBootServicesTableLib already defines gImageHandle that has been initialized with the value of ImageHandle. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Olivier Martin git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15737 6f19259b-4bc3-4df7-8a09-765794883524 --- .../ArmVExpressFastBootDxe/ArmVExpressFastBoot.c | 2 -- ArmPlatformPkg/Bds/Bds.c | 4 ---- ArmPlatformPkg/Bds/BootMenu.c | 3 +-- ArmPlatformPkg/Bds/BootOption.c | 8 +++----- .../FileSystem/BootMonFs/BootMonFsEntryPoint.c | 18 ++++++++---------- 5 files changed, 12 insertions(+), 23 deletions(-) (limited to 'ArmPlatformPkg') diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpressFastBootDxe/ArmVExpressFastBoot.c b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpressFastBootDxe/ArmVExpressFastBoot.c index 7312cfbc16..4962666cf1 100644 --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpressFastBootDxe/ArmVExpressFastBoot.c +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpressFastBootDxe/ArmVExpressFastBoot.c @@ -440,8 +440,6 @@ ArmAndroidFastbootPlatformEntryPoint ( IN EFI_SYSTEM_TABLE *SystemTable ) { - gImageHandle = ImageHandle; - return gBS->InstallProtocolInterface ( &ImageHandle, &gAndroidFastbootPlatformProtocolGuid, diff --git a/ArmPlatformPkg/Bds/Bds.c b/ArmPlatformPkg/Bds/Bds.c index 6a5cd7a603..e2f97307f6 100644 --- a/ArmPlatformPkg/Bds/Bds.c +++ b/ArmPlatformPkg/Bds/Bds.c @@ -21,8 +21,6 @@ #define EFI_SET_TIMER_TO_SECOND 10000000 -EFI_HANDLE mImageHandle; - STATIC EFI_STATUS GetConsoleDevicePathFromVariable ( @@ -542,8 +540,6 @@ BdsInitialize ( { EFI_STATUS Status; - mImageHandle = ImageHandle; - Status = gBS->InstallMultipleProtocolInterfaces ( &ImageHandle, &gEfiBdsArchProtocolGuid, &gBdsProtocol, diff --git a/ArmPlatformPkg/Bds/BootMenu.c b/ArmPlatformPkg/Bds/BootMenu.c index b96a1c3f92..42212385a8 100644 --- a/ArmPlatformPkg/Bds/BootMenu.c +++ b/ArmPlatformPkg/Bds/BootMenu.c @@ -16,7 +16,6 @@ #include -extern EFI_HANDLE mImageHandle; extern BDS_LOAD_OPTION_SUPPORT *BdsLoadOptionSupportList; /** @@ -954,7 +953,7 @@ BootShell ( EFI_STATUS Status; // Start EFI Shell - Status = BdsLoadApplication (mImageHandle, L"Shell", 0, NULL); + Status = BdsLoadApplication (gImageHandle, L"Shell", 0, NULL); if (Status == EFI_NOT_FOUND) { Print (L"Error: EFI Application not found.\n"); } else if (EFI_ERROR(Status)) { diff --git a/ArmPlatformPkg/Bds/BootOption.c b/ArmPlatformPkg/Bds/BootOption.c index 52c9d831b7..aa8be74bc9 100644 --- a/ArmPlatformPkg/Bds/BootOption.c +++ b/ArmPlatformPkg/Bds/BootOption.c @@ -1,6 +1,6 @@ /** @file * -* Copyright (c) 2011-2013, ARM Limited. All rights reserved. +* Copyright (c) 2011-2014, ARM Limited. All rights reserved. * * This program and the accompanying materials * are licensed and made available under the terms and conditions of the BSD License @@ -15,8 +15,6 @@ #include #include "BdsInternal.h" -extern EFI_HANDLE mImageHandle; - EFI_STATUS BootOptionStart ( IN BDS_LOAD_OPTION *BootOption @@ -46,7 +44,7 @@ BootOptionStart ( BdsConnectAllDrivers (); } - Status = BdsStartEfiApplication (mImageHandle, BootOption->FilePathList, 0, NULL); + Status = BdsStartEfiApplication (gImageHandle, BootOption->FilePathList, 0, NULL); } else if (LoaderType == BDS_LOADER_KERNEL_LINUX_ATAG) { LinuxArguments = &(OptionalData->Arguments.LinuxArguments); CmdLineSize = ReadUnaligned16 ((CONST UINT16*)&LinuxArguments->CmdLineSize); @@ -103,7 +101,7 @@ BootOptionStart ( EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS, LoadOptionIndexSize, &(BootOption->LoadOptionIndex)); - Status = BdsStartEfiApplication (mImageHandle, BootOption->FilePathList, BootOption->OptionalDataSize, BootOption->OptionalData); + Status = BdsStartEfiApplication (gImageHandle, BootOption->FilePathList, BootOption->OptionalDataSize, BootOption->OptionalData); // Clear BootCurrent variable LoadOptionIndexSize = sizeof(UINT16); diff --git a/ArmPlatformPkg/FileSystem/BootMonFs/BootMonFsEntryPoint.c b/ArmPlatformPkg/FileSystem/BootMonFs/BootMonFsEntryPoint.c index 00f7c077ea..5eb7afca7c 100644 --- a/ArmPlatformPkg/FileSystem/BootMonFs/BootMonFsEntryPoint.c +++ b/ArmPlatformPkg/FileSystem/BootMonFs/BootMonFsEntryPoint.c @@ -24,7 +24,6 @@ #include "BootMonFsInternal.h" EFI_DEVICE_PATH* mBootMonFsSupportedDevicePaths; -EFI_HANDLE mImageHandle; LIST_ENTRY mInstances; EFI_FILE_PROTOCOL mBootMonFsRootTemplate = { @@ -217,7 +216,7 @@ BootMonFsDriverSupported ( ControllerHandle, &gEfiDiskIoProtocolGuid, (VOID **) &DiskIo, - mImageHandle, + gImageHandle, ControllerHandle, EFI_OPEN_PROTOCOL_BY_DRIVER ); @@ -231,7 +230,7 @@ BootMonFsDriverSupported ( gBS->CloseProtocol ( ControllerHandle, &gEfiDiskIoProtocolGuid, - mImageHandle, + gImageHandle, ControllerHandle ); @@ -240,7 +239,7 @@ BootMonFsDriverSupported ( ControllerHandle, &gEfiBlockIoProtocolGuid, NULL, - mImageHandle, + gImageHandle, ControllerHandle, EFI_OPEN_PROTOCOL_TEST_PROTOCOL ); @@ -253,7 +252,7 @@ BootMonFsDriverSupported ( ControllerHandle, &gEfiDevicePathProtocolGuid, (VOID **)&DevicePathProtocol, - mImageHandle, + gImageHandle, ControllerHandle, EFI_OPEN_PROTOCOL_BY_DRIVER ); @@ -277,7 +276,7 @@ BootMonFsDriverSupported ( } } - gBS->CloseProtocol (ControllerHandle, &gEfiDevicePathProtocolGuid, mImageHandle, ControllerHandle); + gBS->CloseProtocol (ControllerHandle, &gEfiDevicePathProtocolGuid, gImageHandle, ControllerHandle); return Status; } @@ -303,7 +302,7 @@ BootMonFsDriverStart ( ControllerHandle, &gEfiBlockIoProtocolGuid, (VOID **)&(Instance->BlockIo), - mImageHandle, + gImageHandle, ControllerHandle, EFI_OPEN_PROTOCOL_GET_PROTOCOL ); @@ -316,7 +315,7 @@ BootMonFsDriverStart ( ControllerHandle, &gEfiDiskIoProtocolGuid, (VOID **)&(Instance->DiskIo), - mImageHandle, + gImageHandle, ControllerHandle, EFI_OPEN_PROTOCOL_BY_DRIVER ); @@ -360,7 +359,7 @@ BootMonFsDriverStart ( ControllerHandle, &gEfiDevicePathProtocolGuid, (VOID **)&(Instance->DevicePath), - mImageHandle, + gImageHandle, ControllerHandle, EFI_OPEN_PROTOCOL_GET_PROTOCOL ); @@ -459,7 +458,6 @@ BootMonFsEntryPoint ( { EFI_STATUS Status; - mImageHandle = ImageHandle; InitializeListHead (&mInstances); // Initialize the list of Device Paths that could support BootMonFs -- cgit v1.2.3