1) Initialize gBS, gST, gImageHandle in UefiBootServicesTableLib.c to NULL

2) Add DxeCore infix to the module local variable gBS, gST, gRT, gDS in DxeMain.c. This is to solve the name conflict with UefiBootServicesTableLib which is defined in MDE Library Spec. 
3) Add in check for gBS and gST in UefiDebugLibConOut/DebugLib.c and UefiDebugLibStdErr/DebugLib.c and MdePkg/Library/DxeReportStatusCodeLib/ReportStatusCodeLib.c. If they are not initialized, the API will just return with a error message.

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

1 files changed, 5 insertions, 5 deletions

diff --git a/EdkModulePkg/Core/Dxe/DxeMain.h b/EdkModulePkg/Core/Dxe/DxeMain.h
index d655cd3381..b4cd76a2a1 100644
--- a/EdkModulePkg/Core/Dxe/DxeMain.h
+++ b/EdkModulePkg/Core/Dxe/DxeMain.h
@@ -1,6 +1,6 @@
 /*++

 

-Copyright (c) 2006, Intel Corporation                                                         

+Copyright (c) 2006 - 2007, Intel Corporation                                                         

 All rights reserved. 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        

@@ -116,10 +116,10 @@ typedef struct {
 //

 // DXE Core Global Variables

 //

-extern EFI_SYSTEM_TABLE                         *gST;

-extern EFI_BOOT_SERVICES                        *gBS;

-extern EFI_RUNTIME_SERVICES                     *gRT;

-extern EFI_DXE_SERVICES                         *gDS;

+extern EFI_SYSTEM_TABLE                         *gDxeCoreST;

+extern EFI_BOOT_SERVICES                        *gDxeCoreBS;

+extern EFI_RUNTIME_SERVICES                     *gDxeCoreRT;

+extern EFI_DXE_SERVICES                         *gDxeCoreDS;

 extern EFI_HANDLE                               gDxeCoreImageHandle;

 

 extern EFI_DECOMPRESS_PROTOCOL                  gEfiDecompress;