diff options
| author | lgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524> | 2011-09-18 12:23:27 +0000 |
|---|---|---|
| committer | lgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524> | 2011-09-18 12:23:27 +0000 |
| commit | e24fc1032db5d5d2395260f6d7af94aa5a2a0802 (patch) | |
| tree | 51d28f355c6a95e131cd444b0d12205a0e887a4c | |
| parent | c8ad2d7a296c851c2a91519f80dab479df0fdf46 (diff) | |
| download | edk2-platforms-e24fc1032db5d5d2395260f6d7af94aa5a2a0802.tar.xz | |
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
35 files changed, 401 insertions, 238 deletions
diff --git a/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BiosBlkIo.c b/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BiosBlkIo.c index 309cf1a9ed..e8ea11c4f8 100644 --- 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
Currently at ftp://fission.dt.wdc.com/pub/standards/x3t13/project/d1386r4.pdf
-Copyright (c) 1999 - 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 1999 - 2011, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions
@@ -68,8 +68,6 @@ BIOS_LEGACY_DRIVE *mLegacyDriverUnder1Mb; //
VOID *mEdd11Buffer;
-EFI_GUID mUnknownDevGuid = UNKNOWN_DEVICE_GUID;
-
/**
Driver entry point.
@@ -635,8 +633,8 @@ SetBiosInitBlockIoDevicePath ( OUT EFI_DEVICE_PATH_PROTOCOL **DevicePath
)
{
- EFI_STATUS Status;
- UNKNOWN_DEVICE_VENDOR_DEVICE_PATH VendorNode;
+ EFI_STATUS Status;
+ BLOCKIO_VENDOR_DEVICE_PATH VendorNode;
Status = EFI_UNSUPPORTED;
@@ -658,7 +656,7 @@ SetBiosInitBlockIoDevicePath ( VendorNode.DevicePath.Header.Type = HARDWARE_DEVICE_PATH;
VendorNode.DevicePath.Header.SubType = HW_VENDOR_DP;
SetDevicePathNodeLength (&VendorNode.DevicePath.Header, sizeof (VendorNode));
- CopyMem (&VendorNode.DevicePath.Guid, &mUnknownDevGuid, sizeof (EFI_GUID));
+ CopyMem (&VendorNode.DevicePath.Guid, &gBlockIoVendorGuid, sizeof (EFI_GUID));
VendorNode.LegacyDriveLetter = Drive->Number;
*DevicePath = AppendDevicePathNode (BaseDevicePath, &VendorNode.DevicePath.Header);
}
diff --git a/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BiosBlkIo.h b/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BiosBlkIo.h index de3c8d3518..91617b79d9 100644 --- a/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BiosBlkIo.h +++ b/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BiosBlkIo.h @@ -1,6 +1,6 @@ /** @file
-Copyright (c) 1999 - 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 1999 - 2011, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials
are licensed and made available under the terms and conditions
@@ -23,6 +23,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include <Protocol/LegacyBios.h>
#include <Protocol/DevicePath.h>
#include <Guid/LegacyBios.h>
+#include <Guid/BlockIoVendor.h>
#include <Library/UefiDriverEntryPoint.h>
#include <Library/DebugLib.h>
@@ -36,14 +37,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include "Edd.h"
-#define UNKNOWN_DEVICE_GUID \
- { 0xcf31fac5, 0xc24e, 0x11d2, {0x85, 0xf3, 0x0, 0xa0, 0xc9, 0x3e, 0xc9, 0x3b} }
-
-typedef struct {
- VENDOR_DEVICE_PATH DevicePath;
- UINT8 LegacyDriveLetter;
-} UNKNOWN_DEVICE_VENDOR_DEVICE_PATH;
-
//
// Global Variables
//
diff --git a/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BlockIoDxe.inf b/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BlockIoDxe.inf index 3fcaa2723c..0e02f7eb27 100644 --- a/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BlockIoDxe.inf +++ b/IntelFrameworkModulePkg/Csm/BiosThunk/BlockIoDxe/BlockIoDxe.inf @@ -49,7 +49,7 @@ [Guids]
gEfiLegacyBiosGuid
-
+ gBlockIoVendorGuid
[Packages]
MdePkg/MdePkg.dec
diff --git a/IntelFrameworkModulePkg/Include/Guid/BdsHii.h b/IntelFrameworkModulePkg/Include/Guid/BdsHii.h new file mode 100644 index 0000000000..e22babc5b6 --- /dev/null +++ b/IntelFrameworkModulePkg/Include/Guid/BdsHii.h @@ -0,0 +1,55 @@ +/** @file
+ GUIDs used as HII FormSet and HII Package list GUID in BdsDxe driver.
+
+Copyright (c) 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 that accompanies this distribution.
+The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php.
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+
+#ifndef __BDS_HII_GUIDS_H__
+#define __BDS_HII_GUIDS_H__
+
+#define FRONT_PAGE_FORMSET_GUID \
+ { \
+ 0x9e0c30bc, 0x3f06, 0x4ba6, {0x82, 0x88, 0x9, 0x17, 0x9b, 0x85, 0x5d, 0xbe} \
+ }
+
+#define BOOT_MANAGER_FORMSET_GUID \
+ { \
+ 0x847bc3fe, 0xb974, 0x446d, {0x94, 0x49, 0x5a, 0xd5, 0x41, 0x2e, 0x99, 0x3b} \
+ }
+
+#define DEVICE_MANAGER_FORMSET_GUID \
+ { \
+ 0x3ebfa8e6, 0x511d, 0x4b5b, {0xa9, 0x5f, 0xfb, 0x38, 0x26, 0xf, 0x1c, 0x27} \
+ }
+
+#define DRIVER_HEALTH_FORMSET_GUID \
+ { \
+ 0xf76e0a70, 0xb5ed, 0x4c38, {0xac, 0x9a, 0xe5, 0xf5, 0x4b, 0xf1, 0x6e, 0x34} \
+ }
+
+#define BOOT_MAINT_FORMSET_GUID \
+ { \
+ 0x642237c7, 0x35d4, 0x472d, {0x83, 0x65, 0x12, 0xe0, 0xcc, 0xf2, 0x7a, 0x22} \
+ }
+
+#define FILE_EXPLORE_FORMSET_GUID \
+ { \
+ 0x1f2d63e1, 0xfebd, 0x4dc7, {0x9c, 0xc5, 0xba, 0x2b, 0x1c, 0xef, 0x9c, 0x5b} \
+ }
+
+extern EFI_GUID gFrontPageFormSetGuid;
+extern EFI_GUID gBootMaintFormSetGuid;
+extern EFI_GUID gFileExploreFormSetGuid;
+extern EFI_GUID gBootManagerFormSetGuid;
+extern EFI_GUID gDeviceManagerFormSetGuid;
+extern EFI_GUID gDriverHealthFormSetGuid;
+
+#endif
diff --git a/IntelFrameworkModulePkg/Include/Guid/BdsLibHii.h b/IntelFrameworkModulePkg/Include/Guid/BdsLibHii.h new file mode 100644 index 0000000000..1a2bb024c4 --- /dev/null +++ b/IntelFrameworkModulePkg/Include/Guid/BdsLibHii.h @@ -0,0 +1,25 @@ +/** @file
+ GUID used as HII Package list GUID in GenericBdsLib module.
+
+Copyright (c) 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 that accompanies this distribution.
+The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php.
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+
+#ifndef __BDS_LIB_HII_GUID_H__
+#define __BDS_LIB_HII_GUID_H__
+
+#define BDS_LIB_STRING_PACKAGE_GUID \
+ { \
+ 0x3b4d9b23, 0x95ac, 0x44f6, { 0x9f, 0xcd, 0xe, 0x95, 0x94, 0x58, 0x6c, 0x72 } \
+ }
+
+extern EFI_GUID gBdsLibStringPackageGuid;
+
+#endif
diff --git a/IntelFrameworkModulePkg/Include/Guid/BlockIoVendor.h b/IntelFrameworkModulePkg/Include/Guid/BlockIoVendor.h new file mode 100644 index 0000000000..71aa05a595 --- /dev/null +++ b/IntelFrameworkModulePkg/Include/Guid/BlockIoVendor.h @@ -0,0 +1,31 @@ +/** @file
+ Guid for unrecognized EDD 3.0 device.
+
+Copyright (c) 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 that accompanies this distribution.
+The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php.
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+
+#ifndef __BLOCKIO_VENDOR_H__
+#define __BLOCKIO_VENDOR_H__
+
+//
+// Guid is to specifiy the unrecognized EDD 3.0 device.
+//
+#define BLOCKIO_VENDOR_GUID \
+ { 0xcf31fac5, 0xc24e, 0x11d2, {0x85, 0xf3, 0x0, 0xa0, 0xc9, 0x3e, 0xc9, 0x3b} }
+
+typedef struct {
+ VENDOR_DEVICE_PATH DevicePath;
+ UINT8 LegacyDriveLetter;
+} BLOCKIO_VENDOR_DEVICE_PATH;
+
+extern GUID gBlockIoVendorGuid;
+
+#endif
diff --git a/IntelFrameworkModulePkg/Include/Guid/CapsuleDataFile.h b/IntelFrameworkModulePkg/Include/Guid/CapsuleDataFile.h new file mode 100644 index 0000000000..7e97d17f23 --- /dev/null +++ b/IntelFrameworkModulePkg/Include/Guid/CapsuleDataFile.h @@ -0,0 +1,23 @@ +/** @file
+ GUID to specify which FFS file to store the updated capsule data.
+
+Copyright (c) 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 that accompanies this distribution.
+The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php.
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+
+#ifndef __UPDATE_DATA_FILE_GUID_H__
+#define __UPDATE_DATA_FILE_GUID_H__
+
+#define EFI_UPDATE_DATA_FILE_GUID \
+ { 0x283fa2ee, 0x532c, 0x484d, { 0x93, 0x83, 0x9f, 0x93, 0xb3, 0x6f, 0xb, 0x7e } }
+
+extern GUID gEfiUpdateDataFileGuid;
+
+#endif
diff --git a/IntelFrameworkModulePkg/Include/Guid/HdBootVariable.h b/IntelFrameworkModulePkg/Include/Guid/HdBootVariable.h new file mode 100644 index 0000000000..fae0839791 --- /dev/null +++ b/IntelFrameworkModulePkg/Include/Guid/HdBootVariable.h @@ -0,0 +1,31 @@ +/** @file
+ GUID used as EFI Variable for the device path of Boot file on HardDevice.
+
+Copyright (c) 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 that accompanies this distribution.
+The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php.
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+
+#ifndef __HD_DEVICE_PATH_VARIABLE_GUID_H__
+#define __HD_DEVICE_PATH_VARIABLE_GUID_H__
+
+///
+/// This GUID is used for an EFI Variable that stores the front device pathes
+/// for a partial device path that starts with the HD node.
+///
+#define HD_BOOT_DEVICE_PATH_VARIABLE_GUID \
+ { \
+ 0xfab7e9e1, 0x39dd, 0x4f2b, { 0x84, 0x8, 0xe2, 0xe, 0x90, 0x6c, 0xb6, 0xde } \
+ }
+
+#define HD_BOOT_DEVICE_PATH_VARIABLE_NAME L"HDDP"
+
+extern EFI_GUID gHdBootDevicePathVariablGuid;
+
+#endif
diff --git a/IntelFrameworkModulePkg/Include/Guid/LastEnumLang.h b/IntelFrameworkModulePkg/Include/Guid/LastEnumLang.h new file mode 100644 index 0000000000..8d9e37fab2 --- /dev/null +++ b/IntelFrameworkModulePkg/Include/Guid/LastEnumLang.h @@ -0,0 +1,31 @@ +/** @file
+ GUID used as EFI variable to store platform language at last time enumeration.
+
+Copyright (c) 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 that accompanies this distribution.
+The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php.
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+
+#ifndef __LAST_ENUM_LANGUAGE_GUID_H__
+#define __LAST_ENUM_LANGUAGE_GUID_H__
+
+///
+/// This GUID is used for Set/Get platform language into/from variable at last time enumeration
+/// to ensure the enumeration will only execute once.
+///
+#define LAST_ENUM_LANGUAGE_GUID \
+ { \
+ 0xe8c545b, 0xa2ee, 0x470d, { 0x8e, 0x26, 0xbd, 0xa1, 0xa1, 0x3c, 0xa, 0xa3 } \
+ }
+
+#define LAST_ENUM_LANGUAGE_VARIABLE_NAME L"LastEnumLang"
+
+extern EFI_GUID gLastEnumLangGuid;
+
+#endif
diff --git a/IntelFrameworkModulePkg/Include/Guid/LegacyDevOrder.h b/IntelFrameworkModulePkg/Include/Guid/LegacyDevOrder.h new file mode 100644 index 0000000000..684f098d58 --- /dev/null +++ b/IntelFrameworkModulePkg/Include/Guid/LegacyDevOrder.h @@ -0,0 +1,45 @@ +/** @file
+ Guid of a NV Variable which store the information about the
+ FD/HD/CD/NET/BEV order.
+
+Copyright (c) 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 that accompanies this distribution.
+The full text of the license may be found at
+http://opensource.org/licenses/bsd-license.php.
+
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+
+#ifndef __LEGACY_DEV_ORDER_VARIABLE_GUID_H__
+#define __LEGACY_DEV_ORDER_VARIABLE_GUID_H__
+
+///
+/// Name and Guid of a NV Variable which stores the information about the
+/// FD/HD/CD/NET/BEV order
+///
+#define EFI_LEGACY_DEV_ORDER_VARIABLE_GUID \
+ { \
+ 0xa56074db, 0x65fe, 0x45f7, {0xbd, 0x21, 0x2d, 0x2b, 0xdd, 0x8e, 0x96, 0x52} \
+ }
+
+typedef UINT8 BBS_TYPE;
+
+#pragma pack(1)
+typedef struct {
+ BBS_TYPE BbsType;
+ ///
+ /// Length = sizeof (UINT16) + sizeof (Data)
+ ///
+ UINT16 Length;
+ UINT16 Data[1];
+} LEGACY_DEV_ORDER_ENTRY;
+#pragma pack()
+
+#define VAR_LEGACY_DEV_ORDER L"LegacyDevOrder"
+
+extern EFI_GUID gEfiLegacyDevOrderVariableGuid;
+
+#endif
diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec index 316b1f9039..d7f91d0b34 100644 --- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec +++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec @@ -52,6 +52,32 @@ ## Include/Guid/LegacyBios.h
gEfiLegacyBiosGuid = { 0x2E3044AC, 0x879F, 0x490F, { 0x97, 0x60, 0xBB, 0xDF, 0xAF, 0x69, 0x5F, 0x50 }}
+
+ ## Include/Guid/LegacyDevOrder.h
+ gEfiLegacyDevOrderVariableGuid = { 0xa56074db, 0x65fe, 0x45f7, {0xbd, 0x21, 0x2d, 0x2b, 0xdd, 0x8e, 0x96, 0x52 }}
+
+ ## Include/Guid/CapsuleDataFile.h
+ gEfiUpdateDataFileGuid = { 0x283fa2ee, 0x532c, 0x484d, { 0x93, 0x83, 0x9f, 0x93, 0xb3, 0x6f, 0xb, 0x7e }}
+
+ ## Include/Guid/BlockIoVendor.h
+ gBlockIoVendorGuid = { 0xcf31fac5, 0xc24e, 0x11d2, {0x85, 0xf3, 0x0, 0xa0, 0xc9, 0x3e, 0xc9, 0x3b }}
+
+ ## Include/Guid/BdsHii.h
+ gFrontPageFormSetGuid = { 0x9e0c30bc, 0x3f06, 0x4ba6, {0x82, 0x88, 0x9, 0x17, 0x9b, 0x85, 0x5d, 0xbe }}
+ gBootManagerFormSetGuid = { 0x847bc3fe, 0xb974, 0x446d, {0x94, 0x49, 0x5a, 0xd5, 0x41, 0x2e, 0x99, 0x3b }}
+ gDeviceManagerFormSetGuid = { 0x3ebfa8e6, 0x511d, 0x4b5b, {0xa9, 0x5f, 0xfb, 0x38, 0x26, 0xf, 0x1c, 0x27 }}
+ gDriverHealthFormSetGuid = { 0xf76e0a70, 0xb5ed, 0x4c38, {0xac, 0x9a, 0xe5, 0xf5, 0x4b, 0xf1, 0x6e, 0x34 }}
+ gBootMaintFormSetGuid = { 0x642237c7, 0x35d4, 0x472d, {0x83, 0x65, 0x12, 0xe0, 0xcc, 0xf2, 0x7a, 0x22 }}
+ gFileExploreFormSetGuid = { 0x1f2d63e1, 0xfebd, 0x4dc7, {0x9c, 0xc5, 0xba, 0x2b, 0x1c, 0xef, 0x9c, 0x5b }}
+
+ ## Include/Guid/BdsLibHii.h
+ gBdsLibStringPackageGuid = { 0x3b4d9b23, 0x95ac, 0x44f6, {0x9f, 0xcd, 0xe, 0x95, 0x94, 0x58, 0x6c, 0x72 }}
+
+ ## Include/Guid/LastEnumLang.h
+ gLastEnumLangGuid = { 0xe8c545b, 0xa2ee, 0x470d, {0x8e, 0x26, 0xbd, 0xa1, 0xa1, 0x3c, 0xa, 0xa3 }}
+
+ ## Include/Guid/HdBootVariable.h
+ gHdBootDevicePathVariablGuid = { 0xfab7e9e1, 0x39dd, 0x4f2b, {0x84, 0x8, 0xe2, 0xe, 0x90, 0x6c, 0xb6, 0xde }}
[Protocols]
## Vga Mini port binding for a VGA controller
diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c b/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c index 58f058df80..372cab5972 100644 --- 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;
EFI_HII_HANDLE gBdsLibStringPackHandle = NULL;
-///
-/// This GUID is used for an EFI Variable that stores the front device pathes
-/// for a partial device path that starts with the HD node.
-///
-EFI_GUID mHdBootVariablePrivateGuid = { 0xfab7e9e1, 0x39dd, 0x4f2b, { 0x84, 0x8, 0xe2, 0xe, 0x90, 0x6c, 0xb6, 0xde } };
-
-///
-/// This GUID is used for register UNI string.
-///
-EFI_GUID mBdsLibStringPackGuid = { 0x3b4d9b23, 0x95ac, 0x44f6, { 0x9f, 0xcd, 0xe, 0x95, 0x94, 0x58, 0x6c, 0x72 } };
-
-///
-/// This GUID is used for Set/Get platform language into/from variable at last time enumeration to ensure the enumeration will
-/// only execute once.
-///
-EFI_GUID mBdsLibLastLangGuid = { 0xe8c545b, 0xa2ee, 0x470d, { 0x8e, 0x26, 0xbd, 0xa1, 0xa1, 0x3c, 0xa, 0xa3 } };
-
/**
The constructor function register UNI strings into imageHandle.
@@ -56,7 +39,7 @@ GenericBdsLibConstructor ( {
gBdsLibStringPackHandle = HiiAddPackages (
- &mBdsLibStringPackGuid,
+ &gBdsLibStringPackageGuid,
&ImageHandle,
GenericBdsLibStrings,
NULL
@@ -906,13 +889,13 @@ BdsExpandPartitionPartialDevicePathToFull ( FullDevicePath = NULL;
//
- // Check if there is prestore 'HDDP' variable.
+ // Check if there is prestore HD_BOOT_DEVICE_PATH_VARIABLE_NAME variable.
// If exist, search the front path which point to partition node in the variable instants.
- // If fail to find or 'HDDP' not exist, reconnect all and search in all system
+ // If fail to find or HD_BOOT_DEVICE_PATH_VARIABLE_NAME not exist, reconnect all and search in all system
//
CachedDevicePath = BdsLibGetVariableAndSize (
- L"HDDP",
- &mHdBootVariablePrivateGuid,
+ HD_BOOT_DEVICE_PATH_VARIABLE_NAME,
+ &gHdBootDevicePathVariablGuid,
&CachedDevicePathSize
);
@@ -954,7 +937,7 @@ BdsExpandPartitionPartialDevicePathToFull ( FullDevicePath = AppendDevicePath (Instance, DevicePath);
//
- // Adjust the 'HDDP' instances sequence if the matched one is not first one.
+ // Adjust the HD_BOOT_DEVICE_PATH_VARIABLE_NAME instances sequence if the matched one is not first one.
//
if (NeedAdjust) {
//
@@ -974,8 +957,8 @@ BdsExpandPartitionPartialDevicePathToFull ( // Save the matching Device Path so we don't need to do a connect all next time
//
Status = gRT->SetVariable (
- L"HDDP",
- &mHdBootVariablePrivateGuid,
+ HD_BOOT_DEVICE_PATH_VARIABLE_NAME,
+ &gHdBootDevicePathVariablGuid,
EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,
GetDevicePathSize (CachedDevicePath),
CachedDevicePath
@@ -989,7 +972,7 @@ BdsExpandPartitionPartialDevicePathToFull ( }
//
- // If we get here we fail to find or 'HDDP' not exist, and now we need
+ // If we get here we fail to find or HD_BOOT_DEVICE_PATH_VARIABLE_NAME not exist, and now we need
// to search all devices in the system for a matched partition
//
BdsLibConnectAllDriversToAllControllers ();
@@ -1019,11 +1002,11 @@ BdsExpandPartitionPartialDevicePathToFull ( FullDevicePath = AppendDevicePath (BlockIoDevicePath, DevicePath);
//
- // Save the matched partition device path in 'HDDP' variable
+ // Save the matched partition device path in HD_BOOT_DEVICE_PATH_VARIABLE_NAME variable
//
if (CachedDevicePath != NULL) {
//
- // Save the matched partition device path as first instance of 'HDDP' variable
+ // Save the matched partition device path as first instance of HD_BOOT_DEVICE_PATH_VARIABLE_NAME variable
//
if (BdsLibMatchDevicePaths (CachedDevicePath, BlockIoDevicePath)) {
TempNewDevicePath = CachedDevicePath;
@@ -1042,7 +1025,8 @@ BdsExpandPartitionPartialDevicePathToFull ( }
//
// Here limit the device path instance number to 12, which is max number for a system support 3 IDE controller
- // If the user try to boot many OS in different HDs or partitions, in theory, the 'HDDP' variable maybe become larger and larger.
+ // If the user try to boot many OS in different HDs or partitions, in theory,
+ // the HD_BOOT_DEVICE_PATH_VARIABLE_NAME variable maybe become larger and larger.
//
InstanceNum = 0;
ASSERT (CachedDevicePath != NULL);
@@ -1072,8 +1056,8 @@ BdsExpandPartitionPartialDevicePathToFull ( // Save the matching Device Path so we don't need to do a connect all next time
//
Status = gRT->SetVariable (
- L"HDDP",
- &mHdBootVariablePrivateGuid,
+ HD_BOOT_DEVICE_PATH_VARIABLE_NAME,
+ &gHdBootDevicePathVariablGuid,
EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,
GetDevicePathSize (CachedDevicePath),
CachedDevicePath
@@ -1495,7 +1479,7 @@ BdsLibEnumerateAllBootOption ( // device from the boot order variable
//
if (mEnumBootDevice) {
- LastLang = GetVariable (L"LastEnumLang", &mBdsLibLastLangGuid);
+ LastLang = GetVariable (LAST_ENUM_LANGUAGE_VARIABLE_NAME, &gLastEnumLangGuid);
PlatLang = GetEfiGlobalVariable (L"PlatformLang");
ASSERT (PlatLang != NULL);
if ((LastLang != NULL) && (AsciiStrCmp (LastLang, PlatLang) == 0)) {
@@ -1505,8 +1489,8 @@ BdsLibEnumerateAllBootOption ( return Status;
} else {
Status = gRT->SetVariable (
- L"LastEnumLang",
- &mBdsLibLastLangGuid,
+ LAST_ENUM_LANGUAGE_VARIABLE_NAME,
+ &gLastEnumLangGuid,
EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_NON_VOLATILE,
AsciiStrSize (PlatLang),
PlatLang
diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf b/IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf index e460f70a80..3557444b93 100644 --- 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)
gEfiUartDevicePathGuid ## CONSUMES ## GUID (Identify the device path for UARD device)
gEfiSasDevicePathGuid ## CONSUMES ## GUID (Identify the device path for SAS device)
+ gLastEnumLangGuid ## SOMETIMES_PRODUCES ## Variable:L"LastEnumLang" (Platform language at last time enumeration.)
+ gHdBootDevicePathVariablGuid ## SOMETIMES_PRODUCES ## Variable:L"HDDP" (The device path of Boot file on Hard device.)
+ gBdsLibStringPackageGuid ## PRODUCES ## GUID (HII String PackageList Guid)
[Protocols]
gEfiSimpleFileSystemProtocolGuid # PROTOCOL CONSUMES
diff --git a/IntelFrameworkModulePkg/Library/GenericBdsLib/InternalBdsLib.h b/IntelFrameworkModulePkg/Library/GenericBdsLib/InternalBdsLib.h index 82cfe75f22..c674683dc8 100644 --- 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>
#include <Guid/PcAnsi.h>
#include <Guid/Performance.h>
+#include <Guid/BdsLibHii.h>
+#include <Guid/HdBootVariable.h>
+#include <Guid/LastEnumLang.h>
#include <Library/PrintLib.h>
#include <Library/DebugLib.h>
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/Bds.h b/IntelFrameworkModulePkg/Universal/BdsDxe/Bds.h index bbb5332456..1f2d64d2cf 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/Bds.h +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/Bds.h @@ -1,7 +1,7 @@ /** @file
Head file for BDS Architectural Protocol implementation
-Copyright (c) 2004 - 2009, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 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/GlobalVariable.h>
#include <Guid/CapsuleVendor.h>
#include <Guid/StatusCodeDataTypeId.h>
+#include <Guid/LegacyDevOrder.h>
+#include <Guid/BdsHii.h>
#include <Protocol/GenericMemoryTest.h>
#include <Protocol/FormBrowser2.h>
#include <Protocol/HiiConfigAccess.h>
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf b/IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf index 852946193c..916d2af454 100644 --- 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)
gEfiIfrTianoGuid ## CONSUMES ## GUID (Extended IFR Guid Opcode)
gEfiHiiDriverHealthFormsetGuid ## CONSUMES ## GUID (Indicate the Driver Health formset class guid to be displayed)
-
+ gEfiLegacyDevOrderVariableGuid ## SOMETIMES_PRODUCES ## Variable:L"LegacyDevOrder"
+ gFrontPageFormSetGuid ## PRODUCES ## FrontPage HII Package
+ gBootMaintFormSetGuid ## SOMETIMES_PRODUCES ## BootMaint HII Package
+ gFileExploreFormSetGuid ## SOMETIMES_PRODUCES ## FileExplore HII Package
+ gBootManagerFormSetGuid ## SOMETIMES_PRODUCES ## BootManager HII Package
+ gDeviceManagerFormSetGuid ## SOMETIMES_PRODUCES ## DeviceManager HII Package
+ gDriverHealthFormSetGuid ## SOMETIMES_PRODUCES ## DriverHealth HII Package
+
[Protocols]
gEfiSimpleFileSystemProtocolGuid ## PROTOCOL CONSUMES
gEfiLoadFileProtocolGuid ## PROTOCOL CONSUMES
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.c index 24b7c1364a..a4b6b53a06 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.c +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BBSsupport.c @@ -1046,7 +1046,7 @@ BdsFillDevOrderBuf ( @param BbsCount The BBS Count.
@retval EFI_SUCCES The buffer is created and the EFI variable named
- VAR_LEGACY_DEV_ORDER and EfiLegacyDevOrderGuid is
+ VAR_LEGACY_DEV_ORDER and gEfiLegacyDevOrderVariableGuid is
set correctly.
@retval EFI_OUT_OF_RESOURCES Memmory or storage is not enough.
@retval EFI_DEVICE_ERROR Fail to add the device order into EFI variable fail
@@ -1066,8 +1066,8 @@ BdsCreateDevOrder ( UINTN BEVCount;
UINTN TotalSize;
UINTN HeaderSize;
- BM_LEGACY_DEV_ORDER_CONTEXT *DevOrder;
- BM_LEGACY_DEV_ORDER_CONTEXT *DevOrderPtr;
+ LEGACY_DEV_ORDER_ENTRY *DevOrder;
+ LEGACY_DEV_ORDER_ENTRY *DevOrderPtr;
EFI_STATUS Status;
FDCount = 0;
@@ -1131,23 +1131,23 @@ BdsCreateDevOrder ( DevOrderPtr->BbsType = BBS_FLOPPY;
DevOrderPtr->Length = (UINT16) (sizeof (DevOrderPtr->Length) + FDCount * sizeof (UINT16));
- DevOrderPtr = (BM_LEGACY_DEV_ORDER_CONTEXT *) BdsFillDevOrderBuf (BbsTable, BBS_FLOPPY, BbsCount, DevOrderPtr->Data);
+ DevOrderPtr = (LEGACY_DEV_ORDER_ENTRY *) BdsFillDevOrderBuf (BbsTable, BBS_FLOPPY, BbsCount, DevOrderPtr->Data);
DevOrderPtr->BbsType = BBS_HARDDISK;
DevOrderPtr->Length = (UINT16) (sizeof (UINT16) + HDCount * sizeof (UINT16));
- DevOrderPtr = (BM_LEGACY_DEV_ORDER_CONTEXT *) BdsFillDevOrderBuf (BbsTable, BBS_HARDDISK, BbsCount, DevOrderPtr->Data);
+ DevOrderPtr = (LEGACY_DEV_ORDER_ENTRY *) BdsFillDevOrderBuf (BbsTable, BBS_HARDDISK, BbsCount, DevOrderPtr->Data);
DevOrderPtr->BbsType = BBS_CDROM;
DevOrderPtr->Length = (UINT16) (sizeof (UINT16) + CDCount * sizeof (UINT16));
- DevOrderPtr = (BM_LEGACY_DEV_ORDER_CONTEXT *) BdsFillDevOrderBuf (BbsTable, BBS_CDROM, BbsCount, DevOrderPtr->Data);
+ DevOrderPtr = (LEGACY_DEV_ORDER_ENTRY *) BdsFillDevOrderBuf (BbsTable, BBS_CDROM, BbsCount, DevOrderPtr->Data);
DevOrderPtr->BbsType = BBS_EMBED_NETWORK;
DevOrderPtr->Length = (UINT16) (sizeof (UINT16) + NETCount * sizeof (UINT16));
- DevOrderPtr = (BM_LEGACY_DEV_ORDER_CONTEXT *) BdsFillDevOrderBuf (BbsTable, BBS_EMBED_NETWORK, BbsCount, DevOrderPtr->Data);
+ DevOrderPtr = (LEGACY_DEV_ORDER_ENTRY *) BdsFillDevOrderBuf (BbsTable, BBS_EMBED_NETWORK, BbsCount, DevOrderPtr->Data);
DevOrderPtr->BbsType = BBS_BEV_DEVICE;
DevOrderPtr->Length = (UINT16) (sizeof (UINT16) + BEVCount * sizeof (UINT16));
- DevOrderPtr = (BM_LEGACY_DEV_ORDER_CONTEXT *) BdsFillDevOrderBuf (BbsTable, BBS_BEV_DEVICE, BbsCount, DevOrderPtr->Data);
+ DevOrderPtr = (LEGACY_DEV_ORDER_ENTRY *) BdsFillDevOrderBuf (BbsTable, BBS_BEV_DEVICE, BbsCount, DevOrderPtr->Data);
ASSERT (TotalSize == (UINTN) ((UINT8 *) DevOrderPtr - (UINT8 *) DevOrder));
@@ -1156,7 +1156,7 @@ BdsCreateDevOrder ( //
Status = gRT->SetVariable (
VAR_LEGACY_DEV_ORDER,
- &EfiLegacyDevOrderGuid,
+ &gEfiLegacyDevOrderVariableGuid,
VAR_FLAG,
TotalSize,
DevOrder
@@ -1182,10 +1182,10 @@ BdsUpdateLegacyDevOrder ( VOID
)
{
- BM_LEGACY_DEV_ORDER_CONTEXT *DevOrder;
- BM_LEGACY_DEV_ORDER_CONTEXT *NewDevOrder;
- BM_LEGACY_DEV_ORDER_CONTEXT *Ptr;
- BM_LEGACY_DEV_ORDER_CONTEXT *NewPtr;
+ LEGACY_DEV_ORDER_ENTRY *DevOrder;
+ LEGACY_DEV_ORDER_ENTRY *NewDevOrder;
+ LEGACY_DEV_ORDER_ENTRY *Ptr;
+ LEGACY_DEV_ORDER_ENTRY *NewPtr;
UINTN DevOrderSize;
EFI_LEGACY_BIOS_PROTOCOL *LegacyBios;
EFI_STATUS Status;
@@ -1248,7 +1248,7 @@ BdsUpdateLegacyDevOrder ( DevOrder = BdsLibGetVariableAndSize (
VAR_LEGACY_DEV_ORDER,
- &EfiLegacyDevOrderGuid,
+ &gEfiLegacyDevOrderVariableGuid,
&DevOrderSize
);
if (NULL == DevOrder) {
@@ -1326,8 +1326,8 @@ BdsUpdateLegacyDevOrder ( //
// copy HD
//
- Ptr = (BM_LEGACY_DEV_ORDER_CONTEXT *) (&Ptr->Data[Ptr->Length / sizeof (UINT16) - 1]);
- NewPtr = (BM_LEGACY_DEV_ORDER_CONTEXT *) (&NewPtr->Data[NewPtr->Length / sizeof (UINT16) -1]);
+ Ptr = (LEGACY_DEV_ORDER_ENTRY *) (&Ptr->Data[Ptr->Length / sizeof (UINT16) - 1]);
+ NewPtr = (LEGACY_DEV_ORDER_ENTRY *) (&NewPtr->Data[NewPtr->Length / sizeof (UINT16) -1]);
NewPtr->BbsType = Ptr->BbsType;
NewPtr->Length = (UINT16) (sizeof (UINT16) + HDCount * sizeof (UINT16));
for (Index = 0; Index < Ptr->Length / sizeof (UINT16) - 1; Index++) {
@@ -1347,8 +1347,8 @@ BdsUpdateLegacyDevOrder ( //
// copy CD
//
- Ptr = (BM_LEGACY_DEV_ORDER_CONTEXT *) (&Ptr->Data[Ptr->Length / sizeof (UINT16) - 1]);
- NewPtr = (BM_LEGACY_DEV_ORDER_CONTEXT *) (&NewPtr->Data[NewPtr->Length / sizeof (UINT16) -1]);
+ Ptr = (LEGACY_DEV_ORDER_ENTRY *) (&Ptr->Data[Ptr->Length / sizeof (UINT16) - 1]);
+ NewPtr = (LEGACY_DEV_ORDER_ENTRY *) (&NewPtr->Data[NewPtr->Length / sizeof (UINT16) -1]);
NewPtr->BbsType = Ptr->BbsType;
NewPtr->Length = (UINT16) (sizeof (UINT16) + CDCount * sizeof (UINT16));
for (Index = 0; Index < Ptr->Length / sizeof (UINT16) - 1; Index++) {
@@ -1368,8 +1368,8 @@ BdsUpdateLegacyDevOrder ( //
// copy NET
//
- Ptr = (BM_LEGACY_DEV_ORDER_CONTEXT *) (&Ptr->Data[Ptr->Length / sizeof (UINT16) - 1]);
- NewPtr = (BM_LEGACY_DEV_ORDER_CONTEXT *) (&NewPtr->Data[NewPtr->Length / sizeof (UINT16) -1]);
+ Ptr = (LEGACY_DEV_ORDER_ENTRY *) (&Ptr->Data[Ptr->Length / sizeof (UINT16) - 1]);
+ NewPtr = (LEGACY_DEV_ORDER_ENTRY *) (&NewPtr->Data[NewPtr->Length / sizeof (UINT16) -1]);
NewPtr->BbsType = Ptr->BbsType;
NewPtr->Length = (UINT16) (sizeof (UINT16) + NETCount * sizeof (UINT16));
for (Index = 0; Index < Ptr->Length / sizeof (UINT16) - 1; Index++) {
@@ -1389,8 +1389,8 @@ BdsUpdateLegacyDevOrder ( //
// copy BEV
//
- Ptr = (BM_LEGACY_DEV_ORDER_CONTEXT *) (&Ptr->Data[Ptr->Length / sizeof (UINT16) - 1]);
- NewPtr = (BM_LEGACY_DEV_ORDER_CONTEXT *) (&NewPtr->Data[NewPtr->Length / sizeof (UINT16) -1]);
+ Ptr = (LEGACY_DEV_ORDER_ENTRY *) (&Ptr->Data[Ptr->Length / sizeof (UINT16) - 1]);
+ NewPtr = (LEGACY_DEV_ORDER_ENTRY *) (&NewPtr->Data[NewPtr->Length / sizeof (UINT16) -1]);
NewPtr->BbsType = Ptr->BbsType;
NewPtr->Length = (UINT16) (sizeof (UINT16) + BEVCount * sizeof (UINT16));
for (Index = 0; Index < Ptr->Length / sizeof (UINT16) - 1; Index++) {
@@ -1477,7 +1477,7 @@ BdsUpdateLegacyDevOrder ( Status = gRT->SetVariable (
VAR_LEGACY_DEV_ORDER,
- &EfiLegacyDevOrderGuid,
+ &gEfiLegacyDevOrderVariableGuid,
VAR_FLAG,
TotalSize,
NewDevOrder
@@ -1508,14 +1508,14 @@ BdsSetBootPriority4SameTypeDev ( IN OUT UINT16 *Priority
)
{
- BM_LEGACY_DEV_ORDER_CONTEXT *DevOrder;
- BM_LEGACY_DEV_ORDER_CONTEXT *DevOrderPtr;
+ LEGACY_DEV_ORDER_ENTRY *DevOrder;
+ LEGACY_DEV_ORDER_ENTRY *DevOrderPtr;
UINTN DevOrderSize;
UINTN Index;
DevOrder = BdsLibGetVariableAndSize (
VAR_LEGACY_DEV_ORDER,
- &EfiLegacyDevOrderGuid,
+ &gEfiLegacyDevOrderVariableGuid,
&DevOrderSize
);
if (NULL == DevOrder) {
@@ -1528,7 +1528,7 @@ BdsSetBootPriority4SameTypeDev ( break;
}
- DevOrderPtr = (BM_LEGACY_DEV_ORDER_CONTEXT *) ((UINT8 *) DevOrderPtr + sizeof (BBS_TYPE) + DevOrderPtr->Length);
+ DevOrderPtr = (LEGACY_DEV_ORDER_ENTRY *) ((UINT8 *) DevOrderPtr + sizeof (BBS_TYPE) + DevOrderPtr->Length);
}
if ((UINT8 *) DevOrderPtr >= (UINT8 *) DevOrder + DevOrderSize) {
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.c index 35c965f316..4c8e3c8a4d 100644 --- 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)
}
},
- //
- // {165A028F-0BB2-4b5f-8747-77592E3F6499}
- //
- { 0x165a028f, 0xbb2, 0x4b5f, { 0x87, 0x47, 0x77, 0x59, 0x2e, 0x3f, 0x64, 0x99 } }
+ BOOT_MAINT_FORMSET_GUID
},
{
END_DEVICE_PATH_TYPE,
@@ -63,10 +60,7 @@ HII_VENDOR_DEVICE_PATH mFeHiiVendorDevicePath = { (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)
}
},
- //
- // {91DB4238-B0C8-472e-BBCF-F3A6541010F4}
- //
- { 0x91db4238, 0xb0c8, 0x472e, { 0xbb, 0xcf, 0xf3, 0xa6, 0x54, 0x10, 0x10, 0xf4 } }
+ FILE_EXPLORE_FORMSET_GUID
},
{
END_DEVICE_PATH_TYPE,
@@ -78,10 +72,6 @@ HII_VENDOR_DEVICE_PATH mFeHiiVendorDevicePath = { }
};
-EFI_GUID EfiLegacyDevOrderGuid = EFI_LEGACY_DEV_ORDER_VARIABLE_GUID;
-EFI_GUID mBootMaintGuid = BOOT_MAINT_FORMSET_GUID;
-EFI_GUID mFileExplorerGuid = FILE_EXPLORE_FORMSET_GUID;
-
CHAR16 mBootMaintStorageName[] = L"BmmData";
CHAR16 mFileExplorerStorageName[] = L"FeData";
@@ -194,7 +184,7 @@ BootMaintExtractConfig ( }
*Progress = Request;
- if ((Request != NULL) && !HiiIsConfigHdrMatch (Request, &mBootMaintGuid, mBootMaintStorageName)) {
+ if ((Request != NULL) && !HiiIsConfigHdrMatch (Request, &gBootMaintFormSetGuid, mBootMaintStorageName)) {
return EFI_NOT_FOUND;
}
@@ -215,7 +205,7 @@ BootMaintExtractConfig ( // Allocate and fill a buffer large enough to hold the <ConfigHdr> template
// followed by "&OFFSET=0&WIDTH=WWWWWWWWWWWWWWWW" followed by a Null-terminator
//
- ConfigRequestHdr = HiiConstructConfigHdr (&mBootMaintGuid, mBootMaintStorageName, Private->BmmDriverHandle);
+ ConfigRequestHdr = HiiConstructConfigHdr (&gBootMaintFormSetGuid, mBootMaintStorageName, Private->BmmDriverHandle);
Size = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16);
ConfigRequest = AllocateZeroPool (Size);
ASSERT (ConfigRequest != NULL);
@@ -319,7 +309,7 @@ BootMaintCallback ( // Retrive uncommitted data from Form Browser
//
CurrentFakeNVMap = &Private->BmmFakeNvData;
- HiiGetBrowserData (&mBootMaintGuid, mBootMaintStorageName, sizeof (BMM_FAKE_NV_DATA), (UINT8 *) CurrentFakeNVMap);
+ HiiGetBrowserData (&gBootMaintFormSetGuid, mBootMaintStorageName, sizeof (BMM_FAKE_NV_DATA), (UINT8 *) CurrentFakeNVMap);
//
// need to be subtituded.
@@ -630,7 +620,7 @@ BootMaintCallback ( //
// Pass changed uncommitted data back to Form Browser
//
- Status = HiiSetBrowserData (&mBootMaintGuid, mBootMaintStorageName, sizeof (BMM_FAKE_NV_DATA), (UINT8 *) CurrentFakeNVMap, NULL);
+ Status = HiiSetBrowserData (&gBootMaintFormSetGuid, mBootMaintStorageName, sizeof (BMM_FAKE_NV_DATA), (UINT8 *) CurrentFakeNVMap, NULL);
return Status;
}
@@ -985,7 +975,7 @@ InitializeBM ( // Post our Boot Maint VFR binary to the HII database.
//
BmmCallbackInfo->BmmHiiHandle = HiiAddPackages (
- &mBootMaintGuid,
+ &gBootMaintFormSetGuid,
BmmCallbackInfo->BmmDriverHandle,
BmBin,
BdsDxeStrings,
@@ -997,7 +987,7 @@ InitializeBM ( // Post our File Explorer VFR binary to the HII database.
//
BmmCallbackInfo->FeHiiHandle = HiiAddPackages (
- &mFileExplorerGuid,
+ &gFileExploreFormSetGuid,
BmmCallbackInfo->FeDriverHandle,
FEBin,
BdsDxeStrings,
@@ -1109,7 +1099,7 @@ InitializeBM ( HiiUpdateForm (
BmmCallbackInfo->BmmHiiHandle,
- &mBootMaintGuid,
+ &gBootMaintFormSetGuid,
FORM_BOOT_SETUP_ID,
mStartOpCodeHandle, // Label FORM_BOOT_LEGACY_DEVICE_ID
mEndOpCodeHandle // LABEL_END
@@ -1399,7 +1389,7 @@ FormSetDispatcher ( gFormBrowser2,
&CallbackData->BmmHiiHandle,
1,
- &mBootMaintGuid,
+ &gBootMaintFormSetGuid,
0,
NULL,
&ActionRequest
@@ -1421,7 +1411,7 @@ FormSetDispatcher ( gFormBrowser2,
&CallbackData->FeHiiHandle,
1,
- &mFileExplorerGuid,
+ &gFileExploreFormSetGuid,
0,
NULL,
&ActionRequest
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.h b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootMaint.h index 67eaeec011..57acf85541 100644 --- 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. //
// Constants which are variable names used to access variables
//
-#define VAR_LEGACY_DEV_ORDER L"LegacyDevOrder"
-
#define VAR_CON_OUT_MODE L"ConOutMode"
-///
-/// Guid of a NV Variable which store the information about the
-/// FD/HD/CD/NET/BEV order
-///
-#define EFI_LEGACY_DEV_ORDER_VARIABLE_GUID \
- { \
- 0xa56074db, 0x65fe, 0x45f7, {0xbd, 0x21, 0x2d, 0x2b, 0xdd, 0x8e, 0x96, 0x52} \
- }
-
//
// String Contant
//
@@ -55,8 +44,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. //
#define VAR_FLAG EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE
-extern EFI_GUID mBootMaintGuid;
-extern EFI_GUID mFileExplorerGuid;
extern CHAR16 mFileExplorerStorageName[];
extern CHAR16 mBootMaintStorageName[];
//
@@ -85,8 +72,6 @@ extern UINT8 FEBin[]; //
// Enumeration type definition
//
-typedef UINT8 BBS_TYPE;
-
typedef enum _TYPE_OF_TERMINAL {
TerminalTypePcAnsi = 0,
TerminalTypeVt100,
@@ -263,15 +248,6 @@ typedef struct { UINT16 BbsIndex;
UINT16 BbsType;
} BOOT_OPTION_BBS_MAPPING;
-
-typedef struct {
- BBS_TYPE BbsType;
- ///
- /// Length = sizeof (UINT16) + SIZEOF (Data)
- ///
- UINT16 Length;
- UINT16 Data[1];
-} BM_LEGACY_DEV_ORDER_CONTEXT;
#pragma pack()
typedef struct {
@@ -967,14 +943,14 @@ Var_UpdateDriverOrder ( );
/**
- Update the legacy BBS boot option. L"LegacyDevOrder" and EfiLegacyDevOrderGuid EFI Variable
+ Update the legacy BBS boot option. VAR_LEGACY_DEV_ORDER and gEfiLegacyDevOrderVariableGuid EFI Variable
is udpated with the new Legacy Boot order. The EFI Variable of "Boot####" and gEfiGlobalVariableGuid
is also updated.
@param CallbackData The context data for BMM.
@return EFI_SUCCESS The function completed successfully.
- @retval EFI_NOT_FOUND If L"LegacyDevOrder" and EfiLegacyDevOrderGuid EFI Variable can not be found.
+ @retval EFI_NOT_FOUND If VAR_LEGACY_DEV_ORDER and gEfiLegacyDevOrderVariableGuid EFI Variable can not be found.
**/
EFI_STATUS
@@ -1566,7 +1542,6 @@ extern STRING_DEPOSITORY *DriverOptionStrDepository; extern STRING_DEPOSITORY *DriverOptionHelpStrDepository;
extern STRING_DEPOSITORY *TerminalStrDepository;
extern EFI_DEVICE_PATH_PROTOCOL EndDevicePath[];
-extern EFI_GUID EfiLegacyDevOrderGuid;
extern UINT16 mFlowControlType[2];
extern UINT32 mFlowControlValue[2];
//
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c index e078a722d8..8ff5fa0a16 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FileExplorer.c @@ -82,7 +82,7 @@ UpdateFileExplorePage ( HiiUpdateForm (
CallbackData->FeHiiHandle,
- &mFileExplorerGuid,
+ &gFileExploreFormSetGuid,
FORM_FILE_EXPLORER_ID,
mStartOpCodeHandle, // Label FORM_FILE_EXPLORER_ID
mEndOpCodeHandle // LABEL_END
@@ -191,7 +191,7 @@ UpdateFileExplorer ( HiiUpdateForm (
CallbackData->FeHiiHandle,
- &mFileExplorerGuid,
+ &gFileExploreFormSetGuid,
FormId,
mStartOpCodeHandle, // Label FormId
mEndOpCodeHandle // LABEL_END
@@ -262,7 +262,7 @@ FileExplorerCallback ( // Retrieve uncommitted data from Form Browser
//
NvRamMap = &Private->FeFakeNvData;
- HiiGetBrowserData (&mFileExplorerGuid, mFileExplorerStorageName, sizeof (FILE_EXPLORER_NV_DATA), (UINT8 *) NvRamMap);
+ HiiGetBrowserData (&gFileExploreFormSetGuid, mFileExplorerStorageName, sizeof (FILE_EXPLORER_NV_DATA), (UINT8 *) NvRamMap);
if (QuestionId == KEY_VALUE_SAVE_AND_EXIT_BOOT || QuestionId == KEY_VALUE_SAVE_AND_EXIT_DRIVER) {
//
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FormGuid.h b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/FormGuid.h index d55981ca20..1087db8472 100644 --- 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_
#define _FORM_GUID_H_
-#define BOOT_MAINT_FORMSET_GUID \
- { \
- 0x642237c7, 0x35d4, 0x472d, {0x83, 0x65, 0x12, 0xe0, 0xcc, 0xf2, 0x7a, 0x22} \
- }
-
-#define FILE_EXPLORE_FORMSET_GUID \
- { \
- 0x1f2d63e1, 0xfebd, 0x4dc7, {0x9c, 0xc5, 0xba, 0x2b, 0x1c, 0xef, 0x9c, 0x5b} \
- }
+#include <Guid/BdsHii.h>
#define FORM_MAIN_ID 0x1001
#define FORM_BOOT_ADD_ID 0x1002
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c index ece88524cb..f77b9f82ed 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/UpdatePage.c @@ -123,7 +123,7 @@ UpdatePageEnd ( HiiUpdateForm (
CallbackData->BmmHiiHandle,
- &mBootMaintGuid,
+ &gBootMaintFormSetGuid,
CallbackData->BmmCurrentPageId,
mStartOpCodeHandle, // Label CallbackData->BmmCurrentPageId
mEndOpCodeHandle // LABEL_END
@@ -151,7 +151,7 @@ CleanUpPage ( mStartLabel->Number = LabelId;
HiiUpdateForm (
CallbackData->BmmHiiHandle,
- &mBootMaintGuid,
+ &gBootMaintFormSetGuid,
LabelId,
mStartOpCodeHandle, // Label LabelId
mEndOpCodeHandle // LABEL_END
@@ -1251,7 +1251,7 @@ UpdateSetLegacyDeviceOrderPage ( IN BMM_CALLBACK_DATA *CallbackData
)
{
- BM_LEGACY_DEV_ORDER_CONTEXT *DevOrder;
+ LEGACY_DEV_ORDER_ENTRY *DevOrder;
BM_MENU_OPTION *OptionMenu;
BM_MENU_ENTRY *NewMenuEntry;
EFI_STRING_ID StrRef;
@@ -1382,12 +1382,12 @@ UpdateSetLegacyDeviceOrderPage ( //
VarData = BdsLibGetVariableAndSize (
VAR_LEGACY_DEV_ORDER,
- &EfiLegacyDevOrderGuid,
+ &gEfiLegacyDevOrderVariableGuid,
&VarSize
);
if (NULL != VarData) {
- DevOrder = (BM_LEGACY_DEV_ORDER_CONTEXT *) VarData;
+ DevOrder = (LEGACY_DEV_ORDER_ENTRY *) VarData;
while (VarData < VarData + VarSize) {
if (DevOrder->BbsType == BbsType) {
break;
@@ -1395,7 +1395,7 @@ UpdateSetLegacyDeviceOrderPage ( VarData += sizeof (BBS_TYPE);
VarData += *(UINT16 *) VarData;
- DevOrder = (BM_LEGACY_DEV_ORDER_CONTEXT *) VarData;
+ DevOrder = (LEGACY_DEV_ORDER_ENTRY *) VarData;
}
//
// Create oneof tag here for FD/HD/CD #1 #2
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Variable.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Variable.c index cf5d295c84..6e6c7266d0 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Variable.c +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/Variable.c @@ -1071,14 +1071,14 @@ Var_UpdateDriverOrder ( }
/**
- Update the legacy BBS boot option. L"LegacyDevOrder" and EfiLegacyDevOrderGuid EFI Variable
+ Update the legacy BBS boot option. VAR_LEGACY_DEV_ORDER and gEfiLegacyDevOrderVariableGuid EFI Variable
is udpated with the new Legacy Boot order. The EFI Variable of "Boot####" and gEfiGlobalVariableGuid
is also updated.
@param CallbackData The context data for BMM.
@return EFI_SUCCESS The function completed successfully.
- @retval EFI_NOT_FOUND If L"LegacyDevOrder" and EfiLegacyDevOrderGuid EFI Variable can be found.
+ @retval EFI_NOT_FOUND If VAR_LEGACY_DEV_ORDER and gEfiLegacyDevOrderVariableGuid EFI Variable can be found.
@retval EFI_OUT_OF_RESOURCES Fail to allocate memory resource
**/
EFI_STATUS
@@ -1097,7 +1097,7 @@ Var_UpdateBBSOption ( UINT8 *LegacyDev;
UINT8 *VarData;
UINTN VarSize;
- BM_LEGACY_DEV_ORDER_CONTEXT *DevOrder;
+ LEGACY_DEV_ORDER_ENTRY *DevOrder;
UINT8 *OriginalPtr;
UINT8 *DisMap;
UINTN Pos;
@@ -1155,7 +1155,7 @@ Var_UpdateBBSOption ( //
VarData = (UINT8 *) BdsLibGetVariableAndSize (
VAR_LEGACY_DEV_ORDER,
- &EfiLegacyDevOrderGuid,
+ &gEfiLegacyDevOrderVariableGuid,
&VarSize
);
@@ -1164,7 +1164,7 @@ Var_UpdateBBSOption ( }
OriginalPtr = VarData;
- DevOrder = (BM_LEGACY_DEV_ORDER_CONTEXT *) VarData;
+ DevOrder = (LEGACY_DEV_ORDER_ENTRY *) VarData;
while (VarData < OriginalPtr + VarSize) {
if (DevOrder->BbsType == CallbackData->BbsType) {
@@ -1172,7 +1172,7 @@ Var_UpdateBBSOption ( }
VarData += sizeof (BBS_TYPE) + DevOrder->Length;
- DevOrder = (BM_LEGACY_DEV_ORDER_CONTEXT *) VarData;
+ DevOrder = (LEGACY_DEV_ORDER_ENTRY *) VarData;
}
if (VarData >= OriginalPtr + VarSize) {
@@ -1218,7 +1218,7 @@ Var_UpdateBBSOption ( Status = gRT->SetVariable (
VAR_LEGACY_DEV_ORDER,
- &EfiLegacyDevOrderGuid,
+ &gEfiLegacyDevOrderVariableGuid,
VAR_FLAG,
VarSize,
OriginalPtr
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.c index eddb189900..0a7561b187 100644 --- 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"
UINT16 mKeyInput;
-EFI_GUID mBootManagerGuid = BOOT_MANAGER_FORMSET_GUID;
LIST_ENTRY mBootOptionsList;
BDS_COMMON_OPTION *gOption;
CHAR16 *mDeviceTypeStr[] = {
@@ -40,10 +39,7 @@ HII_VENDOR_DEVICE_PATH mBootManagerHiiVendorDevicePath = { (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)
}
},
- //
- // {1DDDBE15-481D-4d2b-8277-B191EAF66525}
- //
- { 0x1dddbe15, 0x481d, 0x4d2b, { 0x82, 0x77, 0xb1, 0x91, 0xea, 0xf6, 0x65, 0x25 } }
+ BOOT_MANAGER_FORMSET_GUID
},
{
END_DEVICE_PATH_TYPE,
@@ -175,7 +171,7 @@ InitializeBootManager ( // Publish our HII data
//
gBootManagerPrivate.HiiHandle = HiiAddPackages (
- &mBootManagerGuid,
+ &gBootManagerFormSetGuid,
gBootManagerPrivate.DriverHandle,
BootManagerVfrBin,
BdsDxeStrings,
@@ -338,7 +334,7 @@ CallBootManager ( HiiUpdateForm (
HiiHandle,
- &mBootManagerGuid,
+ &gBootManagerFormSetGuid,
BOOT_MANAGER_FORM_ID,
StartOpCodeHandle,
EndOpCodeHandle
@@ -352,7 +348,7 @@ CallBootManager ( gFormBrowser2,
&HiiHandle,
1,
- &mBootManagerGuid,
+ &gBootManagerFormSetGuid,
0,
NULL,
&ActionRequest
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.h b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.h index 395f568efd..e26147183a 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.h +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManager.h @@ -1,7 +1,7 @@ /** @file
The platform boot manager reference implement
-Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 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
@@ -18,14 +18,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include "Bds.h"
#include "FrontPage.h"
-//
-// These are defined as the same with vfr file
-//
-#define BOOT_MANAGER_FORMSET_GUID \
- { \
- 0x847bc3fe, 0xb974, 0x446d, {0x94, 0x49, 0x5a, 0xd5, 0x41, 0x2e, 0x99, 0x3b} \
- }
-
#define BOOT_MANAGER_FORM_ID 0x1000
#define LABEL_BOOT_OPTION 0x00
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManagerVfr.Vfr b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManagerVfr.Vfr index 1f7dd675e8..293e4e7832 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManagerVfr.Vfr +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr/BootManagerVfr.Vfr @@ -2,7 +2,7 @@ //
// Browser formset.
//
-// Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2004 - 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
@@ -13,7 +13,7 @@ //
//**/
-#define FORMSET_GUID { 0x847bc3fe, 0xb974, 0x446d, 0x94, 0x49, 0x5a, 0xd5, 0x41, 0x2e, 0x99, 0x3b }
+#include <Guid/BdsHii.h>
#define BOOT_MANAGER_FORM_ID 0x1000
@@ -24,10 +24,10 @@ #define BOOT_MANAGER_SUBCLASS 0x00
formset
- guid = FORMSET_GUID,
+ guid = BOOT_MANAGER_FORMSET_GUID,
title = STRING_TOKEN(STR_BM_BANNER),
help = STRING_TOKEN(STR_LAST_STRING),
- classguid = FORMSET_GUID,
+ classguid = BOOT_MANAGER_FORMSET_GUID,
class = BOOT_MANAGER_CLASS,
subclass = BOOT_MANAGER_SUBCLASS,
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c b/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c index 1857ffa0a1..95a027d158 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c @@ -34,9 +34,6 @@ DEVICE_MANAGER_CALLBACK_DATA gDeviceManagerPrivate = { #define MAX_MAC_ADDRESS_NODE_LIST_LEN 10
-EFI_GUID mDeviceManagerGuid = DEVICE_MANAGER_FORMSET_GUID;
-EFI_GUID mDriverHealthGuid = DRIVER_HEALTH_FORMSET_GUID;
-
//
// Which Mac Address string is select
// it will decide what menu need to show in the NETWORK_DEVICE_FORM_ID form.
@@ -72,10 +69,7 @@ HII_VENDOR_DEVICE_PATH mDeviceManagerHiiVendorDevicePath = { (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)
}
},
- //
- // {102579A0-3686-466e-ACD8-80C087044F4A}
- //
- { 0x102579a0, 0x3686, 0x466e, { 0xac, 0xd8, 0x80, 0xc0, 0x87, 0x4, 0x4f, 0x4a } }
+ DEVICE_MANAGER_FORMSET_GUID
},
{
END_DEVICE_PATH_TYPE,
@@ -97,10 +91,7 @@ HII_VENDOR_DEVICE_PATH mDriverHealthHiiVendorDevicePath = { (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)
}
},
- //
- // {D8F76651-1675-4986-BED4-3824B2F1F4C8}
- //
- { 0xd8f76651, 0x1675, 0x4986, { 0xbe, 0xd4, 0x38, 0x24, 0xb2, 0xf1, 0xf4, 0xc8 } }
+ DRIVER_HEALTH_FORMSET_GUID
},
{
END_DEVICE_PATH_TYPE,
@@ -775,7 +766,7 @@ CallDeviceManager ( // Publish our HII data.
//
HiiHandle = HiiAddPackages (
- &mDeviceManagerGuid,
+ &gDeviceManagerFormSetGuid,
gDeviceManagerPrivate.DriverHandle,
DeviceManagerVfrBin,
BdsDxeStrings,
@@ -980,7 +971,7 @@ CallDeviceManager ( HiiUpdateForm (
HiiHandle,
- &mDeviceManagerGuid,
+ &gDeviceManagerFormSetGuid,
mNextShowFormId,
StartOpCodeHandle,
EndOpCodeHandle
@@ -991,7 +982,7 @@ CallDeviceManager ( gFormBrowser2,
&HiiHandle,
1,
- &mDeviceManagerGuid,
+ &gDeviceManagerFormSetGuid,
mNextShowFormId,
NULL,
&ActionRequest
@@ -1181,7 +1172,7 @@ CallDriverHealth ( // Publish Driver Health HII data.
//
HiiHandle = HiiAddPackages (
- &mDeviceManagerGuid,
+ &gDeviceManagerFormSetGuid,
gDeviceManagerPrivate.DriverHealthHandle,
DriverHealthVfrBin,
BdsDxeStrings,
@@ -1379,7 +1370,7 @@ CallDriverHealth ( Status = HiiUpdateForm (
HiiHandle,
- &mDriverHealthGuid,
+ &gDriverHealthFormSetGuid,
DRIVER_HEALTH_FORM_ID,
StartOpCodeHandle,
EndOpCodeHandle
@@ -1389,7 +1380,7 @@ CallDriverHealth ( Status = HiiUpdateForm (
HiiHandle,
- &mDriverHealthGuid,
+ &gDriverHealthFormSetGuid,
DRIVER_HEALTH_FORM_ID,
StartOpCodeHandleRepair,
EndOpCodeHandleRepair
@@ -1402,7 +1393,7 @@ CallDriverHealth ( gFormBrowser2,
&HiiHandle,
1,
- &mDriverHealthGuid,
+ &gDriverHealthFormSetGuid,
DRIVER_HEALTH_FORM_ID,
NULL,
&ActionRequest
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManagerVfr.h b/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManagerVfr.h index 858b13e2cf..96e2c0a2cf 100644 --- 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_
#define _DEVICE_MANAGER_VFR_H_
-#define DEVICE_MANAGER_FORMSET_GUID \
- { \
- 0x3ebfa8e6, 0x511d, 0x4b5b, {0xa9, 0x5f, 0xfb, 0x38, 0x26, 0xf, 0x1c, 0x27} \
- }
-
-#define DRIVER_HEALTH_FORMSET_GUID \
- { \
- 0xf76e0a70, 0xb5ed, 0x4c38, {0xac, 0x9a, 0xe5, 0xf5, 0x4b, 0xf1, 0x6e, 0x34} \
- }
+#include <Guid/BdsHii.h>
#define LABEL_DEVICES_LIST 0x1100
#define LABEL_NETWORK_DEVICE_LIST_ID 0x1101
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.c index e8532ece06..63c14964bf 100644 --- 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"
#include "Hotkey.h"
-EFI_GUID mFrontPageGuid = FRONT_PAGE_FORMSET_GUID;
-
BOOLEAN gConnectAllHappened = FALSE;
UINTN gCallbackKey;
@@ -46,10 +44,7 @@ HII_VENDOR_DEVICE_PATH mFrontPageHiiVendorDevicePath = { (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)
}
},
- //
- // {8E6D99EE-7531-48f8-8745-7F6144468FF2}
- //
- { 0x8e6d99ee, 0x7531, 0x48f8, { 0x87, 0x45, 0x7f, 0x61, 0x44, 0x46, 0x8f, 0xf2 } }
+ FRONT_PAGE_FORMSET_GUID
},
{
END_DEVICE_PATH_TYPE,
@@ -128,8 +123,8 @@ FakeRouteConfig ( }
*Progress = Configuration;
- if (!HiiIsConfigHdrMatch (Configuration, &mBootMaintGuid, mBootMaintStorageName)
- && !HiiIsConfigHdrMatch (Configuration, &mFileExplorerGuid, mFileExplorerStorageName)) {
+ if (!HiiIsConfigHdrMatch (Configuration, &gBootMaintFormSetGuid, mBootMaintStorageName)
+ && !HiiIsConfigHdrMatch (Configuration, &gFileExploreFormSetGuid, mFileExplorerStorageName)) {
return EFI_NOT_FOUND;
}
@@ -357,7 +352,7 @@ InitializeFrontPage ( // Publish our HII data
//
gFrontPagePrivate.HiiHandle = HiiAddPackages (
- &mFrontPageGuid,
+ &gFrontPageFormSetGuid,
gFrontPagePrivate.DriverHandle,
FrontPageVfrBin,
BdsDxeStrings,
@@ -496,7 +491,7 @@ InitializeFrontPage ( Status = HiiUpdateForm (
HiiHandle,
- &mFrontPageGuid,
+ &gFrontPageFormSetGuid,
FRONT_PAGE_FORM_ID,
StartOpCodeHandle, // LABEL_SELECT_LANGUAGE
EndOpCodeHandle // LABEL_END
@@ -536,7 +531,7 @@ CallFrontPage ( gFormBrowser2,
&gFrontPagePrivate.HiiHandle,
1,
- &mFrontPageGuid,
+ &gFrontPageFormSetGuid,
0,
NULL,
&ActionRequest
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.h b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.h index 6b3dc29a91..a68eed9dbf 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.h +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPage.h @@ -1,7 +1,7 @@ /** @file
FrontPage routines to handle the callbacks and browser calls
-Copyright (c) 2004 - 2009, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 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
@@ -59,11 +59,6 @@ extern BOOLEAN gConnectAllHappened; #define LABEL_SELECT_LANGUAGE 0x1000
#define LABEL_END 0xffff
-#define FRONT_PAGE_FORMSET_GUID \
- { \
- 0x9e0c30bc, 0x3f06, 0x4ba6, {0x82, 0x88, 0x9, 0x17, 0x9b, 0x85, 0x5d, 0xbe} \
- }
-
#define FRONT_PAGE_CALLBACK_DATA_SIGNATURE SIGNATURE_32 ('F', 'P', 'C', 'B')
typedef struct {
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPageVfr.Vfr b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPageVfr.Vfr index ebb70dd67f..79ec796b64 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPageVfr.Vfr +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/FrontPageVfr.Vfr @@ -2,7 +2,7 @@ //
// Browser formset.
//
-// Copyright (c) 2007 - 2008, Intel Corporation. All rights reserved.<BR>
+// Copyright (c) 2007 - 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
@@ -13,7 +13,7 @@ //
//**/
-#define FORMSET_GUID { 0x9e0c30bc, 0x3f06, 0x4ba6, 0x82, 0x88, 0x9, 0x17, 0x9b, 0x85, 0x5d, 0xbe }
+#include <Guid/BdsHii.h>
#define FRONT_PAGE_CLASS 0x0000
#define FRONT_PAGE_SUBCLASS 0x0002
@@ -37,10 +37,10 @@ #define LABEL_END 0xffff
formset
- guid = FORMSET_GUID,
+ guid = FRONT_PAGE_FORMSET_GUID,
title = STRING_TOKEN(STR_FRONT_PAGE_TITLE),
help = STRING_TOKEN(STR_NULL_STRING),
- classguid = FORMSET_GUID,
+ classguid = FRONT_PAGE_FORMSET_GUID,
class = FRONT_PAGE_CLASS,
subclass = FRONT_PAGE_SUBCLASS,
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/String.h b/IntelFrameworkModulePkg/Universal/BdsDxe/String.h index 42b96adb02..005b2bdbd2 100644 --- a/IntelFrameworkModulePkg/Universal/BdsDxe/String.h +++ b/IntelFrameworkModulePkg/Universal/BdsDxe/String.h @@ -26,14 +26,6 @@ extern EFI_HII_HANDLE gStringPackHandle; extern UINT8 BdsDxeStrings[];
-//
-// String Definition Guid for BDS Platform
-//
-#define EFI_BDS_PLATFORM_GUID \
- { \
- 0x7777E939, 0xD57E, 0x4DCB, 0xA0, 0x8E, 0x64, 0xD7, 0x98, 0x57, 0x1E, 0x0F \
- }
-
/**
Get string by string id from HII Interface
diff --git a/IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/UpdateDispatcher.c b/IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/UpdateDispatcher.c index 177e79908e..99b8d3c358 100644 --- a/IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/UpdateDispatcher.c +++ b/IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/UpdateDispatcher.c @@ -18,7 +18,6 @@ #include "UpdateDriver.h"
-EFI_GUID UpdateDataGuid = EFI_UPDATE_DATA_FILE_GUID;
EFI_HII_HANDLE gHiiHandle;
/**
@@ -767,7 +766,7 @@ InitializeUpdateDriver ( FileBufferSize = 0;
Status = FwVolProtocol->ReadFile (
FwVolProtocol,
- &UpdateDataGuid,
+ &gEfiUpdateDataFileGuid,
(VOID **) &FileBuffer,
&FileBufferSize,
&FileType,
diff --git a/IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/UpdateDriver.h b/IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/UpdateDriver.h index 9fd00b3b2d..e1f22a9d5a 100644 --- a/IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/UpdateDriver.h +++ b/IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/UpdateDriver.h @@ -21,6 +21,7 @@ #include <Protocol/LoadedImage.h>
#include <Guid/Capsule.h>
+#include <Guid/CapsuleDataFile.h>
#include <Protocol/FaultTolerantWrite.h>
#include <Protocol/FirmwareVolumeBlock.h>
#include <Protocol/FirmwareVolume2.h>
@@ -38,12 +39,6 @@ #include <Library/PrintLib.h>
#include <Library/DevicePathLib.h>
-//
-// {283FA2EE-532C-484d-9383-9F93B36F0B7E}
-//
-#define EFI_UPDATE_DATA_FILE_GUID \
- { 0x283fa2ee, 0x532c, 0x484d, { 0x93, 0x83, 0x9f, 0x93, 0xb3, 0x6f, 0xb, 0x7e } }
-
extern EFI_HII_HANDLE gHiiHandle;
typedef enum {
diff --git a/IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/UpdateDriverDxe.inf b/IntelFrameworkModulePkg/Universal/FirmwareVolume/UpdateDriverDxe/UpdateDriverDxe.inf index 5ec26e249e..32b896442a 100644 --- 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
# in the same FV and program it in a target Firmware Volume device.
#
-# 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
@@ -40,6 +40,7 @@ MdePkg/MdePkg.dec
MdeModulePkg/MdeModulePkg.dec
IntelFrameworkPkg/IntelFrameworkPkg.dec
+ IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec
[LibraryClasses]
BaseLib
@@ -57,6 +58,7 @@ [Guids]
gEfiConfigFileNameGuid ## CONSUMES FileName to store ConfigFile
+ gEfiUpdateDataFileGuid ## CONSUMES FileName to store Capsule Data.
[Protocols]
gEfiFaultTolerantWriteProtocolGuid ## CONSUMES
|