Remove the global variable of gDxeCoreBS and uses the gBS in UefiBootServicesTableLib...

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

diff --git a/MdeModulePkg/Core/Dxe/DxeMain.h b/MdeModulePkg/Core/Dxe/DxeMain.h
index 6622a1d95ede47739623a5e9d2d806894b500c05..6e61242149ccba0debd4724618baae72379a6aaa 100644 (file)
--- a/MdeModulePkg/Core/Dxe/DxeMain.h
+++ b/MdeModulePkg/Core/Dxe/DxeMain.h
@@ -76,6 +76,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/PeCoffLib.h>\r
 #include <Library/PcdLib.h>\r
 #include <Library/MemoryAllocationLib.h>\r
+#include <Library/UefiBootServicesTableLib.h>\r
 \r
 #include "DebugImageInfo.h"\r
 #include "Library.h"\r
@@ -197,7 +198,6 @@ typedef struct {
 // DXE Core Global Variables\r
 //\r
 extern EFI_SYSTEM_TABLE                         *gDxeCoreST;\r
-extern EFI_BOOT_SERVICES                        *gDxeCoreBS;\r
 extern EFI_RUNTIME_SERVICES                     *gDxeCoreRT;\r
 extern EFI_DXE_SERVICES                         *gDxeCoreDS;\r
 extern EFI_HANDLE                               gDxeCoreImageHandle;\r

diff --git a/MdeModulePkg/Core/Dxe/DxeMain.inf b/MdeModulePkg/Core/Dxe/DxeMain.inf
index c8d5f6696252016a3277bab869b35dcf8578bab3..5f0b95fd6370116b94e439ab340e1d109a55e014 100644 (file)
--- a/MdeModulePkg/Core/Dxe/DxeMain.inf
+++ b/MdeModulePkg/Core/Dxe/DxeMain.inf
@@ -87,6 +87,7 @@
   PeCoffLib\r
   ExtractGuidedSectionLib\r
   MemoryAllocationLib\r
+  UefiBootServicesTableLib\r
 \r
 [Guids]\r
   gEfiEventLegacyBootGuid                       # ALWAYS_CONSUMED\r

diff --git a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
index cdfeafe62770ebe8cf59b0e181fe42135890570c..5687ba1856ef98531d0f3eae09771145d9700f6c 100644 (file)
--- a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
+++ b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
@@ -199,7 +199,6 @@ EFI_RUNTIME_ARCH_PROTOCOL *gRuntime = &gRuntimeTemplate;
 // DXE Core Global Variables for the EFI System Table, Boot Services Table,\r
 // DXE Services Table, and Runtime Services Table\r
 //\r
-EFI_BOOT_SERVICES     *gDxeCoreBS = &mBootServices;\r
 EFI_DXE_SERVICES      *gDxeCoreDS = &mDxeServices;\r
 EFI_SYSTEM_TABLE      *gDxeCoreST = NULL;\r
 \r
@@ -640,11 +639,11 @@ CalculateEfiHdrCrc (
   Hdr->CRC32 = 0;\r
 \r
   //\r
-  // If gDxeCoreBS->CalculateCrce32 () == CoreEfiNotAvailableYet () then\r
+  // If gBS->CalculateCrce32 () == CoreEfiNotAvailableYet () then\r
   //  Crc will come back as zero if we set it to zero here\r
   //\r
   Crc = 0;\r
-  gDxeCoreBS->CalculateCrc32 ((UINT8 *)Hdr, Hdr->HeaderSize, &Crc);\r
+  gBS->CalculateCrc32 ((UINT8 *)Hdr, Hdr->HeaderSize, &Crc);\r
   Hdr->CRC32 = Crc;\r
 }\r
 \r
@@ -744,8 +743,8 @@ CoreExitBootServices (
   //\r
   // Zero out the Boot Service Table\r
   //\r
-  ZeroMem (gDxeCoreBS, sizeof (EFI_BOOT_SERVICES));\r
-  gDxeCoreBS = NULL;\r
+  ZeroMem (gBS, sizeof (EFI_BOOT_SERVICES));\r
+  gBS = NULL;\r
 \r
   //\r
   // Update the AtRuntime field in Runtiem AP.\r

diff --git a/MdeModulePkg/Core/Dxe/DxeMain/DxeProtocolNotify.c b/MdeModulePkg/Core/Dxe/DxeMain/DxeProtocolNotify.c
index 7bce6185c689159cd37401550c57a46824ff8787..89a4c50b99eb4002ccc0dc3afa995a9a9bddd506 100644 (file)
--- a/MdeModulePkg/Core/Dxe/DxeMain/DxeProtocolNotify.c
+++ b/MdeModulePkg/Core/Dxe/DxeMain/DxeProtocolNotify.c
@@ -161,7 +161,7 @@ GenericArchProtocolNotify (
   //\r
   if (Found) {\r
     CalculateEfiHdrCrc (&gDxeCoreRT->Hdr);\r
-    CalculateEfiHdrCrc (&gDxeCoreBS->Hdr);\r
+    CalculateEfiHdrCrc (&gBS->Hdr);\r
     CalculateEfiHdrCrc (&gDxeCoreST->Hdr);\r
     CalculateEfiHdrCrc (&gDxeCoreDS->Hdr);\r
   }\r

diff --git a/MdeModulePkg/Core/Dxe/Hand/Handle.c b/MdeModulePkg/Core/Dxe/Hand/Handle.c
index 99c265996ead8420d8d65431d87053586b8afa22..d94fdde720a5d2b6da071cf588111dde7bffcafe 100644 (file)
--- a/MdeModulePkg/Core/Dxe/Hand/Handle.c
+++ b/MdeModulePkg/Core/Dxe/Hand/Handle.c
@@ -370,8 +370,6 @@ CoreInstallProtocolInterfaceNotify (
   Prot = NULL;\r
   Handle = NULL;\r
 \r
-  ASSERT (gDxeCoreBS != NULL);\r
-\r
   if (*UserHandle != NULL_HANDLE) {\r
     Status = CoreHandleProtocol (*UserHandle, Protocol, (VOID **)&ExistingInterface);\r
     if (!EFI_ERROR (Status)) {\r

diff --git a/MdeModulePkg/Core/Dxe/Misc/DebugImageInfo.c b/MdeModulePkg/Core/Dxe/Misc/DebugImageInfo.c
index aafa193301fd3303bb170af383e0ab74ee3649ac..78f5073e3b7531fd7366dbf14e0a169583fd81e9 100644 (file)
--- a/MdeModulePkg/Core/Dxe/Misc/DebugImageInfo.c
+++ b/MdeModulePkg/Core/Dxe/Misc/DebugImageInfo.c
@@ -104,7 +104,7 @@ CoreUpdateDebugTableCrc32 (
 {\r
   ASSERT(mDebugTable != NULL);\r
   mDebugTable->Crc32 = 0;\r
-  gDxeCoreBS->CalculateCrc32 ((VOID *)mDebugTable, sizeof (EFI_SYSTEM_TABLE_POINTER), &mDebugTable->Crc32);\r
+  gBS->CalculateCrc32 ((VOID *)mDebugTable, sizeof (EFI_SYSTEM_TABLE_POINTER), &mDebugTable->Crc32);\r
 }\r
 \r
 \r