From fefefa4cb15eed75dbe3d4867768893bf6d96a30 Mon Sep 17 00:00:00 2001
From: niruiyu <niruiyu@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Mon, 8 Nov 2010 06:56:57 +0000
Subject: [PATCH] Remove unnecessary mBdsImageHandle.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11012 6f19259b-4bc3-4df7-8a09-765794883524
---
 IntelFrameworkModulePkg/Include/Library/GenericBdsLib.h | 7 -------
 IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c | 6 +++---
 IntelFrameworkModulePkg/Library/GenericBdsLib/BdsMisc.c | 2 +-
 IntelFrameworkModulePkg/Universal/BdsDxe/BdsEntry.c     | 6 +-----
 IntelFrameworkModulePkg/Universal/BdsDxe/Language.c     | 4 ++--
 IntelFrameworkModulePkg/Universal/BdsDxe/String.c       | 4 ++--
 6 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/IntelFrameworkModulePkg/Include/Library/GenericBdsLib.h b/IntelFrameworkModulePkg/Include/Library/GenericBdsLib.h
index 5b2045d693..64732e5180 100644
--- 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_
 
 #include <Protocol/UserManager.h>
-extern EFI_HANDLE mBdsImageHandle;
 
 ///
 /// Constants which are variable names used to access variables.
@@ -569,7 +568,6 @@ DevicePathToStr (
   IN EFI_DEVICE_PATH_PROTOCOL     *DevPath
   );
 
-
 //
 // Internal definitions
 //
@@ -592,17 +590,12 @@ typedef struct {
   DEV_PATH_FUNCTION Function;
 } DEVICE_PATH_STRING_TABLE;
 
-extern EFI_GUID mEfiDevicePathMessagingUartFlowControlGuid;
-
 typedef struct {
   EFI_DEVICE_PATH_PROTOCOL  Header;
   EFI_GUID                  Guid;
   UINT8                     VendorDefinedData[1];
 } VENDOR_DEVICE_PATH_WITH_DATA;
 
-
-extern EFI_GUID mEfiDevicePathMessagingSASGuid;
-
 typedef struct {
   EFI_DEVICE_PATH_PROTOCOL  Header;
   UINT16                    NetworkProtocol;
diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
index 2d98d73eea..a6a91186f1 100644
--- a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
+++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
@@ -292,7 +292,7 @@ BdsLibBootViaBootOption (
   
   Status = gBS->LoadImage (
                   TRUE,
-                  mBdsImageHandle,
+                  gImageHandle,
                   DevicePath,
                   NULL,
                   0,
@@ -320,7 +320,7 @@ BdsLibBootViaBootOption (
     if (FilePath != NULL) {
       Status = gBS->LoadImage (
                       TRUE,
-                      mBdsImageHandle,
+                      gImageHandle,
                       FilePath,
                       NULL,
                       0,
@@ -2072,7 +2072,7 @@ BdsLibUpdateFvFileDevicePath (
   FindFvFile = FALSE;
   FoundFvHandle = NULL;
   Status = gBS->HandleProtocol (
-             mBdsImageHandle,
+             gImageHandle,
              &gEfiLoadedImageProtocolGuid,
              (VOID **) &LoadedImage
              );
diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsMisc.c b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsMisc.c
index 2a12f16879..3d2e199e52 100644
--- a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsMisc.c
+++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsMisc.c
@@ -79,7 +79,7 @@ BdsLibLoadDrivers (
     //
     Status = gBS->LoadImage (
                     FALSE,
-                    mBdsImageHandle,
+                    gImageHandle,
                     Option->DevicePath,
                     NULL,
                     0,
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BdsEntry.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BdsEntry.c
index f89d8b8ebe..f5431551f5 100644
--- 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
   to enter BDS phase.
 
-Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -38,8 +38,6 @@ EFI_BDS_ARCH_PROTOCOL  gBds = {
 
 UINT16                          *mBootNext = NULL;
 
-EFI_HANDLE                      mBdsImageHandle;
-
 /**
 
   Install Boot Device Selection Protocol
@@ -61,8 +59,6 @@ BdsInitialize (
 {
   EFI_STATUS  Status;
 
-  mBdsImageHandle = ImageHandle;
-
   //
   // Install protocol interface
   //
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/Language.c b/IntelFrameworkModulePkg/Universal/BdsDxe/Language.c
index 09f48b874b..ef2e2d860e 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/Language.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/Language.c
@@ -1,7 +1,7 @@
 /** @file
   Language settings
 
-Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -263,7 +263,7 @@ ExportFonts (
 
   HiiHandle = HiiAddPackages (
                 &mFontPackageGuid,
-                mBdsImageHandle,
+                gImageHandle,
                 &mFontBin,
                 NULL
                 );
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/String.c b/IntelFrameworkModulePkg/Universal/BdsDxe/String.c
index 9924352234..d02001b4d1 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/String.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/String.c
@@ -1,7 +1,7 @@
 /** @file
   String support
 
-Copyright (c) 2004 - 2009, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -33,7 +33,7 @@ InitializeStringSupport (
 {
   gStringPackHandle = HiiAddPackages (
                          &mBdsStringPackGuid,
-                         mBdsImageHandle,
+                         gImageHandle,
                          BdsDxeStrings,
                          NULL
                          );
-- 
2.39.2