Remove unnecessary mBdsImageHandle.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11012 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/IntelFrameworkModulePkg/Include/Library/GenericBdsLib.h b/IntelFrameworkModulePkg/Include/Library/GenericBdsLib.h
index 5b2045d693c6ddd276cdbff65959f1b5ad32bcfb..64732e5180173d6fc9ba9b118b3aafa34efd704a 100644 (file)
--- a/IntelFrameworkModulePkg/Include/Library/GenericBdsLib.h
+++ b/IntelFrameworkModulePkg/Include/Library/GenericBdsLib.h
@@ -19,7 +19,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define _GENERIC_BDS_LIB_H_\r
 \r
 #include <Protocol/UserManager.h>\r
-extern EFI_HANDLE mBdsImageHandle;\r
 \r
 ///\r
 /// Constants which are variable names used to access variables.\r
@@ -569,7 +568,6 @@ DevicePathToStr (
   IN EFI_DEVICE_PATH_PROTOCOL     *DevPath\r
   );\r
 \r
-\r
 //\r
 // Internal definitions\r
 //\r
@@ -592,17 +590,12 @@ typedef struct {
   DEV_PATH_FUNCTION Function;\r
 } DEVICE_PATH_STRING_TABLE;\r
 \r
-extern EFI_GUID mEfiDevicePathMessagingUartFlowControlGuid;\r
-\r
 typedef struct {\r
   EFI_DEVICE_PATH_PROTOCOL  Header;\r
   EFI_GUID                  Guid;\r
   UINT8                     VendorDefinedData[1];\r
 } VENDOR_DEVICE_PATH_WITH_DATA;\r
 \r
-\r
-extern EFI_GUID mEfiDevicePathMessagingSASGuid;\r
-\r
 typedef struct {\r
   EFI_DEVICE_PATH_PROTOCOL  Header;\r
   UINT16                    NetworkProtocol;\r

diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
index 2d98d73eeaf6ac92403fb0346d9af1c90bb52de0..a6a91186f1cb3082b4581f66b2fd276b3bd92fc9 100644 (file)
--- a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
+++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
@@ -292,7 +292,7 @@ BdsLibBootViaBootOption (
   \r
   Status = gBS->LoadImage (\r
                   TRUE,\r
-                  mBdsImageHandle,\r
+                  gImageHandle,\r
                   DevicePath,\r
                   NULL,\r
                   0,\r
@@ -320,7 +320,7 @@ BdsLibBootViaBootOption (
     if (FilePath != NULL) {\r
       Status = gBS->LoadImage (\r
                       TRUE,\r
-                      mBdsImageHandle,\r
+                      gImageHandle,\r
                       FilePath,\r
                       NULL,\r
                       0,\r
@@ -2072,7 +2072,7 @@ BdsLibUpdateFvFileDevicePath (
   FindFvFile = FALSE;\r
   FoundFvHandle = NULL;\r
   Status = gBS->HandleProtocol (\r
-             mBdsImageHandle,\r
+             gImageHandle,\r
              &gEfiLoadedImageProtocolGuid,\r
              (VOID **) &LoadedImage\r
              );\r

diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsMisc.c b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsMisc.c
index 2a12f16879833ce1acc87a3e18c0fe17979232d7..3d2e199e52e86123f6ef8b0dc6f6f995d9957668 100644 (file)
--- a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsMisc.c
+++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsMisc.c
@@ -79,7 +79,7 @@ BdsLibLoadDrivers (
     //\r
     Status = gBS->LoadImage (\r
                     FALSE,\r
-                    mBdsImageHandle,\r
+                    gImageHandle,\r
                     Option->DevicePath,\r
                     NULL,\r
                     0,\r

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BdsEntry.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BdsEntry.c
index f89d8b8ebef1ca5951a0a27fa9cbaa6330baf950..f5431551f57e8535401bff80fe5fa79e2d92e1cb 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BdsEntry.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BdsEntry.c
@@ -5,7 +5,7 @@
   After DxeCore finish DXE phase, gEfiBdsArchProtocolGuid->BdsEntry will be invoked\r
   to enter BDS phase.\r
 \r
-Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -38,8 +38,6 @@ EFI_BDS_ARCH_PROTOCOL  gBds = {
 \r
 UINT16                          *mBootNext = NULL;\r
 \r
-EFI_HANDLE                      mBdsImageHandle;\r
-\r
 /**\r
 \r
   Install Boot Device Selection Protocol\r
@@ -61,8 +59,6 @@ BdsInitialize (
 {\r
   EFI_STATUS  Status;\r
 \r
-  mBdsImageHandle = ImageHandle;\r
-\r
   //\r
   // Install protocol interface\r
   //\r

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/Language.c b/IntelFrameworkModulePkg/Universal/BdsDxe/Language.c
index 09f48b874bd65112dbb3701c4db60d7a0069a427..ef2e2d860e64264aa5e113aa1bd89413ba52f34e 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/Language.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/Language.c
@@ -1,7 +1,7 @@
 /** @file\r
   Language settings\r
 \r
-Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -263,7 +263,7 @@ ExportFonts (
 \r
   HiiHandle = HiiAddPackages (\r
                 &mFontPackageGuid,\r
-                mBdsImageHandle,\r
+                gImageHandle,\r
                 &mFontBin,\r
                 NULL\r
                 );\r

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/String.c b/IntelFrameworkModulePkg/Universal/BdsDxe/String.c
index 9924352234f65782647af80a00ec56492c9bb2ea..d02001b4d11f1c603df74b1be00781223ce65ae8 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/String.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/String.c
@@ -1,7 +1,7 @@
 /** @file\r
   String support\r
 \r
-Copyright (c) 2004 - 2009, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -33,7 +33,7 @@ InitializeStringSupport (
 {\r
   gStringPackHandle = HiiAddPackages (\r
                          &mBdsStringPackGuid,\r
-                         mBdsImageHandle,\r
+                         gImageHandle,\r
                          BdsDxeStrings,\r
                          NULL\r
                          );\r