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

diff --git a/DuetPkg/DuetPkg.dec b/DuetPkg/DuetPkg.dec
index c34c0d4b4f5ea07b9ae0cf4d56a23d9f7e472c4b..d5c1f5dd5e1f4125d3434e86c5ef555664620be4 100644 (file)
--- a/DuetPkg/DuetPkg.dec
+++ b/DuetPkg/DuetPkg.dec
@@ -34,3 +34,9 @@
 \r
   ## Include/Guid/ConsoleOutConfig.h\r
   gDuetConsoleOutConfigGuid     = { 0xED150714, 0xDF30, 0x407D, { 0xB2, 0x4A, 0x4B, 0x74, 0x2F, 0xD5, 0xCE, 0xA2 }}\r
+  \r
+  ## Include/Guid/DxeCoreFileName.h\r
+  gDxeCoreFileNameGuid          = { 0xD6A2CB7F, 0x6A18, 0x4e2f, { 0xB4, 0x3B, 0x99, 0x20, 0xA7, 0x33, 0x70, 0x0A }}\r
+\r
+  ## Include/Guid/LdrMemoryDescriptor.h\r
+  gLdrMemoryDescriptorGuid      = { 0x7701d7e5, 0x7d1d, 0x4432, { 0xa4, 0x68, 0x67, 0x3d, 0xab, 0x8a, 0xde, 0x60 }}
\ No newline at end of file

diff --git a/DuetPkg/DxeIpl/DxeIpl.h b/DuetPkg/DxeIpl/DxeIpl.h
index 18150656ad8e4d50ebef1e3769f25814989d5f6a..581c2e6f692055ff608c0180f25c28764d709db3 100644 (file)
--- a/DuetPkg/DxeIpl/DxeIpl.h
+++ b/DuetPkg/DxeIpl/DxeIpl.h
@@ -1,7 +1,7 @@
 /** @file\r
   Internal header file for DxeIpl module.\r
   \r
-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2011, 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
@@ -32,6 +32,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Guid/SystemNvDataGuid.h>\r
 #include <Guid/VariableFormat.h>\r
 #include <Guid/StatusCodeDataTypeDebug.h>\r
+#include <Guid/DxeCoreFileName.h>\r
+#include <Guid/LdrMemoryDescriptor.h>\r
 \r
 #include <Protocol/Decompress.h>\r
 #include <Protocol/StatusCode.h>\r

diff --git a/DuetPkg/DxeIpl/DxeIpl.inf b/DuetPkg/DxeIpl/DxeIpl.inf
index 6c000845131680ce098edec3ce64d98e1b2f3ffb..ba7a2c2d326d57a9eb51a94a151f6820fc21598b 100644 (file)
--- a/DuetPkg/DxeIpl/DxeIpl.inf
+++ b/DuetPkg/DxeIpl/DxeIpl.inf
@@ -39,6 +39,8 @@
 \r
 [Guids]\r
   gEfiVariableGuid\r
+  gDxeCoreFileNameGuid\r
+  gLdrMemoryDescriptorGuid\r
 \r
 [Sources]\r
   DxeIpl.h\r

diff --git a/DuetPkg/DxeIpl/HobGeneration.c b/DuetPkg/DxeIpl/HobGeneration.c
index 434653a5e7348715484819b5623235e1fa2419a9..401d5c718d8dc1e84b331ba143609ad6de1fa0d1 100644 (file)
--- a/DuetPkg/DxeIpl/HobGeneration.c
+++ b/DuetPkg/DxeIpl/HobGeneration.c
@@ -1,6 +1,6 @@
 /** @file\r
 \r
-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2011, 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
@@ -23,9 +23,6 @@ Revision History:
 #include "FlashLayout.h"\r
 #include "Debug.h"\r
 \r
-#define EFI_DXE_FILE_GUID \\r
-  { 0xb1644c1a, 0xc16a, 0x4c5b, {0x88, 0xde, 0xea, 0xfb, 0xa9, 0x7e, 0x74, 0xd8 }}\r
-\r
 #define EFI_CPUID_EXTENDED_FUNCTION  0x80000000\r
 #define CPUID_EXTENDED_ADD_SIZE      0x80000008\r
 \r
@@ -188,7 +185,7 @@ HOB_TEMPLATE  gHobTemplate = {
         0, 0, 0, 0                                  // UINT8                 Reserved[4]; \r
       },\r
     },\r
-    EFI_DXE_FILE_GUID,\r
+    DXE_CORE_FILE_NAME_GUID,\r
     0x0                                             //  EFI_PHYSICAL_ADDRESS of EntryPoint;\r
   },\r
   { // MemoryDxeCore\r
@@ -362,7 +359,7 @@ HOB_TEMPLATE  gHobTemplate = {
         sizeof (MEMORY_DESC_HOB),          // Hob size\r
         0                                  // reserved\r
       },\r
-      EFI_LDR_MEMORY_DESCRIPTOR_GUID\r
+      LDR_MEMORY_DESCRIPTOR_GUID\r
     },\r
     0,\r
     NULL\r

diff --git a/DuetPkg/DxeIpl/HobGeneration.h b/DuetPkg/DxeIpl/HobGeneration.h
index fe0b9a933dd4cdf8616b0fc83e17fa191607bb91..f9f8f315ab637e234af4cd7dbd045b35e468982a 100644 (file)
--- a/DuetPkg/DxeIpl/HobGeneration.h
+++ b/DuetPkg/DxeIpl/HobGeneration.h
@@ -1,6 +1,6 @@
 /** @file\r
 \r
-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2011, 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
@@ -31,9 +31,6 @@ Revision History:
 #define NV_STORAGE_START               0x15000\r
 #define NV_STORAGE_STATE               0x19000\r
 \r
-#define EFI_LDR_MEMORY_DESCRIPTOR_GUID \\r
-  { 0x7701d7e5, 0x7d1d, 0x4432, {0xa4, 0x68, 0x67, 0x3d, 0xab, 0x8a, 0xde, 0x60}}\r
-\r
 #pragma pack(1)\r
 \r
 typedef struct {\r
@@ -51,12 +48,6 @@ typedef struct {
   EFI_PHYSICAL_ADDRESS          Interface;\r
 } PROTOCOL_HOB;\r
 \r
-typedef struct {\r
-  EFI_HOB_GUID_TYPE             Hob;\r
-  UINTN                         MemDescCount;\r
-  EFI_MEMORY_DESCRIPTOR         *MemDesc;\r
-} MEMORY_DESC_HOB;\r
-\r
 typedef struct {\r
   EFI_HOB_GUID_TYPE                         Hob;\r
   // Note: we get only one PCI Segment now.\r

diff --git a/DuetPkg/Include/Guid/DxeCoreFileName.h b/DuetPkg/Include/Guid/DxeCoreFileName.h
new file mode 100644 (file)
index 0000000..24c0a15
--- /dev/null
+++ b/DuetPkg/Include/Guid/DxeCoreFileName.h
@@ -0,0 +1,23 @@
+/** @file\r
+  Guid is EDKII DxeCore moudle GUID.\r
+\r
+Copyright (c) 2011, 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
+http://opensource.org/licenses/bsd-license.php                                            \r
+                                                                                          \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+\r
+**/\r
+\r
+#ifndef __DXE_CORE_FILE_NAME__\r
+#define __DXE_CORE_FILE_NAME__\r
+\r
+#define DXE_CORE_FILE_NAME_GUID \\r
+  { 0xD6A2CB7F, 0x6A18, 0x4e2f, {0xB4, 0x3B, 0x99, 0x20, 0xA7, 0x33, 0x70, 0x0A }}\r
+\r
+extern EFI_GUID gDxeCoreFileNameGuid;\r
+\r
+#endif\r

diff --git a/DuetPkg/Include/Guid/LdrMemoryDescriptor.h b/DuetPkg/Include/Guid/LdrMemoryDescriptor.h
new file mode 100644 (file)
index 0000000..5fd7aa1
--- /dev/null
+++ b/DuetPkg/Include/Guid/LdrMemoryDescriptor.h
@@ -0,0 +1,33 @@
+/** @file\r
+  Guid is for GUIDED HOB of LDR memory descriptor.\r
+\r
+Copyright (c) 2011, 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
+http://opensource.org/licenses/bsd-license.php                                            \r
+                                                                                          \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+\r
+**/\r
+\r
+#ifndef __LDR_MEMORY_DESCRIPTOR__\r
+#define __LDR_MEMORY_DESCRIPTOR__\r
+\r
+#define LDR_MEMORY_DESCRIPTOR_GUID \\r
+  { 0x7701d7e5, 0x7d1d, 0x4432, {0xa4, 0x68, 0x67, 0x3d, 0xab, 0x8a, 0xde, 0x60}}\r
+\r
+#pragma pack(1)\r
+\r
+typedef struct {\r
+  EFI_HOB_GUID_TYPE             Hob;\r
+  UINTN                         MemDescCount;\r
+  EFI_MEMORY_DESCRIPTOR         *MemDesc;\r
+} MEMORY_DESC_HOB;\r
+\r
+#pragma pack()\r
+\r
+extern EFI_GUID gLdrMemoryDescriptorGuid;\r
+\r
+#endif\r

diff --git a/DuetPkg/Library/DuetBdsLib/BdsPlatform.c b/DuetPkg/Library/DuetBdsLib/BdsPlatform.c
index a478efd1cf042f9d0f8015a80db7847465f5ac55..205c49c7af11c1f04268ea19c8b2d9271e982e49 100644 (file)
--- a/DuetPkg/Library/DuetBdsLib/BdsPlatform.c
+++ b/DuetPkg/Library/DuetBdsLib/BdsPlatform.c
@@ -1,6 +1,6 @@
 /*++\r
 \r
-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2011, 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
@@ -83,21 +83,6 @@ Returns:
   return ;\r
 }\r
 \r
-#define EFI_LDR_MEMORY_DESCRIPTOR_GUID \\r
-  { 0x7701d7e5, 0x7d1d, 0x4432, {0xa4, 0x68, 0x67, 0x3d, 0xab, 0x8a, 0xde, 0x60 }}\r
-\r
-EFI_GUID gEfiLdrMemoryDescriptorGuid = EFI_LDR_MEMORY_DESCRIPTOR_GUID;\r
-\r
-#pragma pack(1)\r
-\r
-typedef struct {\r
-  EFI_HOB_GUID_TYPE             Hob;\r
-  UINTN                         MemDescCount;\r
-  EFI_MEMORY_DESCRIPTOR         *MemDesc;\r
-} MEMORY_DESC_HOB;\r
-\r
-#pragma pack()\r
-\r
 #if 0\r
 VOID\r
 PrintMemoryMap (\r
@@ -154,7 +139,7 @@ UpdateMemoryMap (
   EFI_PHYSICAL_ADDRESS            Memory;\r
   EFI_GCD_MEMORY_SPACE_DESCRIPTOR Descriptor;\r
   \r
-  GuidHob.Raw = GetFirstGuidHob (&gEfiLdrMemoryDescriptorGuid);\r
+  GuidHob.Raw = GetFirstGuidHob (&gLdrMemoryDescriptorGuid);\r
   if (GuidHob.Raw == NULL) {\r
     DEBUG ((EFI_D_ERROR, "Fail to get gEfiLdrMemoryDescriptorGuid from GUID HOB LIST!\n"));\r
     return;\r

diff --git a/DuetPkg/Library/DuetBdsLib/BdsPlatform.h b/DuetPkg/Library/DuetBdsLib/BdsPlatform.h
index bd9d74fe7a9cf7fb2d455964b36e232b145d2979..564d488c1ade59c88e9306537c41276aacd12cdd 100644 (file)
--- a/DuetPkg/Library/DuetBdsLib/BdsPlatform.h
+++ b/DuetPkg/Library/DuetBdsLib/BdsPlatform.h
@@ -1,6 +1,6 @@
 /*++\r
 \r
-Copyright (c) 2006 - 2007, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2011, 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
@@ -51,6 +51,7 @@ Abstract:
 #include <Guid/HobList.h>\r
 #include <Guid/PciExpressBaseAddress.h>\r
 #include <Guid/GlobalVariable.h>\r
+#include <Guid/LdrMemoryDescriptor.h>\r
 \r
 extern BDS_CONSOLE_CONNECT_ENTRY  gPlatformConsole[];\r
 extern EFI_DEVICE_PATH_PROTOCOL   *gPlatformConnectSequence[];\r

diff --git a/DuetPkg/Library/DuetBdsLib/PlatformBds.inf b/DuetPkg/Library/DuetBdsLib/PlatformBds.inf
index e6aabd59b5b3043234aa03bae65f4f77fdc45016..f50a62e57a131cac6638e97633d2902b6e38c2d5 100644 (file)
--- a/DuetPkg/Library/DuetBdsLib/PlatformBds.inf
+++ b/DuetPkg/Library/DuetBdsLib/PlatformBds.inf
@@ -57,6 +57,7 @@
   gEfiMpsTableGuid\r
   gEfiSmbiosTableGuid\r
   gEfiAcpiTableGuid\r
+  gLdrMemoryDescriptorGuid\r
   \r
 [Pcd]\r
   gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdPlatformBootTimeOut  \r