Clean up the private GUID definition in module Level.

Signed-off-by: lgao4
Reviewed-by: rni2


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

4 files changed, 9 insertions, 17 deletions

diff --git a/DuetPkg/DxeIpl/DxeIpl.h b/DuetPkg/DxeIpl/DxeIpl.h
index 18150656ad..581c2e6f69 100644
--- a/DuetPkg/DxeIpl/DxeIpl.h
+++ b/DuetPkg/DxeIpl/DxeIpl.h
@@ -1,7 +1,7 @@
 /** @file

   Internal header file for DxeIpl module.

   

-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2011, 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        

@@ -32,6 +32,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Guid/SystemNvDataGuid.h>

 #include <Guid/VariableFormat.h>

 #include <Guid/StatusCodeDataTypeDebug.h>

+#include <Guid/DxeCoreFileName.h>

+#include <Guid/LdrMemoryDescriptor.h>

 

 #include <Protocol/Decompress.h>

 #include <Protocol/StatusCode.h>

diff --git a/DuetPkg/DxeIpl/DxeIpl.inf b/DuetPkg/DxeIpl/DxeIpl.inf
index 6c00084513..ba7a2c2d32 100644
--- a/DuetPkg/DxeIpl/DxeIpl.inf
+++ b/DuetPkg/DxeIpl/DxeIpl.inf
@@ -39,6 +39,8 @@
 

 [Guids]

   gEfiVariableGuid

+  gDxeCoreFileNameGuid

+  gLdrMemoryDescriptorGuid

 

 [Sources]

   DxeIpl.h

diff --git a/DuetPkg/DxeIpl/HobGeneration.c b/DuetPkg/DxeIpl/HobGeneration.c
index 434653a5e7..401d5c718d 100644
--- a/DuetPkg/DxeIpl/HobGeneration.c
+++ b/DuetPkg/DxeIpl/HobGeneration.c
@@ -1,6 +1,6 @@
 /** @file

 

-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2011, 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        

@@ -23,9 +23,6 @@ Revision History:
 #include "FlashLayout.h"

 #include "Debug.h"

 

-#define EFI_DXE_FILE_GUID \

-  { 0xb1644c1a, 0xc16a, 0x4c5b, {0x88, 0xde, 0xea, 0xfb, 0xa9, 0x7e, 0x74, 0xd8 }}

-

 #define EFI_CPUID_EXTENDED_FUNCTION  0x80000000

 #define CPUID_EXTENDED_ADD_SIZE      0x80000008

 

@@ -188,7 +185,7 @@ HOB_TEMPLATE  gHobTemplate = {
         0, 0, 0, 0                                  // UINT8                 Reserved[4]; 

       },

     },

-    EFI_DXE_FILE_GUID,

+    DXE_CORE_FILE_NAME_GUID,

     0x0                                             //  EFI_PHYSICAL_ADDRESS of EntryPoint;

   },

   { // MemoryDxeCore

@@ -362,7 +359,7 @@ HOB_TEMPLATE  gHobTemplate = {
         sizeof (MEMORY_DESC_HOB),          // Hob size

         0                                  // reserved

       },

-      EFI_LDR_MEMORY_DESCRIPTOR_GUID

+      LDR_MEMORY_DESCRIPTOR_GUID

     },

     0,

     NULL

diff --git a/DuetPkg/DxeIpl/HobGeneration.h b/DuetPkg/DxeIpl/HobGeneration.h
index fe0b9a933d..f9f8f315ab 100644
--- a/DuetPkg/DxeIpl/HobGeneration.h
+++ b/DuetPkg/DxeIpl/HobGeneration.h
@@ -1,6 +1,6 @@
 /** @file

 

-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2011, 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        

@@ -31,9 +31,6 @@ Revision History:
 #define NV_STORAGE_START               0x15000

 #define NV_STORAGE_STATE               0x19000

 

-#define EFI_LDR_MEMORY_DESCRIPTOR_GUID \

-  { 0x7701d7e5, 0x7d1d, 0x4432, {0xa4, 0x68, 0x67, 0x3d, 0xab, 0x8a, 0xde, 0x60}}

-

 #pragma pack(1)

 

 typedef struct {

@@ -52,12 +49,6 @@ typedef struct {
 } PROTOCOL_HOB;

 

 typedef struct {

-  EFI_HOB_GUID_TYPE             Hob;

-  UINTN                         MemDescCount;

-  EFI_MEMORY_DESCRIPTOR         *MemDesc;

-} MEMORY_DESC_HOB;

-

-typedef struct {

   EFI_HOB_GUID_TYPE                         Hob;

   // Note: we get only one PCI Segment now.

   EFI_PCI_EXPRESS_BASE_ADDRESS_INFORMATION  PciExpressBaseAddressInfo;