From e24fc1032db5d5d2395260f6d7af94aa5a2a0802 Mon Sep 17 00:00:00 2001
From: lgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524>
Date: Sun, 18 Sep 2011 12:23:27 +0000
Subject: 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
---
 .../Universal/BdsDxe/BootMngr/BootManager.c                  | 12 ++++--------
 .../Universal/BdsDxe/BootMngr/BootManager.h                  | 10 +---------
 .../Universal/BdsDxe/BootMngr/BootManagerVfr.Vfr             |  8 ++++----
 3 files changed, 9 insertions(+), 21 deletions(-)

(limited to 'IntelFrameworkModulePkg/Universal/BdsDxe/BootMngr')

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,
 
-- 
cgit v1.2.3