> When GetHealthStatus() returns NULL FormHiiHandle, DeviceManager shouldn't call...

[mirror_edk2.git] / IntelFrameworkModulePkg / Universal / BdsDxe / DeviceMngr / DeviceManagerVfr.Vfr

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManagerVfr.Vfr b/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManagerVfr.Vfr
index 36ee573930fcd7655d87cdd4ce9080545ec0f0bc..4d7d43b7d14e6d87f5e5b4c51a7d56419414a791 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManagerVfr.Vfr
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManagerVfr.Vfr
@@ -2,7 +2,7 @@
 //  \r
 //    Device Manager formset.\r
 //  \r
-//  Copyright (c) 2004 - 2010, 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  { 0x3ebfa8e6, 0x511d, 0x4b5b, 0xa9, 0x5f, 0xfb, 0x38, 0x26, 0xf, 0x1c, 0x27 }\r
+#include "DeviceManagerVfr.h"\r
 \r
 #define EFI_DISK_DEVICE_CLASS              0x0001\r
 #define EFI_VIDEO_DEVICE_CLASS             0x0002\r
@@ -21,26 +21,15 @@
 #define EFI_INPUT_DEVICE_CLASS             0x0008\r
 #define EFI_ON_BOARD_DEVICE_CLASS          0x0010\r
 #define EFI_OTHER_DEVICE_CLASS             0x0020\r
-#define LABEL_VBIOS                        0x0040\r
-#define LABEL_DEVICES_LIST                 0x1100\r
-#define LABEL_NETWORK_DEVICE_LIST_ID       0x1101\r
-#define LABEL_NETWORK_DEVICE_ID            0x1102\r
-#define LABEL_END                          0xffff\r
 \r
 #define DEVICE_MANAGER_CLASS               0x0000\r
 #define FRONT_PAGE_SUBCLASS                0x0003\r
 \r
-#define DEVICE_MANAGER_FORM_ID             0x1000\r
-#define NETWORK_DEVICE_LIST_FORM_ID        0x1001\r
-#define NETWORK_DEVICE_FORM_ID             0x1002\r
-\r
-#define DEVICE_MANAGER_KEY_DRIVER_HEALTH   0x1111\r
-\r
 formset\r
-  guid      = FORMSET_GUID,\r
+  guid      = DEVICE_MANAGER_FORMSET_GUID,\r
   title     = STRING_TOKEN(STR_DEVICE_MANAGER_TITLE),\r
   help      = STRING_TOKEN(STR_EMPTY_STRING),\r
-  classguid = FORMSET_GUID,\r
+  classguid = DEVICE_MANAGER_FORMSET_GUID,\r
   class     = DEVICE_MANAGER_CLASS,\r
   subclass  = FRONT_PAGE_SUBCLASS,\r
 \r