Clean up the private GUID definition in module Level.

0. Remove the unused private GUID from module source files.
1. Use gEfiCallerIdGuid replace of the private module GUID.
2. Add the public header files to define HII FormSet and PackageList GUID used in every HII driver.
3. Publish EFI_LEGACY_DEV_ORDER_VARIABLE_GUID from BdsDxe driver and EFI_UPDATE_DATA_FILE_GUID from UpdateDriverDxe to IntelFrameworkModulePkg Include directory.

Signed-off-by: lgao4
Reviewed-by: ydong10 gdong1 tye jfan12 wli12 rsun3 jyao1 ftian
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12374 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BiosBlkIo.c b/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BiosBlkIo.c
index 309cf1a9ed68de247cdf3c74caf5dc96e958e091..e8ea11c4f81e5e384a11b25ef6f0d420c94d5091 100644 (file)
--- a/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BiosBlkIo.c
+++ b/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BiosBlkIo.c
@@ -5,7 +5,7 @@
   Availible on http://www.t13.org/#Project drafts\r
   Currently at ftp://fission.dt.wdc.com/pub/standards/x3t13/project/d1386r4.pdf\r
 \r
-Copyright (c) 1999 - 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 1999 - 2011, Intel Corporation. All rights reserved.<BR>\r
 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
@@ -68,8 +68,6 @@ BIOS_LEGACY_DRIVE           *mLegacyDriverUnder1Mb;
 //\r
 VOID                        *mEdd11Buffer;\r
 \r
-EFI_GUID                    mUnknownDevGuid = UNKNOWN_DEVICE_GUID;\r
-\r
 /**\r
   Driver entry point.\r
 \r
@@ -635,8 +633,8 @@ SetBiosInitBlockIoDevicePath (
   OUT EFI_DEVICE_PATH_PROTOCOL  **DevicePath\r
   )\r
 {\r
-  EFI_STATUS                        Status;\r
-  UNKNOWN_DEVICE_VENDOR_DEVICE_PATH VendorNode;\r
+  EFI_STATUS                  Status;\r
+  BLOCKIO_VENDOR_DEVICE_PATH  VendorNode;\r
   \r
   Status = EFI_UNSUPPORTED;\r
   \r
@@ -658,7 +656,7 @@ SetBiosInitBlockIoDevicePath (
     VendorNode.DevicePath.Header.Type     = HARDWARE_DEVICE_PATH;\r
     VendorNode.DevicePath.Header.SubType  = HW_VENDOR_DP;\r
     SetDevicePathNodeLength (&VendorNode.DevicePath.Header, sizeof (VendorNode));\r
-    CopyMem (&VendorNode.DevicePath.Guid, &mUnknownDevGuid, sizeof (EFI_GUID));\r
+    CopyMem (&VendorNode.DevicePath.Guid, &gBlockIoVendorGuid, sizeof (EFI_GUID));\r
     VendorNode.LegacyDriveLetter  = Drive->Number;\r
     *DevicePath                   = AppendDevicePathNode (BaseDevicePath, &VendorNode.DevicePath.Header);\r
   }\r

diff --git a/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BiosBlkIo.h b/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BiosBlkIo.h
index de3c8d35189e8b1a381399f6fe4893c391f3ddd4..91617b79d96fdce70f7d52537d30d811ebb31af0 100644 (file)
--- a/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BiosBlkIo.h
+++ b/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BiosBlkIo.h
@@ -1,6 +1,6 @@
 /** @file\r
 \r
-Copyright (c) 1999 - 2010, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 1999 - 2011, Intel Corporation. All rights reserved.<BR>\r
 \r
 This program and the accompanying materials\r
 are licensed and made available under the terms and conditions\r
@@ -23,6 +23,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Protocol/LegacyBios.h>\r
 #include <Protocol/DevicePath.h>\r
 #include <Guid/LegacyBios.h>\r
+#include <Guid/BlockIoVendor.h>\r
 \r
 #include <Library/UefiDriverEntryPoint.h>\r
 #include <Library/DebugLib.h>\r
@@ -36,14 +37,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 #include "Edd.h"\r
 \r
-#define UNKNOWN_DEVICE_GUID \\r
-  { 0xcf31fac5, 0xc24e, 0x11d2,  {0x85, 0xf3, 0x0, 0xa0, 0xc9, 0x3e, 0xc9, 0x3b}  }\r
-\r
-typedef struct {\r
-  VENDOR_DEVICE_PATH              DevicePath;\r
-  UINT8                           LegacyDriveLetter;\r
-} UNKNOWN_DEVICE_VENDOR_DEVICE_PATH;\r
-\r
 //\r
 // Global Variables\r
 //\r

diff --git a/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BlockIoDxe.inf b/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BlockIoDxe.inf
index 3fcaa2723ccc7b6fa7683980eba47c2addc2ced5..0e02f7eb274a3429588f30e7a58f9ed4d48fe176 100644 (file)
--- a/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BlockIoDxe.inf
+++ b/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BlockIoDxe.inf
@@ -49,7 +49,7 @@
 \r
 [Guids]\r
   gEfiLegacyBiosGuid\r
-\r
+  gBlockIoVendorGuid\r
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r

diff --git a/IntelFrameworkModulePkg/Include/Guid/BdsHii.h b/IntelFrameworkModulePkg/Include/Guid/BdsHii.h
new file mode 100644 (file)
index 0000000..e22babc
--- /dev/null
+++ b/IntelFrameworkModulePkg/Include/Guid/BdsHii.h
@@ -0,0 +1,55 @@
+/** @file\r
+  GUIDs used as HII FormSet and HII Package list GUID in BdsDxe driver.\r
+  \r
+Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under \r
+the terms and conditions of the BSD License that accompanies this distribution.  \r
+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 __BDS_HII_GUIDS_H__\r
+#define __BDS_HII_GUIDS_H__\r
+\r
+#define FRONT_PAGE_FORMSET_GUID \\r
+  { \\r
+    0x9e0c30bc, 0x3f06, 0x4ba6, {0x82, 0x88, 0x9, 0x17, 0x9b, 0x85, 0x5d, 0xbe} \\r
+  }\r
+\r
+#define BOOT_MANAGER_FORMSET_GUID \\r
+  { \\r
+  0x847bc3fe, 0xb974, 0x446d, {0x94, 0x49, 0x5a, 0xd5, 0x41, 0x2e, 0x99, 0x3b} \\r
+  }\r
+\r
+#define DEVICE_MANAGER_FORMSET_GUID  \\r
+  { \\r
+  0x3ebfa8e6, 0x511d, 0x4b5b, {0xa9, 0x5f, 0xfb, 0x38, 0x26, 0xf, 0x1c, 0x27} \\r
+  }\r
+\r
+#define DRIVER_HEALTH_FORMSET_GUID  \\r
+  { \\r
+  0xf76e0a70, 0xb5ed, 0x4c38, {0xac, 0x9a, 0xe5, 0xf5, 0x4b, 0xf1, 0x6e, 0x34} \\r
+  }\r
+\r
+#define BOOT_MAINT_FORMSET_GUID \\r
+  { \\r
+  0x642237c7, 0x35d4, 0x472d, {0x83, 0x65, 0x12, 0xe0, 0xcc, 0xf2, 0x7a, 0x22} \\r
+  }\r
+\r
+#define FILE_EXPLORE_FORMSET_GUID \\r
+  { \\r
+  0x1f2d63e1, 0xfebd, 0x4dc7, {0x9c, 0xc5, 0xba, 0x2b, 0x1c, 0xef, 0x9c, 0x5b} \\r
+  }\r
+\r
+extern EFI_GUID gFrontPageFormSetGuid;\r
+extern EFI_GUID gBootMaintFormSetGuid;\r
+extern EFI_GUID gFileExploreFormSetGuid;\r
+extern EFI_GUID gBootManagerFormSetGuid;\r
+extern EFI_GUID gDeviceManagerFormSetGuid;\r
+extern EFI_GUID gDriverHealthFormSetGuid;\r
+\r
+#endif\r

diff --git a/IntelFrameworkModulePkg/Include/Guid/BdsLibHii.h b/IntelFrameworkModulePkg/Include/Guid/BdsLibHii.h
new file mode 100644 (file)
index 0000000..1a2bb02
--- /dev/null
+++ b/IntelFrameworkModulePkg/Include/Guid/BdsLibHii.h
@@ -0,0 +1,25 @@
+/** @file\r
+  GUID used as HII Package list GUID in GenericBdsLib module.\r
+  \r
+Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under \r
+the terms and conditions of the BSD License that accompanies this distribution.  \r
+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 __BDS_LIB_HII_GUID_H__\r
+#define __BDS_LIB_HII_GUID_H__\r
+\r
+#define BDS_LIB_STRING_PACKAGE_GUID \\r
+  { \\r
+  0x3b4d9b23, 0x95ac, 0x44f6, { 0x9f, 0xcd, 0xe, 0x95, 0x94, 0x58, 0x6c, 0x72 } \\r
+  }\r
+\r
+extern EFI_GUID gBdsLibStringPackageGuid;\r
+\r
+#endif\r

diff --git a/IntelFrameworkModulePkg/Include/Guid/BlockIoVendor.h b/IntelFrameworkModulePkg/Include/Guid/BlockIoVendor.h
new file mode 100644 (file)
index 0000000..71aa05a
--- /dev/null
+++ b/IntelFrameworkModulePkg/Include/Guid/BlockIoVendor.h
@@ -0,0 +1,31 @@
+/** @file\r
+  Guid for unrecognized EDD 3.0 device.\r
+\r
+Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under \r
+the terms and conditions of the BSD License that accompanies this distribution.  \r
+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 __BLOCKIO_VENDOR_H__\r
+#define __BLOCKIO_VENDOR_H__\r
+\r
+//\r
+// Guid is to specifiy the unrecognized EDD 3.0 device.\r
+//\r
+#define BLOCKIO_VENDOR_GUID \\r
+  { 0xcf31fac5, 0xc24e, 0x11d2,  {0x85, 0xf3, 0x0, 0xa0, 0xc9, 0x3e, 0xc9, 0x3b}  }\r
+\r
+typedef struct {\r
+  VENDOR_DEVICE_PATH              DevicePath;\r
+  UINT8                           LegacyDriveLetter;\r
+} BLOCKIO_VENDOR_DEVICE_PATH;\r
+\r
+extern GUID gBlockIoVendorGuid;\r
+\r
+#endif\r

diff --git a/IntelFrameworkModulePkg/Include/Guid/CapsuleDataFile.h b/IntelFrameworkModulePkg/Include/Guid/CapsuleDataFile.h
new file mode 100644 (file)
index 0000000..7e97d17
--- /dev/null
+++ b/IntelFrameworkModulePkg/Include/Guid/CapsuleDataFile.h
@@ -0,0 +1,23 @@
+/** @file\r
+  GUID to specify which FFS file to store the updated capsule data.\r
+\r
+Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under \r
+the terms and conditions of the BSD License that accompanies this distribution.  \r
+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 __UPDATE_DATA_FILE_GUID_H__\r
+#define __UPDATE_DATA_FILE_GUID_H__\r
+\r
+#define EFI_UPDATE_DATA_FILE_GUID \\r
+ { 0x283fa2ee, 0x532c, 0x484d, { 0x93, 0x83, 0x9f, 0x93, 0xb3, 0x6f, 0xb, 0x7e } }\r
+\r
+extern GUID gEfiUpdateDataFileGuid;\r
+\r
+#endif\r

diff --git a/IntelFrameworkModulePkg/Include/Guid/HdBootVariable.h b/IntelFrameworkModulePkg/Include/Guid/HdBootVariable.h
new file mode 100644 (file)
index 0000000..fae0839
--- /dev/null
+++ b/IntelFrameworkModulePkg/Include/Guid/HdBootVariable.h
@@ -0,0 +1,31 @@
+/** @file\r
+  GUID used as EFI Variable for the device path of Boot file on HardDevice.\r
+  \r
+Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under \r
+the terms and conditions of the BSD License that accompanies this distribution.  \r
+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 __HD_DEVICE_PATH_VARIABLE_GUID_H__\r
+#define __HD_DEVICE_PATH_VARIABLE_GUID_H__\r
+\r
+///\r
+/// This GUID is used for an EFI Variable that stores the front device pathes\r
+/// for a partial device path that starts with the HD node.\r
+///\r
+#define HD_BOOT_DEVICE_PATH_VARIABLE_GUID \\r
+  { \\r
+  0xfab7e9e1, 0x39dd, 0x4f2b, { 0x84, 0x8, 0xe2, 0xe, 0x90, 0x6c, 0xb6, 0xde } \\r
+  }\r
+\r
+#define HD_BOOT_DEVICE_PATH_VARIABLE_NAME L"HDDP"\r
+\r
+extern EFI_GUID gHdBootDevicePathVariablGuid;\r
+\r
+#endif\r

diff --git a/IntelFrameworkModulePkg/Include/Guid/LastEnumLang.h b/IntelFrameworkModulePkg/Include/Guid/LastEnumLang.h
new file mode 100644 (file)
index 0000000..8d9e37f
--- /dev/null
+++ b/IntelFrameworkModulePkg/Include/Guid/LastEnumLang.h
@@ -0,0 +1,31 @@
+/** @file\r
+  GUID used as EFI variable to store platform language at last time enumeration.\r
+  \r
+Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under \r
+the terms and conditions of the BSD License that accompanies this distribution.  \r
+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 __LAST_ENUM_LANGUAGE_GUID_H__\r
+#define __LAST_ENUM_LANGUAGE_GUID_H__\r
+\r
+///\r
+/// This GUID is used for Set/Get platform language into/from variable at last time enumeration \r
+/// to ensure the enumeration will only execute once.\r
+///\r
+#define LAST_ENUM_LANGUAGE_GUID \\r
+  { \\r
+  0xe8c545b, 0xa2ee, 0x470d, { 0x8e, 0x26, 0xbd, 0xa1, 0xa1, 0x3c, 0xa, 0xa3 } \\r
+  }\r
+\r
+#define LAST_ENUM_LANGUAGE_VARIABLE_NAME L"LastEnumLang"\r
+\r
+extern EFI_GUID gLastEnumLangGuid;\r
+\r
+#endif\r

diff --git a/IntelFrameworkModulePkg/Include/Guid/LegacyDevOrder.h b/IntelFrameworkModulePkg/Include/Guid/LegacyDevOrder.h
new file mode 100644 (file)
index 0000000..684f098
--- /dev/null
+++ b/IntelFrameworkModulePkg/Include/Guid/LegacyDevOrder.h
@@ -0,0 +1,45 @@
+/** @file\r
+  Guid of a NV Variable which store the information about the\r
+  FD/HD/CD/NET/BEV order.\r
+\r
+Copyright (c) 2011, Intel Corporation. All rights reserved.<BR>\r
+This program and the accompanying materials are licensed and made available under \r
+the terms and conditions of the BSD License that accompanies this distribution.  \r
+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 __LEGACY_DEV_ORDER_VARIABLE_GUID_H__\r
+#define __LEGACY_DEV_ORDER_VARIABLE_GUID_H__\r
+\r
+///\r
+/// Name and Guid of a NV Variable which stores the information about the\r
+/// FD/HD/CD/NET/BEV order\r
+///\r
+#define EFI_LEGACY_DEV_ORDER_VARIABLE_GUID \\r
+  { \\r
+  0xa56074db, 0x65fe, 0x45f7, {0xbd, 0x21, 0x2d, 0x2b, 0xdd, 0x8e, 0x96, 0x52} \\r
+  }\r
+\r
+typedef UINT8 BBS_TYPE;\r
+\r
+#pragma pack(1)\r
+typedef struct {\r
+  BBS_TYPE  BbsType;\r
+  ///\r
+  /// Length = sizeof (UINT16) + sizeof (Data)\r
+  ///\r
+  UINT16    Length;\r
+  UINT16    Data[1];\r
+} LEGACY_DEV_ORDER_ENTRY;\r
+#pragma pack()\r
+\r
+#define VAR_LEGACY_DEV_ORDER L"LegacyDevOrder"\r
+\r
+extern EFI_GUID gEfiLegacyDevOrderVariableGuid;\r
+\r
+#endif\r

diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
index 316b1f9039a93595b2fdaa8b3add33997603c862..d7f91d0b34d3db5038ee300af382f071f5951c09 100644 (file)
--- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
+++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
@@ -52,6 +52,32 @@
 \r
   ## Include/Guid/LegacyBios.h\r
   gEfiLegacyBiosGuid                 = { 0x2E3044AC, 0x879F, 0x490F, { 0x97, 0x60, 0xBB, 0xDF, 0xAF, 0x69, 0x5F, 0x50 }}\r
+  \r
+  ## Include/Guid/LegacyDevOrder.h\r
+  gEfiLegacyDevOrderVariableGuid     = { 0xa56074db, 0x65fe, 0x45f7, {0xbd, 0x21, 0x2d, 0x2b, 0xdd, 0x8e, 0x96, 0x52 }}\r
+\r
+  ## Include/Guid/CapsuleDataFile.h\r
+  gEfiUpdateDataFileGuid             = { 0x283fa2ee, 0x532c, 0x484d, { 0x93, 0x83, 0x9f, 0x93, 0xb3, 0x6f, 0xb, 0x7e }}\r
+  \r
+  ## Include/Guid/BlockIoVendor.h\r
+  gBlockIoVendorGuid                 = { 0xcf31fac5, 0xc24e, 0x11d2,  {0x85, 0xf3, 0x0, 0xa0, 0xc9, 0x3e, 0xc9, 0x3b }}\r
+  \r
+  ## Include/Guid/BdsHii.h\r
+  gFrontPageFormSetGuid              = { 0x9e0c30bc, 0x3f06, 0x4ba6, {0x82, 0x88, 0x9, 0x17, 0x9b, 0x85, 0x5d, 0xbe }}\r
+  gBootManagerFormSetGuid            = { 0x847bc3fe, 0xb974, 0x446d, {0x94, 0x49, 0x5a, 0xd5, 0x41, 0x2e, 0x99, 0x3b }}\r
+  gDeviceManagerFormSetGuid          = { 0x3ebfa8e6, 0x511d, 0x4b5b, {0xa9, 0x5f, 0xfb, 0x38, 0x26, 0xf, 0x1c, 0x27 }}\r
+  gDriverHealthFormSetGuid           = { 0xf76e0a70, 0xb5ed, 0x4c38, {0xac, 0x9a, 0xe5, 0xf5, 0x4b, 0xf1, 0x6e, 0x34 }}\r
+  gBootMaintFormSetGuid              = { 0x642237c7, 0x35d4, 0x472d, {0x83, 0x65, 0x12, 0xe0, 0xcc, 0xf2, 0x7a, 0x22 }}\r
+  gFileExploreFormSetGuid            = { 0x1f2d63e1, 0xfebd, 0x4dc7, {0x9c, 0xc5, 0xba, 0x2b, 0x1c, 0xef, 0x9c, 0x5b }}\r
+  \r
+  ## Include/Guid/BdsLibHii.h\r
+  gBdsLibStringPackageGuid           = { 0x3b4d9b23, 0x95ac, 0x44f6, {0x9f, 0xcd, 0xe, 0x95, 0x94, 0x58, 0x6c, 0x72 }}\r
+  \r
+  ## Include/Guid/LastEnumLang.h\r
+  gLastEnumLangGuid                  = { 0xe8c545b, 0xa2ee, 0x470d, {0x8e, 0x26, 0xbd, 0xa1, 0xa1, 0x3c, 0xa, 0xa3 }}\r
+\r
+  ## Include/Guid/HdBootVariable.h\r
+  gHdBootDevicePathVariablGuid       = { 0xfab7e9e1, 0x39dd, 0x4f2b, {0x84, 0x8, 0xe2, 0xe, 0x90, 0x6c, 0xb6, 0xde }}\r
 \r
 [Protocols]\r
   ## Vga Mini port binding for a VGA controller\r

diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
index 58f058df805d3af53161661f9c8bb5df0d04ff90..372cab59721d1dedbc94f454b6531ef2ec2585ff 100644 (file)
--- a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
+++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c
@@ -18,23 +18,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 BOOLEAN mEnumBootDevice = FALSE;\r
 EFI_HII_HANDLE gBdsLibStringPackHandle = NULL;\r
 \r
-///\r
-/// This GUID is used for an EFI Variable that stores the front device pathes\r
-/// for a partial device path that starts with the HD node.\r
-///\r
-EFI_GUID  mHdBootVariablePrivateGuid = { 0xfab7e9e1, 0x39dd, 0x4f2b, { 0x84, 0x8, 0xe2, 0xe, 0x90, 0x6c, 0xb6, 0xde } };\r
-\r
-///\r
-/// This GUID is used for register UNI string.\r
-///\r
-EFI_GUID mBdsLibStringPackGuid = {  0x3b4d9b23, 0x95ac, 0x44f6, { 0x9f, 0xcd, 0xe, 0x95, 0x94, 0x58, 0x6c, 0x72 } };\r
-\r
-///\r
-/// This GUID is used for Set/Get platform language into/from variable at last time enumeration to ensure the enumeration will\r
-/// only execute once.\r
-///\r
-EFI_GUID mBdsLibLastLangGuid = { 0xe8c545b, 0xa2ee, 0x470d, { 0x8e, 0x26, 0xbd, 0xa1, 0xa1, 0x3c, 0xa, 0xa3 } };\r
-\r
 /**\r
   The constructor function register UNI strings into imageHandle.\r
   \r
@@ -56,7 +39,7 @@ GenericBdsLibConstructor (
 {\r
 \r
   gBdsLibStringPackHandle = HiiAddPackages (\r
-                              &mBdsLibStringPackGuid,\r
+                              &gBdsLibStringPackageGuid,\r
                               &ImageHandle,\r
                               GenericBdsLibStrings,\r
                               NULL\r
@@ -906,13 +889,13 @@ BdsExpandPartitionPartialDevicePathToFull (
 \r
   FullDevicePath = NULL;\r
   //\r
-  // Check if there is prestore 'HDDP' variable.\r
+  // Check if there is prestore HD_BOOT_DEVICE_PATH_VARIABLE_NAME variable.\r
   // If exist, search the front path which point to partition node in the variable instants.\r
-  // If fail to find or 'HDDP' not exist, reconnect all and search in all system\r
+  // If fail to find or HD_BOOT_DEVICE_PATH_VARIABLE_NAME not exist, reconnect all and search in all system\r
   //\r
   CachedDevicePath = BdsLibGetVariableAndSize (\r
-                      L"HDDP",\r
-                      &mHdBootVariablePrivateGuid,\r
+                      HD_BOOT_DEVICE_PATH_VARIABLE_NAME,\r
+                      &gHdBootDevicePathVariablGuid,\r
                       &CachedDevicePathSize\r
                       );\r
 \r
@@ -954,7 +937,7 @@ BdsExpandPartitionPartialDevicePathToFull (
       FullDevicePath = AppendDevicePath (Instance, DevicePath);\r
 \r
       //\r
-      // Adjust the 'HDDP' instances sequence if the matched one is not first one.\r
+      // Adjust the HD_BOOT_DEVICE_PATH_VARIABLE_NAME instances sequence if the matched one is not first one.\r
       //\r
       if (NeedAdjust) {\r
         //\r
@@ -974,8 +957,8 @@ BdsExpandPartitionPartialDevicePathToFull (
         // Save the matching Device Path so we don't need to do a connect all next time\r
         //\r
         Status = gRT->SetVariable (\r
-                        L"HDDP",\r
-                        &mHdBootVariablePrivateGuid,\r
+                        HD_BOOT_DEVICE_PATH_VARIABLE_NAME,\r
+                        &gHdBootDevicePathVariablGuid,\r
                         EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,\r
                         GetDevicePathSize (CachedDevicePath),\r
                         CachedDevicePath\r
@@ -989,7 +972,7 @@ BdsExpandPartitionPartialDevicePathToFull (
   }\r
 \r
   //\r
-  // If we get here we fail to find or 'HDDP' not exist, and now we need\r
+  // If we get here we fail to find or HD_BOOT_DEVICE_PATH_VARIABLE_NAME not exist, and now we need\r
   // to search all devices in the system for a matched partition\r
   //\r
   BdsLibConnectAllDriversToAllControllers ();\r
@@ -1019,11 +1002,11 @@ BdsExpandPartitionPartialDevicePathToFull (
       FullDevicePath = AppendDevicePath (BlockIoDevicePath, DevicePath);\r
 \r
       //\r
-      // Save the matched partition device path in 'HDDP' variable\r
+      // Save the matched partition device path in HD_BOOT_DEVICE_PATH_VARIABLE_NAME variable\r
       //\r
       if (CachedDevicePath != NULL) {\r
         //\r
-        // Save the matched partition device path as first instance of 'HDDP' variable\r
+        // Save the matched partition device path as first instance of HD_BOOT_DEVICE_PATH_VARIABLE_NAME variable\r
         //\r
         if (BdsLibMatchDevicePaths (CachedDevicePath, BlockIoDevicePath)) {\r
           TempNewDevicePath = CachedDevicePath;\r
@@ -1042,7 +1025,8 @@ BdsExpandPartitionPartialDevicePathToFull (
         }\r
         //\r
         // Here limit the device path instance number to 12, which is max number for a system support 3 IDE controller\r
-        // If the user try to boot many OS in different HDs or partitions, in theory, the 'HDDP' variable maybe become larger and larger.\r
+        // If the user try to boot many OS in different HDs or partitions, in theory, \r
+        // the HD_BOOT_DEVICE_PATH_VARIABLE_NAME variable maybe become larger and larger.\r
         //\r
         InstanceNum = 0;\r
         ASSERT (CachedDevicePath != NULL);\r
@@ -1072,8 +1056,8 @@ BdsExpandPartitionPartialDevicePathToFull (
       // Save the matching Device Path so we don't need to do a connect all next time\r
       //\r
       Status = gRT->SetVariable (\r
-                      L"HDDP",\r
-                      &mHdBootVariablePrivateGuid,\r
+                      HD_BOOT_DEVICE_PATH_VARIABLE_NAME,\r
+                      &gHdBootDevicePathVariablGuid,\r
                       EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,\r
                       GetDevicePathSize (CachedDevicePath),\r
                       CachedDevicePath\r
@@ -1495,7 +1479,7 @@ BdsLibEnumerateAllBootOption (
   // device from the boot order variable\r
   //\r
   if (mEnumBootDevice) {\r
-    LastLang = GetVariable (L"LastEnumLang", &mBdsLibLastLangGuid);\r
+    LastLang = GetVariable (LAST_ENUM_LANGUAGE_VARIABLE_NAME, &gLastEnumLangGuid);\r
     PlatLang = GetEfiGlobalVariable (L"PlatformLang");\r
     ASSERT (PlatLang != NULL);\r
     if ((LastLang != NULL) && (AsciiStrCmp (LastLang, PlatLang) == 0)) {\r
@@ -1505,8 +1489,8 @@ BdsLibEnumerateAllBootOption (
       return Status;\r
     } else {\r
       Status = gRT->SetVariable (\r
-        L"LastEnumLang",\r
-        &mBdsLibLastLangGuid,\r
+        LAST_ENUM_LANGUAGE_VARIABLE_NAME,\r
+        &gLastEnumLangGuid,\r
         EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_NON_VOLATILE,\r
         AsciiStrSize (PlatLang),\r
         PlatLang\r

diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf b/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
index e460f70a8049dfc82fa547366b78e84fa1dff69d..3557444b93696d94dd3ee7d9406ce99883f257cd 100644 (file)
--- a/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
+++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf
@@ -89,6 +89,9 @@
   gPerformanceProtocolGuid                      ## SOMETIMES_PRODUCES ## Variable:L"PerfDataMemAddr" (The ACPI address of performance data)\r
   gEfiUartDevicePathGuid                        ## CONSUMES ## GUID (Identify the device path for UARD device)\r
   gEfiSasDevicePathGuid                         ## CONSUMES ## GUID (Identify the device path for SAS device)\r
+  gLastEnumLangGuid                             ## SOMETIMES_PRODUCES ## Variable:L"LastEnumLang" (Platform language at last time enumeration.)\r
+  gHdBootDevicePathVariablGuid                  ## SOMETIMES_PRODUCES ## Variable:L"HDDP" (The device path of Boot file on Hard device.)\r
+  gBdsLibStringPackageGuid                      ## PRODUCES ## GUID (HII String PackageList Guid)\r
 \r
 [Protocols]\r
   gEfiSimpleFileSystemProtocolGuid              # PROTOCOL CONSUMES\r

diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/InternalBdsLib.h b/IntelFrameworkModulePkg/Library/GenericBdsLib/InternalBdsLib.h
index 82cfe75f225715d4b060900a630aff974d9e8ce7..c674683dc88a89293651e4fa561323d6970e8471 100644 (file)
--- a/IntelFrameworkModulePkg/Library/GenericBdsLib/InternalBdsLib.h
+++ b/IntelFrameworkModulePkg/Library/GenericBdsLib/InternalBdsLib.h
@@ -47,6 +47,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Guid/GlobalVariable.h>\r
 #include <Guid/PcAnsi.h>\r
 #include <Guid/Performance.h>\r
+#include <Guid/BdsLibHii.h>\r
+#include <Guid/HdBootVariable.h>\r
+#include <Guid/LastEnumLang.h>\r
 \r
 #include <Library/PrintLib.h>\r
 #include <Library/DebugLib.h>\r

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/Bds.h b/IntelFrameworkModulePkg/Universal/BdsDxe/Bds.h
index bbb5332456f6bb61b14aa3a2f727ba7f8f9530c3..1f2d64d2cf63c7a9e0960e7b297fa8d233d67464 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/Bds.h
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/Bds.h
@@ -1,7 +1,7 @@
 /** @file\r
   Head file for BDS Architectural Protocol implementation\r
 \r
-Copyright (c) 2004 - 2009, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 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/GlobalVariable.h>\r
 #include <Guid/CapsuleVendor.h>\r
 #include <Guid/StatusCodeDataTypeId.h>\r
+#include <Guid/LegacyDevOrder.h>\r
+#include <Guid/BdsHii.h>\r
 #include <Protocol/GenericMemoryTest.h>\r
 #include <Protocol/FormBrowser2.h>\r
 #include <Protocol/HiiConfigAccess.h>\r

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf b/IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf
index 852946193c2ce4ecd564c1e6a844eea75b156368..916d2af454c6f4c542c317d0ebe61538dd89c4cc 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf
@@ -134,7 +134,14 @@
   gEfiHiiPlatformSetupFormsetGuid               ## CONSUMES ## GUID (Indicate the formset class guid to be displayed)\r
   gEfiIfrTianoGuid                              ## CONSUMES ## GUID (Extended IFR Guid Opcode)\r
   gEfiHiiDriverHealthFormsetGuid                ## CONSUMES ## GUID (Indicate the Driver Health formset class guid to be displayed)\r
-  \r
+  gEfiLegacyDevOrderVariableGuid                ## SOMETIMES_PRODUCES ## Variable:L"LegacyDevOrder"\r
+  gFrontPageFormSetGuid                         ## PRODUCES           ## FrontPage HII Package\r
+  gBootMaintFormSetGuid                         ## SOMETIMES_PRODUCES ## BootMaint HII Package\r
+  gFileExploreFormSetGuid                       ## SOMETIMES_PRODUCES ## FileExplore HII Package\r
+  gBootManagerFormSetGuid                       ## SOMETIMES_PRODUCES ## BootManager HII Package\r
+  gDeviceManagerFormSetGuid                     ## SOMETIMES_PRODUCES ## DeviceManager HII Package\r
+  gDriverHealthFormSetGuid                      ## SOMETIMES_PRODUCES ## DriverHealth HII Package\r
+\r
 [Protocols]\r
   gEfiSimpleFileSystemProtocolGuid              ## PROTOCOL CONSUMES\r
   gEfiLoadFileProtocolGuid                      ## PROTOCOL CONSUMES\r

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.c
index 24b7c1364a2645bbf10ed5c47579ba70a78d5759..a4b6b53a06e4689d810aa723900d368965db8efb 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.c
@@ -1046,7 +1046,7 @@ BdsFillDevOrderBuf (
   @param BbsCount        The BBS Count.\r
 \r
   @retval EFI_SUCCES             The buffer is created and the EFI variable named \r
-                                 VAR_LEGACY_DEV_ORDER and EfiLegacyDevOrderGuid is\r
+                                 VAR_LEGACY_DEV_ORDER and gEfiLegacyDevOrderVariableGuid is\r
                                  set correctly.\r
   @retval EFI_OUT_OF_RESOURCES   Memmory or storage is not enough.\r
   @retval EFI_DEVICE_ERROR       Fail to add the device order into EFI variable fail\r
@@ -1066,8 +1066,8 @@ BdsCreateDevOrder (
   UINTN                       BEVCount;\r
   UINTN                       TotalSize;\r
   UINTN                       HeaderSize;\r
-  BM_LEGACY_DEV_ORDER_CONTEXT *DevOrder;\r
-  BM_LEGACY_DEV_ORDER_CONTEXT *DevOrderPtr;\r
+  LEGACY_DEV_ORDER_ENTRY      *DevOrder;\r
+  LEGACY_DEV_ORDER_ENTRY      *DevOrderPtr;\r
   EFI_STATUS                  Status;\r
 \r
   FDCount     = 0;\r
@@ -1131,23 +1131,23 @@ BdsCreateDevOrder (
 \r
   DevOrderPtr->BbsType = BBS_FLOPPY;\r
   DevOrderPtr->Length  = (UINT16) (sizeof (DevOrderPtr->Length) + FDCount * sizeof (UINT16));\r
-  DevOrderPtr          = (BM_LEGACY_DEV_ORDER_CONTEXT *) BdsFillDevOrderBuf (BbsTable, BBS_FLOPPY, BbsCount, DevOrderPtr->Data);\r
+  DevOrderPtr          = (LEGACY_DEV_ORDER_ENTRY *) BdsFillDevOrderBuf (BbsTable, BBS_FLOPPY, BbsCount, DevOrderPtr->Data);\r
 \r
   DevOrderPtr->BbsType = BBS_HARDDISK;\r
   DevOrderPtr->Length  = (UINT16) (sizeof (UINT16) + HDCount * sizeof (UINT16));\r
-  DevOrderPtr          = (BM_LEGACY_DEV_ORDER_CONTEXT *) BdsFillDevOrderBuf (BbsTable, BBS_HARDDISK, BbsCount, DevOrderPtr->Data);\r
+  DevOrderPtr          = (LEGACY_DEV_ORDER_ENTRY *) BdsFillDevOrderBuf (BbsTable, BBS_HARDDISK, BbsCount, DevOrderPtr->Data);\r
   \r
   DevOrderPtr->BbsType = BBS_CDROM;\r
   DevOrderPtr->Length  = (UINT16) (sizeof (UINT16) + CDCount * sizeof (UINT16));\r
-  DevOrderPtr          = (BM_LEGACY_DEV_ORDER_CONTEXT *) BdsFillDevOrderBuf (BbsTable, BBS_CDROM, BbsCount, DevOrderPtr->Data);\r
+  DevOrderPtr          = (LEGACY_DEV_ORDER_ENTRY *) BdsFillDevOrderBuf (BbsTable, BBS_CDROM, BbsCount, DevOrderPtr->Data);\r
   \r
   DevOrderPtr->BbsType = BBS_EMBED_NETWORK;\r
   DevOrderPtr->Length  = (UINT16) (sizeof (UINT16) + NETCount * sizeof (UINT16));\r
-  DevOrderPtr          = (BM_LEGACY_DEV_ORDER_CONTEXT *) BdsFillDevOrderBuf (BbsTable, BBS_EMBED_NETWORK, BbsCount, DevOrderPtr->Data);\r
+  DevOrderPtr          = (LEGACY_DEV_ORDER_ENTRY *) BdsFillDevOrderBuf (BbsTable, BBS_EMBED_NETWORK, BbsCount, DevOrderPtr->Data);\r
 \r
   DevOrderPtr->BbsType = BBS_BEV_DEVICE;\r
   DevOrderPtr->Length  = (UINT16) (sizeof (UINT16) + BEVCount * sizeof (UINT16));\r
-  DevOrderPtr          = (BM_LEGACY_DEV_ORDER_CONTEXT *) BdsFillDevOrderBuf (BbsTable, BBS_BEV_DEVICE, BbsCount, DevOrderPtr->Data);\r
+  DevOrderPtr          = (LEGACY_DEV_ORDER_ENTRY *) BdsFillDevOrderBuf (BbsTable, BBS_BEV_DEVICE, BbsCount, DevOrderPtr->Data);\r
 \r
   ASSERT (TotalSize == (UINTN) ((UINT8 *) DevOrderPtr - (UINT8 *) DevOrder));\r
 \r
@@ -1156,7 +1156,7 @@ BdsCreateDevOrder (
   //\r
   Status = gRT->SetVariable (\r
                   VAR_LEGACY_DEV_ORDER,\r
-                  &EfiLegacyDevOrderGuid,\r
+                  &gEfiLegacyDevOrderVariableGuid,\r
                   VAR_FLAG,\r
                   TotalSize,\r
                   DevOrder\r
@@ -1182,10 +1182,10 @@ BdsUpdateLegacyDevOrder (
   VOID\r
   )\r
 {\r
-  BM_LEGACY_DEV_ORDER_CONTEXT *DevOrder;\r
-  BM_LEGACY_DEV_ORDER_CONTEXT *NewDevOrder;\r
-  BM_LEGACY_DEV_ORDER_CONTEXT *Ptr;\r
-  BM_LEGACY_DEV_ORDER_CONTEXT *NewPtr;\r
+  LEGACY_DEV_ORDER_ENTRY      *DevOrder;\r
+  LEGACY_DEV_ORDER_ENTRY      *NewDevOrder;\r
+  LEGACY_DEV_ORDER_ENTRY      *Ptr;\r
+  LEGACY_DEV_ORDER_ENTRY      *NewPtr;\r
   UINTN                       DevOrderSize;\r
   EFI_LEGACY_BIOS_PROTOCOL    *LegacyBios;\r
   EFI_STATUS                  Status;\r
@@ -1248,7 +1248,7 @@ BdsUpdateLegacyDevOrder (
 \r
   DevOrder = BdsLibGetVariableAndSize (\r
                VAR_LEGACY_DEV_ORDER,\r
-               &EfiLegacyDevOrderGuid,\r
+               &gEfiLegacyDevOrderVariableGuid,\r
                &DevOrderSize\r
                );\r
   if (NULL == DevOrder) {\r
@@ -1326,8 +1326,8 @@ BdsUpdateLegacyDevOrder (
   //\r
   // copy HD\r
   //\r
-  Ptr             = (BM_LEGACY_DEV_ORDER_CONTEXT *) (&Ptr->Data[Ptr->Length / sizeof (UINT16) - 1]);\r
-  NewPtr          = (BM_LEGACY_DEV_ORDER_CONTEXT *) (&NewPtr->Data[NewPtr->Length / sizeof (UINT16) -1]);\r
+  Ptr             = (LEGACY_DEV_ORDER_ENTRY *) (&Ptr->Data[Ptr->Length / sizeof (UINT16) - 1]);\r
+  NewPtr          = (LEGACY_DEV_ORDER_ENTRY *) (&NewPtr->Data[NewPtr->Length / sizeof (UINT16) -1]);\r
   NewPtr->BbsType = Ptr->BbsType;\r
   NewPtr->Length  = (UINT16) (sizeof (UINT16) + HDCount * sizeof (UINT16));\r
   for (Index = 0; Index < Ptr->Length / sizeof (UINT16) - 1; Index++) {\r
@@ -1347,8 +1347,8 @@ BdsUpdateLegacyDevOrder (
   //\r
   // copy CD\r
   //\r
-  Ptr    = (BM_LEGACY_DEV_ORDER_CONTEXT *) (&Ptr->Data[Ptr->Length / sizeof (UINT16) - 1]);\r
-  NewPtr = (BM_LEGACY_DEV_ORDER_CONTEXT *) (&NewPtr->Data[NewPtr->Length / sizeof (UINT16) -1]);\r
+  Ptr    = (LEGACY_DEV_ORDER_ENTRY *) (&Ptr->Data[Ptr->Length / sizeof (UINT16) - 1]);\r
+  NewPtr = (LEGACY_DEV_ORDER_ENTRY *) (&NewPtr->Data[NewPtr->Length / sizeof (UINT16) -1]);\r
   NewPtr->BbsType = Ptr->BbsType;\r
   NewPtr->Length  = (UINT16) (sizeof (UINT16) + CDCount * sizeof (UINT16));\r
   for (Index = 0; Index < Ptr->Length / sizeof (UINT16) - 1; Index++) {\r
@@ -1368,8 +1368,8 @@ BdsUpdateLegacyDevOrder (
   //\r
   // copy NET\r
   //\r
-  Ptr    = (BM_LEGACY_DEV_ORDER_CONTEXT *) (&Ptr->Data[Ptr->Length / sizeof (UINT16) - 1]);\r
-  NewPtr = (BM_LEGACY_DEV_ORDER_CONTEXT *) (&NewPtr->Data[NewPtr->Length / sizeof (UINT16) -1]);\r
+  Ptr    = (LEGACY_DEV_ORDER_ENTRY *) (&Ptr->Data[Ptr->Length / sizeof (UINT16) - 1]);\r
+  NewPtr = (LEGACY_DEV_ORDER_ENTRY *) (&NewPtr->Data[NewPtr->Length / sizeof (UINT16) -1]);\r
   NewPtr->BbsType = Ptr->BbsType;\r
   NewPtr->Length  = (UINT16) (sizeof (UINT16) + NETCount * sizeof (UINT16));\r
   for (Index = 0; Index < Ptr->Length / sizeof (UINT16) - 1; Index++) {\r
@@ -1389,8 +1389,8 @@ BdsUpdateLegacyDevOrder (
   //\r
   // copy BEV\r
   //\r
-  Ptr    = (BM_LEGACY_DEV_ORDER_CONTEXT *) (&Ptr->Data[Ptr->Length / sizeof (UINT16) - 1]);\r
-  NewPtr = (BM_LEGACY_DEV_ORDER_CONTEXT *) (&NewPtr->Data[NewPtr->Length / sizeof (UINT16) -1]);\r
+  Ptr    = (LEGACY_DEV_ORDER_ENTRY *) (&Ptr->Data[Ptr->Length / sizeof (UINT16) - 1]);\r
+  NewPtr = (LEGACY_DEV_ORDER_ENTRY *) (&NewPtr->Data[NewPtr->Length / sizeof (UINT16) -1]);\r
   NewPtr->BbsType = Ptr->BbsType;\r
   NewPtr->Length  = (UINT16) (sizeof (UINT16) + BEVCount * sizeof (UINT16));\r
   for (Index = 0; Index < Ptr->Length / sizeof (UINT16) - 1; Index++) {\r
@@ -1477,7 +1477,7 @@ BdsUpdateLegacyDevOrder (
 \r
   Status = gRT->SetVariable (\r
                   VAR_LEGACY_DEV_ORDER,\r
-                  &EfiLegacyDevOrderGuid,\r
+                  &gEfiLegacyDevOrderVariableGuid,\r
                   VAR_FLAG,\r
                   TotalSize,\r
                   NewDevOrder\r
@@ -1508,14 +1508,14 @@ BdsSetBootPriority4SameTypeDev (
   IN OUT UINT16                                          *Priority\r
   )\r
 {\r
-  BM_LEGACY_DEV_ORDER_CONTEXT *DevOrder;\r
-  BM_LEGACY_DEV_ORDER_CONTEXT *DevOrderPtr;\r
+  LEGACY_DEV_ORDER_ENTRY      *DevOrder;\r
+  LEGACY_DEV_ORDER_ENTRY      *DevOrderPtr;\r
   UINTN                       DevOrderSize;\r
   UINTN                       Index;\r
 \r
   DevOrder = BdsLibGetVariableAndSize (\r
                VAR_LEGACY_DEV_ORDER,\r
-               &EfiLegacyDevOrderGuid,\r
+               &gEfiLegacyDevOrderVariableGuid,\r
                &DevOrderSize\r
                );\r
   if (NULL == DevOrder) {\r
@@ -1528,7 +1528,7 @@ BdsSetBootPriority4SameTypeDev (
       break;\r
     }\r
 \r
-    DevOrderPtr = (BM_LEGACY_DEV_ORDER_CONTEXT *) ((UINT8 *) DevOrderPtr + sizeof (BBS_TYPE) + DevOrderPtr->Length);\r
+    DevOrderPtr = (LEGACY_DEV_ORDER_ENTRY *) ((UINT8 *) DevOrderPtr + sizeof (BBS_TYPE) + DevOrderPtr->Length);\r
   }\r
 \r
   if ((UINT8 *) DevOrderPtr >= (UINT8 *) DevOrder + DevOrderSize) {\r

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c
index 35c965f316c94e9ef4ccfe1f67752f3f56a14bec..4c8e3c8a4da07b530dd85b46ae97a59eb52dc376 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c
@@ -38,10 +38,7 @@ HII_VENDOR_DEVICE_PATH  mBmmHiiVendorDevicePath = {
         (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
       }\r
     },\r
-    //\r
-    // {165A028F-0BB2-4b5f-8747-77592E3F6499}\r
-    //\r
-    { 0x165a028f, 0xbb2, 0x4b5f, { 0x87, 0x47, 0x77, 0x59, 0x2e, 0x3f, 0x64, 0x99 } }\r
+    BOOT_MAINT_FORMSET_GUID\r
   },\r
   {\r
     END_DEVICE_PATH_TYPE,\r
@@ -63,10 +60,7 @@ HII_VENDOR_DEVICE_PATH  mFeHiiVendorDevicePath = {
         (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
       }\r
     },\r
-    //\r
-    // {91DB4238-B0C8-472e-BBCF-F3A6541010F4}\r
-    //\r
-    { 0x91db4238, 0xb0c8, 0x472e, { 0xbb, 0xcf, 0xf3, 0xa6, 0x54, 0x10, 0x10, 0xf4 } }\r
+    FILE_EXPLORE_FORMSET_GUID\r
   },\r
   {\r
     END_DEVICE_PATH_TYPE,\r
@@ -78,10 +72,6 @@ HII_VENDOR_DEVICE_PATH  mFeHiiVendorDevicePath = {
   }\r
 };\r
 \r
-EFI_GUID EfiLegacyDevOrderGuid  = EFI_LEGACY_DEV_ORDER_VARIABLE_GUID;\r
-EFI_GUID mBootMaintGuid         = BOOT_MAINT_FORMSET_GUID;\r
-EFI_GUID mFileExplorerGuid      = FILE_EXPLORE_FORMSET_GUID;\r
-\r
 CHAR16  mBootMaintStorageName[]     = L"BmmData";\r
 CHAR16  mFileExplorerStorageName[]  = L"FeData";\r
 \r
@@ -194,7 +184,7 @@ BootMaintExtractConfig (
   }\r
 \r
   *Progress = Request;\r
-  if ((Request != NULL) && !HiiIsConfigHdrMatch (Request, &mBootMaintGuid, mBootMaintStorageName)) {\r
+  if ((Request != NULL) && !HiiIsConfigHdrMatch (Request, &gBootMaintFormSetGuid, mBootMaintStorageName)) {\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
@@ -215,7 +205,7 @@ BootMaintExtractConfig (
     // Allocate and fill a buffer large enough to hold the <ConfigHdr> template\r
     // followed by "&OFFSET=0&WIDTH=WWWWWWWWWWWWWWWW" followed by a Null-terminator\r
     //\r
-    ConfigRequestHdr = HiiConstructConfigHdr (&mBootMaintGuid, mBootMaintStorageName, Private->BmmDriverHandle);\r
+    ConfigRequestHdr = HiiConstructConfigHdr (&gBootMaintFormSetGuid, mBootMaintStorageName, Private->BmmDriverHandle);\r
     Size = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16);\r
     ConfigRequest = AllocateZeroPool (Size);\r
     ASSERT (ConfigRequest != NULL);\r
@@ -319,7 +309,7 @@ BootMaintCallback (
     // Retrive uncommitted data from Form Browser\r
     //\r
     CurrentFakeNVMap = &Private->BmmFakeNvData;\r
-    HiiGetBrowserData (&mBootMaintGuid, mBootMaintStorageName, sizeof (BMM_FAKE_NV_DATA), (UINT8 *) CurrentFakeNVMap);\r
+    HiiGetBrowserData (&gBootMaintFormSetGuid, mBootMaintStorageName, sizeof (BMM_FAKE_NV_DATA), (UINT8 *) CurrentFakeNVMap);\r
 \r
     //\r
     // need to be subtituded.\r
@@ -630,7 +620,7 @@ BootMaintCallback (
     //\r
     // Pass changed uncommitted data back to Form Browser\r
     //\r
-    Status = HiiSetBrowserData (&mBootMaintGuid, mBootMaintStorageName, sizeof (BMM_FAKE_NV_DATA), (UINT8 *) CurrentFakeNVMap, NULL);\r
+    Status = HiiSetBrowserData (&gBootMaintFormSetGuid, mBootMaintStorageName, sizeof (BMM_FAKE_NV_DATA), (UINT8 *) CurrentFakeNVMap, NULL);\r
     return Status;\r
   }\r
 \r
@@ -985,7 +975,7 @@ InitializeBM (
   // Post our Boot Maint VFR binary to the HII database.\r
   //\r
   BmmCallbackInfo->BmmHiiHandle = HiiAddPackages (\r
-                                    &mBootMaintGuid,\r
+                                    &gBootMaintFormSetGuid,\r
                                     BmmCallbackInfo->BmmDriverHandle,\r
                                     BmBin,\r
                                     BdsDxeStrings,\r
@@ -997,7 +987,7 @@ InitializeBM (
   // Post our File Explorer VFR binary to the HII database.\r
   //\r
   BmmCallbackInfo->FeHiiHandle = HiiAddPackages (\r
-                                   &mFileExplorerGuid,\r
+                                   &gFileExploreFormSetGuid,\r
                                    BmmCallbackInfo->FeDriverHandle,\r
                                    FEBin,\r
                                    BdsDxeStrings,\r
@@ -1109,7 +1099,7 @@ InitializeBM (
     \r
     HiiUpdateForm (\r
       BmmCallbackInfo->BmmHiiHandle,\r
-      &mBootMaintGuid,\r
+      &gBootMaintFormSetGuid,\r
       FORM_BOOT_SETUP_ID,\r
       mStartOpCodeHandle, // Label FORM_BOOT_LEGACY_DEVICE_ID\r
       mEndOpCodeHandle    // LABEL_END\r
@@ -1399,7 +1389,7 @@ FormSetDispatcher (
                              gFormBrowser2,\r
                              &CallbackData->BmmHiiHandle,\r
                              1,\r
-                             &mBootMaintGuid,\r
+                             &gBootMaintFormSetGuid,\r
                              0,\r
                              NULL,\r
                              &ActionRequest\r
@@ -1421,7 +1411,7 @@ FormSetDispatcher (
                                gFormBrowser2,\r
                                &CallbackData->FeHiiHandle,\r
                                1,\r
-                               &mFileExplorerGuid,\r
+                               &gFileExploreFormSetGuid,\r
                                0,\r
                                NULL,\r
                                &ActionRequest\r

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.h b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.h
index 67eaeec01114bc89f8d319894ec00ea929cb47da..57acf8554157b4262d44d0687ef4e59244d77fab 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.h
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.h
@@ -23,19 +23,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 //\r
 // Constants which are variable names used to access variables\r
 //\r
-#define VAR_LEGACY_DEV_ORDER L"LegacyDevOrder"\r
-\r
 #define VAR_CON_OUT_MODE L"ConOutMode"\r
 \r
-///\r
-/// Guid of a NV Variable which store the information about the\r
-/// FD/HD/CD/NET/BEV order\r
-///\r
-#define EFI_LEGACY_DEV_ORDER_VARIABLE_GUID \\r
-  { \\r
-  0xa56074db, 0x65fe, 0x45f7, {0xbd, 0x21, 0x2d, 0x2b, 0xdd, 0x8e, 0x96, 0x52} \\r
-  }\r
-\r
 //\r
 // String Contant\r
 //\r
@@ -55,8 +44,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 //\r
 #define VAR_FLAG  EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE\r
 \r
-extern EFI_GUID mBootMaintGuid;\r
-extern EFI_GUID mFileExplorerGuid;\r
 extern CHAR16   mFileExplorerStorageName[];\r
 extern CHAR16   mBootMaintStorageName[];\r
 //\r
@@ -85,8 +72,6 @@ extern UINT8    FEBin[];
 //\r
 // Enumeration type definition\r
 //\r
-typedef UINT8 BBS_TYPE;\r
-\r
 typedef enum _TYPE_OF_TERMINAL {\r
   TerminalTypePcAnsi                             = 0,\r
   TerminalTypeVt100,\r
@@ -263,15 +248,6 @@ typedef struct {
   UINT16    BbsIndex;\r
   UINT16    BbsType;\r
 } BOOT_OPTION_BBS_MAPPING;\r
-\r
-typedef struct {\r
-  BBS_TYPE  BbsType;\r
-  ///\r
-  /// Length = sizeof (UINT16) + SIZEOF (Data)\r
-  ///\r
-  UINT16    Length;\r
-  UINT16    Data[1];\r
-} BM_LEGACY_DEV_ORDER_CONTEXT;\r
 #pragma pack()\r
 \r
 typedef struct {\r
@@ -967,14 +943,14 @@ Var_UpdateDriverOrder (
   );\r
 \r
 /**\r
-  Update the legacy BBS boot option. L"LegacyDevOrder" and EfiLegacyDevOrderGuid EFI Variable\r
+  Update the legacy BBS boot option. VAR_LEGACY_DEV_ORDER and gEfiLegacyDevOrderVariableGuid EFI Variable\r
   is udpated with the new Legacy Boot order. The EFI Variable of "Boot####" and gEfiGlobalVariableGuid\r
   is also updated.\r
 \r
   @param CallbackData    The context data for BMM.\r
 \r
   @return EFI_SUCCESS    The function completed successfully.\r
-  @retval EFI_NOT_FOUND  If L"LegacyDevOrder" and EfiLegacyDevOrderGuid EFI Variable can not be found.\r
+  @retval EFI_NOT_FOUND  If VAR_LEGACY_DEV_ORDER and gEfiLegacyDevOrderVariableGuid EFI Variable can not be found.\r
 \r
 **/\r
 EFI_STATUS\r
@@ -1566,7 +1542,6 @@ extern STRING_DEPOSITORY          *DriverOptionStrDepository;
 extern STRING_DEPOSITORY          *DriverOptionHelpStrDepository;\r
 extern STRING_DEPOSITORY          *TerminalStrDepository;\r
 extern EFI_DEVICE_PATH_PROTOCOL   EndDevicePath[];\r
-extern EFI_GUID                   EfiLegacyDevOrderGuid;\r
 extern UINT16                     mFlowControlType[2];\r
 extern UINT32                     mFlowControlValue[2];\r
 //\r

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c
index e078a722d85fe4bbba7abf361fff6d4fb3103da7..8ff5fa0a16f9ea9e53d05b89465cb1806021d00d 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c
@@ -82,7 +82,7 @@ UpdateFileExplorePage (
 \r
   HiiUpdateForm (\r
     CallbackData->FeHiiHandle,\r
-    &mFileExplorerGuid,\r
+    &gFileExploreFormSetGuid,\r
     FORM_FILE_EXPLORER_ID,\r
     mStartOpCodeHandle, // Label FORM_FILE_EXPLORER_ID\r
     mEndOpCodeHandle    // LABEL_END\r
@@ -191,7 +191,7 @@ UpdateFileExplorer (
 \r
         HiiUpdateForm (\r
           CallbackData->FeHiiHandle,\r
-          &mFileExplorerGuid,\r
+          &gFileExploreFormSetGuid,\r
           FormId,\r
           mStartOpCodeHandle, // Label FormId\r
           mEndOpCodeHandle    // LABEL_END\r
@@ -262,7 +262,7 @@ FileExplorerCallback (
     // Retrieve uncommitted data from Form Browser\r
     //\r
     NvRamMap = &Private->FeFakeNvData;\r
-    HiiGetBrowserData (&mFileExplorerGuid, mFileExplorerStorageName, sizeof (FILE_EXPLORER_NV_DATA), (UINT8 *) NvRamMap);\r
+    HiiGetBrowserData (&gFileExploreFormSetGuid, mFileExplorerStorageName, sizeof (FILE_EXPLORER_NV_DATA), (UINT8 *) NvRamMap);\r
 \r
     if (QuestionId == KEY_VALUE_SAVE_AND_EXIT_BOOT || QuestionId == KEY_VALUE_SAVE_AND_EXIT_DRIVER) {\r
       //\r

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FormGuid.h b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FormGuid.h
index d55981ca2007c8da6e2153f8f869e2141857d063..1087db8472e8a1b87b7083bf8056e9a12b4ef84e 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FormGuid.h
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FormGuid.h
@@ -14,15 +14,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef _FORM_GUID_H_\r
 #define _FORM_GUID_H_\r
 \r
-#define BOOT_MAINT_FORMSET_GUID \\r
-  { \\r
-  0x642237c7, 0x35d4, 0x472d, {0x83, 0x65, 0x12, 0xe0, 0xcc, 0xf2, 0x7a, 0x22} \\r
-  }\r
-\r
-#define FILE_EXPLORE_FORMSET_GUID \\r
-  { \\r
-  0x1f2d63e1, 0xfebd, 0x4dc7, {0x9c, 0xc5, 0xba, 0x2b, 0x1c, 0xef, 0x9c, 0x5b} \\r
-  }\r
+#include <Guid/BdsHii.h>\r
 \r
 #define FORM_MAIN_ID                         0x1001\r
 #define FORM_BOOT_ADD_ID                     0x1002\r

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c
index ece88524cbd0729f4d1a675ff8d8e3cd62d7ef49..f77b9f82edd305e4626bfb01cca6650c41a4801e 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c
@@ -123,7 +123,7 @@ UpdatePageEnd (
 \r
   HiiUpdateForm (\r
     CallbackData->BmmHiiHandle,\r
-    &mBootMaintGuid,\r
+    &gBootMaintFormSetGuid,\r
     CallbackData->BmmCurrentPageId,\r
     mStartOpCodeHandle, // Label CallbackData->BmmCurrentPageId\r
     mEndOpCodeHandle    // LABEL_END\r
@@ -151,7 +151,7 @@ CleanUpPage (
   mStartLabel->Number = LabelId;\r
   HiiUpdateForm (\r
     CallbackData->BmmHiiHandle,\r
-    &mBootMaintGuid,\r
+    &gBootMaintFormSetGuid,\r
     LabelId,\r
     mStartOpCodeHandle, // Label LabelId\r
     mEndOpCodeHandle    // LABEL_END\r
@@ -1251,7 +1251,7 @@ UpdateSetLegacyDeviceOrderPage (
   IN BMM_CALLBACK_DATA                *CallbackData\r
   )\r
 {\r
-  BM_LEGACY_DEV_ORDER_CONTEXT *DevOrder;\r
+  LEGACY_DEV_ORDER_ENTRY      *DevOrder;\r
   BM_MENU_OPTION              *OptionMenu;\r
   BM_MENU_ENTRY               *NewMenuEntry;\r
   EFI_STRING_ID               StrRef;\r
@@ -1382,12 +1382,12 @@ UpdateSetLegacyDeviceOrderPage (
   //\r
   VarData = BdsLibGetVariableAndSize (\r
               VAR_LEGACY_DEV_ORDER,\r
-              &EfiLegacyDevOrderGuid,\r
+              &gEfiLegacyDevOrderVariableGuid,\r
               &VarSize\r
               );\r
 \r
   if (NULL != VarData) {\r
-    DevOrder    = (BM_LEGACY_DEV_ORDER_CONTEXT *) VarData;\r
+    DevOrder    = (LEGACY_DEV_ORDER_ENTRY *) VarData;\r
     while (VarData < VarData + VarSize) {\r
       if (DevOrder->BbsType == BbsType) {\r
         break;\r
@@ -1395,7 +1395,7 @@ UpdateSetLegacyDeviceOrderPage (
 \r
       VarData += sizeof (BBS_TYPE);\r
       VarData += *(UINT16 *) VarData;\r
-      DevOrder = (BM_LEGACY_DEV_ORDER_CONTEXT *) VarData;\r
+      DevOrder = (LEGACY_DEV_ORDER_ENTRY *) VarData;\r
     }\r
     //\r
     // Create oneof tag here for FD/HD/CD #1 #2\r

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Variable.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Variable.c
index cf5d295c84b0bc75eefcd1b7c2f07e741a3f5b97..6e6c7266d03ca0dcf4f0f2fc842db30fbed01648 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Variable.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Variable.c
@@ -1071,14 +1071,14 @@ Var_UpdateDriverOrder (
 }\r
 \r
 /**\r
-  Update the legacy BBS boot option. L"LegacyDevOrder" and EfiLegacyDevOrderGuid EFI Variable\r
+  Update the legacy BBS boot option. VAR_LEGACY_DEV_ORDER and gEfiLegacyDevOrderVariableGuid EFI Variable\r
   is udpated with the new Legacy Boot order. The EFI Variable of "Boot####" and gEfiGlobalVariableGuid\r
   is also updated.\r
 \r
   @param CallbackData    The context data for BMM.\r
 \r
   @return EFI_SUCCESS           The function completed successfully.\r
-  @retval EFI_NOT_FOUND         If L"LegacyDevOrder" and EfiLegacyDevOrderGuid EFI Variable can be found.\r
+  @retval EFI_NOT_FOUND         If VAR_LEGACY_DEV_ORDER and gEfiLegacyDevOrderVariableGuid EFI Variable can be found.\r
   @retval EFI_OUT_OF_RESOURCES  Fail to allocate memory resource\r
 **/\r
 EFI_STATUS\r
@@ -1097,7 +1097,7 @@ Var_UpdateBBSOption (
   UINT8                       *LegacyDev;\r
   UINT8                       *VarData;\r
   UINTN                       VarSize;\r
-  BM_LEGACY_DEV_ORDER_CONTEXT *DevOrder;\r
+  LEGACY_DEV_ORDER_ENTRY      *DevOrder;\r
   UINT8                       *OriginalPtr;\r
   UINT8                       *DisMap;\r
   UINTN                       Pos;\r
@@ -1155,7 +1155,7 @@ Var_UpdateBBSOption (
   //\r
   VarData = (UINT8 *) BdsLibGetVariableAndSize (\r
                         VAR_LEGACY_DEV_ORDER,\r
-                        &EfiLegacyDevOrderGuid,\r
+                        &gEfiLegacyDevOrderVariableGuid,\r
                         &VarSize\r
                         );\r
 \r
@@ -1164,7 +1164,7 @@ Var_UpdateBBSOption (
   }\r
 \r
   OriginalPtr = VarData;\r
-  DevOrder    = (BM_LEGACY_DEV_ORDER_CONTEXT *) VarData;\r
+  DevOrder    = (LEGACY_DEV_ORDER_ENTRY *) VarData;\r
 \r
   while (VarData < OriginalPtr + VarSize) {\r
     if (DevOrder->BbsType == CallbackData->BbsType) {\r
@@ -1172,7 +1172,7 @@ Var_UpdateBBSOption (
     }\r
 \r
     VarData += sizeof (BBS_TYPE) + DevOrder->Length;\r
-    DevOrder = (BM_LEGACY_DEV_ORDER_CONTEXT *) VarData;\r
+    DevOrder = (LEGACY_DEV_ORDER_ENTRY *) VarData;\r
   }\r
 \r
   if (VarData >= OriginalPtr + VarSize) {\r
@@ -1218,7 +1218,7 @@ Var_UpdateBBSOption (
 \r
   Status = gRT->SetVariable (\r
                   VAR_LEGACY_DEV_ORDER,\r
-                  &EfiLegacyDevOrderGuid,\r
+                  &gEfiLegacyDevOrderVariableGuid,\r
                   VAR_FLAG,\r
                   VarSize,\r
                   OriginalPtr\r

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.c
index eddb189900c76a3d01ff16f69d95e10b8da1decb..0a7561b18731ac5a1effe93176f7392c80f4540c 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.c
@@ -15,7 +15,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include "BootManager.h"\r
 \r
 UINT16             mKeyInput;\r
-EFI_GUID           mBootManagerGuid = BOOT_MANAGER_FORMSET_GUID;\r
 LIST_ENTRY         mBootOptionsList;\r
 BDS_COMMON_OPTION  *gOption;\r
 CHAR16             *mDeviceTypeStr[] = {\r
@@ -40,10 +39,7 @@ HII_VENDOR_DEVICE_PATH  mBootManagerHiiVendorDevicePath = {
         (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
       }\r
     },\r
-    //\r
-    // {1DDDBE15-481D-4d2b-8277-B191EAF66525}\r
-    //\r
-    { 0x1dddbe15, 0x481d, 0x4d2b, { 0x82, 0x77, 0xb1, 0x91, 0xea, 0xf6, 0x65, 0x25 } }\r
+    BOOT_MANAGER_FORMSET_GUID\r
   },\r
   {\r
     END_DEVICE_PATH_TYPE,\r
@@ -175,7 +171,7 @@ InitializeBootManager (
   // Publish our HII data\r
   //\r
   gBootManagerPrivate.HiiHandle = HiiAddPackages (\r
-                                    &mBootManagerGuid,\r
+                                    &gBootManagerFormSetGuid,\r
                                     gBootManagerPrivate.DriverHandle,\r
                                     BootManagerVfrBin,\r
                                     BdsDxeStrings,\r
@@ -338,7 +334,7 @@ CallBootManager (
 \r
   HiiUpdateForm (\r
     HiiHandle,\r
-    &mBootManagerGuid,\r
+    &gBootManagerFormSetGuid,\r
     BOOT_MANAGER_FORM_ID,\r
     StartOpCodeHandle,\r
     EndOpCodeHandle\r
@@ -352,7 +348,7 @@ CallBootManager (
                            gFormBrowser2,\r
                            &HiiHandle,\r
                            1,\r
-                           &mBootManagerGuid,\r
+                           &gBootManagerFormSetGuid,\r
                            0,\r
                            NULL,\r
                            &ActionRequest\r

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.h b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.h
index 395f568efdc555534f94d61a335ac5af8510df70..e26147183ac3479ce5f876ab7909b8535be2f00f 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.h
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.h
@@ -1,7 +1,7 @@
 /** @file\r
   The platform boot manager reference implement\r
 \r
-Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 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
@@ -18,14 +18,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include "Bds.h"\r
 #include "FrontPage.h"\r
 \r
-//\r
-// These are defined as the same with vfr file\r
-//\r
-#define BOOT_MANAGER_FORMSET_GUID \\r
-  { \\r
-  0x847bc3fe, 0xb974, 0x446d, {0x94, 0x49, 0x5a, 0xd5, 0x41, 0x2e, 0x99, 0x3b} \\r
-  }\r
-\r
 #define BOOT_MANAGER_FORM_ID     0x1000\r
 \r
 #define LABEL_BOOT_OPTION        0x00\r

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManagerVfr.Vfr b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManagerVfr.Vfr
index 1f7dd675e869e68d066451125c73552895ba3377..293e4e78320d1c4f4e126011fbedcd9c9c0355e8 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManagerVfr.Vfr
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManagerVfr.Vfr
@@ -2,7 +2,7 @@
 //  \r
 //    Browser formset.\r
 //  \r
-//  Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>\r
+//  Copyright (c) 2004 - 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
@@ -13,7 +13,7 @@
 //  \r
 //**/\r
 \r
-#define FORMSET_GUID  { 0x847bc3fe, 0xb974, 0x446d, 0x94, 0x49, 0x5a, 0xd5, 0x41, 0x2e, 0x99, 0x3b }\r
+#include <Guid/BdsHii.h>\r
 \r
 #define BOOT_MANAGER_FORM_ID     0x1000\r
 \r
@@ -24,10 +24,10 @@
 #define BOOT_MANAGER_SUBCLASS    0x00\r
 \r
 formset\r
-  guid      = FORMSET_GUID,\r
+  guid      = BOOT_MANAGER_FORMSET_GUID,\r
   title     = STRING_TOKEN(STR_BM_BANNER),\r
   help      = STRING_TOKEN(STR_LAST_STRING),\r
-  classguid = FORMSET_GUID,\r
+  classguid = BOOT_MANAGER_FORMSET_GUID,\r
   class     = BOOT_MANAGER_CLASS,\r
   subclass  = BOOT_MANAGER_SUBCLASS,\r
 \r

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c b/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c
index 1857ffa0a1c93789eb3120db9f983e3a30e01f5e..95a027d158c1c8e603ddc8fb0566e7a83cc57465 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c
@@ -34,9 +34,6 @@ DEVICE_MANAGER_CALLBACK_DATA  gDeviceManagerPrivate = {
 \r
 #define  MAX_MAC_ADDRESS_NODE_LIST_LEN    10\r
 \r
-EFI_GUID mDeviceManagerGuid = DEVICE_MANAGER_FORMSET_GUID;\r
-EFI_GUID mDriverHealthGuid = DRIVER_HEALTH_FORMSET_GUID;\r
-\r
 //\r
 // Which Mac Address string is select\r
 // it will decide what menu need to show in the NETWORK_DEVICE_FORM_ID form.\r
@@ -72,10 +69,7 @@ HII_VENDOR_DEVICE_PATH  mDeviceManagerHiiVendorDevicePath = {
         (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
       }\r
     },\r
-    //\r
-    // {102579A0-3686-466e-ACD8-80C087044F4A}\r
-    //\r
-    { 0x102579a0, 0x3686, 0x466e, { 0xac, 0xd8, 0x80, 0xc0, 0x87, 0x4, 0x4f, 0x4a } }\r
+    DEVICE_MANAGER_FORMSET_GUID\r
   },\r
   {\r
     END_DEVICE_PATH_TYPE,\r
@@ -97,10 +91,7 @@ HII_VENDOR_DEVICE_PATH  mDriverHealthHiiVendorDevicePath = {
           (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
       }\r
     },\r
-    //\r
-    // {D8F76651-1675-4986-BED4-3824B2F1F4C8}\r
-    //\r
-    { 0xd8f76651, 0x1675, 0x4986, { 0xbe, 0xd4, 0x38, 0x24, 0xb2, 0xf1, 0xf4, 0xc8 } }\r
+    DRIVER_HEALTH_FORMSET_GUID\r
   },\r
   {\r
     END_DEVICE_PATH_TYPE,\r
@@ -775,7 +766,7 @@ CallDeviceManager (
     // Publish our HII data.\r
     //\r
     HiiHandle = HiiAddPackages (\r
-                  &mDeviceManagerGuid,\r
+                  &gDeviceManagerFormSetGuid,\r
                   gDeviceManagerPrivate.DriverHandle,\r
                   DeviceManagerVfrBin,\r
                   BdsDxeStrings,\r
@@ -980,7 +971,7 @@ CallDeviceManager (
 \r
   HiiUpdateForm (\r
     HiiHandle,\r
-    &mDeviceManagerGuid,\r
+    &gDeviceManagerFormSetGuid,\r
     mNextShowFormId,\r
     StartOpCodeHandle,\r
     EndOpCodeHandle\r
@@ -991,7 +982,7 @@ CallDeviceManager (
                            gFormBrowser2,\r
                            &HiiHandle,\r
                            1,\r
-                           &mDeviceManagerGuid,\r
+                           &gDeviceManagerFormSetGuid,\r
                            mNextShowFormId,\r
                            NULL,\r
                            &ActionRequest\r
@@ -1181,7 +1172,7 @@ CallDriverHealth (
     // Publish Driver Health HII data.\r
     //\r
     HiiHandle = HiiAddPackages (\r
-                  &mDeviceManagerGuid,\r
+                  &gDeviceManagerFormSetGuid,\r
                   gDeviceManagerPrivate.DriverHealthHandle,\r
                   DriverHealthVfrBin,\r
                   BdsDxeStrings,\r
@@ -1379,7 +1370,7 @@ CallDriverHealth (
 \r
   Status = HiiUpdateForm (\r
              HiiHandle,\r
-             &mDriverHealthGuid,\r
+             &gDriverHealthFormSetGuid,\r
              DRIVER_HEALTH_FORM_ID,\r
              StartOpCodeHandle,\r
              EndOpCodeHandle\r
@@ -1389,7 +1380,7 @@ CallDriverHealth (
 \r
   Status = HiiUpdateForm (\r
             HiiHandle,\r
-            &mDriverHealthGuid,\r
+            &gDriverHealthFormSetGuid,\r
             DRIVER_HEALTH_FORM_ID,\r
             StartOpCodeHandleRepair,\r
             EndOpCodeHandleRepair\r
@@ -1402,7 +1393,7 @@ CallDriverHealth (
                            gFormBrowser2,\r
                            &HiiHandle,\r
                            1,\r
-                           &mDriverHealthGuid,\r
+                           &gDriverHealthFormSetGuid,\r
                            DRIVER_HEALTH_FORM_ID,\r
                            NULL,\r
                            &ActionRequest\r

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManagerVfr.h b/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManagerVfr.h
index 858b13e2cfb8b25883c30de43dc824d01865af8c..96e2c0a2cfdb383e80f42a7b3644f44f595df99e 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManagerVfr.h
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManagerVfr.h
@@ -15,15 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #ifndef _DEVICE_MANAGER_VFR_H_\r
 #define _DEVICE_MANAGER_VFR_H_\r
 \r
-#define DEVICE_MANAGER_FORMSET_GUID  \\r
-  { \\r
-  0x3ebfa8e6, 0x511d, 0x4b5b, {0xa9, 0x5f, 0xfb, 0x38, 0x26, 0xf, 0x1c, 0x27} \\r
-  }\r
-\r
-#define DRIVER_HEALTH_FORMSET_GUID  \\r
-  { \\r
-  0xf76e0a70, 0xb5ed, 0x4c38, {0xac, 0x9a, 0xe5, 0xf5, 0x4b, 0xf1, 0x6e, 0x34} \\r
-  }\r
+#include <Guid/BdsHii.h>\r
 \r
 #define LABEL_DEVICES_LIST                   0x1100\r
 #define LABEL_NETWORK_DEVICE_LIST_ID         0x1101\r

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c
index e8532ece06fd3acdce0ecf54ad842f62ca8f6d9f..63c14964bf7d1f360e1e7f7735e51e2db7b6b46d 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c
@@ -17,8 +17,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include "Language.h"\r
 #include "Hotkey.h"\r
 \r
-EFI_GUID  mFrontPageGuid      = FRONT_PAGE_FORMSET_GUID;\r
-\r
 BOOLEAN   gConnectAllHappened = FALSE;\r
 UINTN     gCallbackKey;\r
 \r
@@ -46,10 +44,7 @@ HII_VENDOR_DEVICE_PATH  mFrontPageHiiVendorDevicePath = {
         (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
       }\r
     },\r
-    //\r
-    // {8E6D99EE-7531-48f8-8745-7F6144468FF2}\r
-    //\r
-    { 0x8e6d99ee, 0x7531, 0x48f8, { 0x87, 0x45, 0x7f, 0x61, 0x44, 0x46, 0x8f, 0xf2 } }\r
+    FRONT_PAGE_FORMSET_GUID\r
   },\r
   {\r
     END_DEVICE_PATH_TYPE,\r
@@ -128,8 +123,8 @@ FakeRouteConfig (
   }\r
 \r
   *Progress = Configuration;\r
-  if (!HiiIsConfigHdrMatch (Configuration, &mBootMaintGuid, mBootMaintStorageName)\r
-      && !HiiIsConfigHdrMatch (Configuration, &mFileExplorerGuid, mFileExplorerStorageName)) {\r
+  if (!HiiIsConfigHdrMatch (Configuration, &gBootMaintFormSetGuid, mBootMaintStorageName)\r
+      && !HiiIsConfigHdrMatch (Configuration, &gFileExploreFormSetGuid, mFileExplorerStorageName)) {\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
@@ -357,7 +352,7 @@ InitializeFrontPage (
     // Publish our HII data\r
     //\r
     gFrontPagePrivate.HiiHandle = HiiAddPackages (\r
-                                    &mFrontPageGuid,\r
+                                    &gFrontPageFormSetGuid,\r
                                     gFrontPagePrivate.DriverHandle,\r
                                     FrontPageVfrBin,\r
                                     BdsDxeStrings,\r
@@ -496,7 +491,7 @@ InitializeFrontPage (
 \r
   Status = HiiUpdateForm (\r
              HiiHandle,\r
-             &mFrontPageGuid,\r
+             &gFrontPageFormSetGuid,\r
              FRONT_PAGE_FORM_ID,\r
              StartOpCodeHandle, // LABEL_SELECT_LANGUAGE\r
              EndOpCodeHandle    // LABEL_END\r
@@ -536,7 +531,7 @@ CallFrontPage (
                             gFormBrowser2,\r
                             &gFrontPagePrivate.HiiHandle,\r
                             1,\r
-                            &mFrontPageGuid,\r
+                            &gFrontPageFormSetGuid,\r
                             0,\r
                             NULL,\r
                             &ActionRequest\r

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.h b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.h
index 6b3dc29a91ff3e420b4d0097b8d5525e2325b362..a68eed9dbff33c32b4957ae36d11246b090e1950 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.h
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.h
@@ -1,7 +1,7 @@
 /** @file\r
   FrontPage routines to handle the callbacks and browser calls\r
 \r
-Copyright (c) 2004 - 2009, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 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
@@ -59,11 +59,6 @@ extern BOOLEAN  gConnectAllHappened;
 #define LABEL_SELECT_LANGUAGE          0x1000\r
 #define LABEL_END                      0xffff\r
 \r
-#define FRONT_PAGE_FORMSET_GUID \\r
-  { \\r
-    0x9e0c30bc, 0x3f06, 0x4ba6, {0x82, 0x88, 0x9, 0x17, 0x9b, 0x85, 0x5d, 0xbe} \\r
-  }\r
-\r
 #define FRONT_PAGE_CALLBACK_DATA_SIGNATURE  SIGNATURE_32 ('F', 'P', 'C', 'B')\r
 \r
 typedef struct {\r

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPageVfr.Vfr b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPageVfr.Vfr
index ebb70dd67f55c1f62692533e6c50b3a17ff77359..79ec796b64bfdd3fa28b08548ee0060cd7568dbc 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPageVfr.Vfr
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPageVfr.Vfr
@@ -2,7 +2,7 @@
 //  \r
 //    Browser formset.\r
 //  \r
-//  Copyright (c) 2007 - 2008, Intel Corporation. All rights reserved.<BR>\r
+//  Copyright (c) 2007 - 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
@@ -13,7 +13,7 @@
 //  \r
 //**/\r
 \r
-#define FORMSET_GUID  { 0x9e0c30bc, 0x3f06, 0x4ba6, 0x82, 0x88, 0x9, 0x17, 0x9b, 0x85, 0x5d, 0xbe }\r
+#include <Guid/BdsHii.h>\r
 \r
 #define FRONT_PAGE_CLASS               0x0000\r
 #define FRONT_PAGE_SUBCLASS            0x0002\r
@@ -37,10 +37,10 @@
 #define LABEL_END                      0xffff\r
 \r
 formset\r
-  guid     = FORMSET_GUID,\r
+  guid     = FRONT_PAGE_FORMSET_GUID,\r
   title    = STRING_TOKEN(STR_FRONT_PAGE_TITLE),\r
   help     = STRING_TOKEN(STR_NULL_STRING),\r
-  classguid = FORMSET_GUID,\r
+  classguid = FRONT_PAGE_FORMSET_GUID,\r
   class    = FRONT_PAGE_CLASS,\r
   subclass = FRONT_PAGE_SUBCLASS,\r
 \r

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/String.h b/IntelFrameworkModulePkg/Universal/BdsDxe/String.h
index 42b96adb0285c61d984e0f2b25b5a80866dd9a21..005b2bdbd2ebf6e2c56643953b0392631ca1a1ed 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/String.h
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/String.h
@@ -26,14 +26,6 @@ extern EFI_HII_HANDLE gStringPackHandle;
 \r
 extern UINT8  BdsDxeStrings[];\r
 \r
-//\r
-// String Definition Guid for BDS Platform\r
-//\r
-#define EFI_BDS_PLATFORM_GUID \\r
-  { \\r
-    0x7777E939, 0xD57E, 0x4DCB, 0xA0, 0x8E, 0x64, 0xD7, 0x98, 0x57, 0x1E, 0x0F \\r
-  }\r
-\r
 /**\r
   Get string by string id from HII Interface\r
 \r

diff --git a/IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/UpdateDispatcher.c b/IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/UpdateDispatcher.c
index 177e79908edcfd14e87d0a55230402a600b864d3..99b8d3c3588886e6042dfc2a457be5f8e8fd3f65 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/UpdateDispatcher.c
+++ b/IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/UpdateDispatcher.c
@@ -18,7 +18,6 @@
 \r
 #include "UpdateDriver.h"\r
 \r
-EFI_GUID       UpdateDataGuid = EFI_UPDATE_DATA_FILE_GUID;\r
 EFI_HII_HANDLE  gHiiHandle;\r
 \r
 /**\r
@@ -767,7 +766,7 @@ InitializeUpdateDriver (
   FileBufferSize    = 0;\r
   Status            = FwVolProtocol->ReadFile (\r
                                        FwVolProtocol,\r
-                                       &UpdateDataGuid,\r
+                                       &gEfiUpdateDataFileGuid,\r
                                        (VOID **) &FileBuffer,\r
                                        &FileBufferSize,\r
                                        &FileType,\r

diff --git a/IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/UpdateDriver.h b/IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/UpdateDriver.h
index 9fd00b3b2d2c64882763369bff2ace4e11d50cec..e1f22a9d5a2f146284d6c46fcb7ff28948c01acf 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/UpdateDriver.h
+++ b/IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/UpdateDriver.h
@@ -21,6 +21,7 @@
 \r
 #include <Protocol/LoadedImage.h>\r
 #include <Guid/Capsule.h>\r
+#include <Guid/CapsuleDataFile.h>\r
 #include <Protocol/FaultTolerantWrite.h>\r
 #include <Protocol/FirmwareVolumeBlock.h>\r
 #include <Protocol/FirmwareVolume2.h>\r
@@ -38,12 +39,6 @@
 #include <Library/PrintLib.h>\r
 #include <Library/DevicePathLib.h>\r
 \r
-//\r
-// {283FA2EE-532C-484d-9383-9F93B36F0B7E}\r
-//\r
-#define EFI_UPDATE_DATA_FILE_GUID \\r
- { 0x283fa2ee, 0x532c, 0x484d, { 0x93, 0x83, 0x9f, 0x93, 0xb3, 0x6f, 0xb, 0x7e } }\r
-\r
 extern EFI_HII_HANDLE gHiiHandle;\r
 \r
 typedef enum {\r

diff --git a/IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/UpdateDriverDxe.inf b/IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/UpdateDriverDxe.inf
index 5ec26e249e1da4cecd0f1223339d8728a34eafae..32b896442a78382dc4f43a5263f96787e26ea4a4 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/UpdateDriverDxe.inf
+++ b/IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/UpdateDriverDxe.inf
@@ -3,7 +3,7 @@
 # then it should be dispatched from the capsule FV, then find the image \r
 # in the same FV and program it in a target Firmware Volume device.\r
 #\r
-# Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
 #\r
 # This program and the accompanying materials are\r
 # licensed and made available under the terms and conditions of the BSD License\r
@@ -40,6 +40,7 @@
   MdePkg/MdePkg.dec\r
   MdeModulePkg/MdeModulePkg.dec\r
   IntelFrameworkPkg/IntelFrameworkPkg.dec\r
+  IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec\r
 \r
 [LibraryClasses]\r
   BaseLib\r
@@ -57,6 +58,7 @@
 \r
 [Guids]\r
   gEfiConfigFileNameGuid                        ## CONSUMES FileName to store ConfigFile\r
+  gEfiUpdateDataFileGuid                        ## CONSUMES FileName to store Capsule Data.\r
 \r
 [Protocols]\r
   gEfiFaultTolerantWriteProtocolGuid            ## CONSUMES\r