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/DeviceMngr/DeviceManager.c    | 27 ++++++++--------------
 .../Universal/BdsDxe/DeviceMngr/DeviceManagerVfr.h | 10 +-------
 2 files changed, 10 insertions(+), 27 deletions(-)

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

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