> When GetHealthStatus() returns NULL FormHiiHandle, DeviceManager shouldn't call SendForm to show the configuration form.

> Combine the multiple reset request returned by GetHealthStatus() when repairing all the controllers.
> Fix the bug that source code and VFR code use different value for DRIVER_HEALTH_FORM_ID.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11494 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 4 insertions, 15 deletions

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManagerVfr.Vfr b/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManagerVfr.Vfr
index 36ee573930..4d7d43b7d1 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManagerVfr.Vfr
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManagerVfr.Vfr
@@ -2,7 +2,7 @@
 //  

 //    Device Manager formset.

 //  

-//  Copyright (c) 2004 - 2010, 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  { 0x3ebfa8e6, 0x511d, 0x4b5b, 0xa9, 0x5f, 0xfb, 0x38, 0x26, 0xf, 0x1c, 0x27 }

+#include "DeviceManagerVfr.h"

 

 #define EFI_DISK_DEVICE_CLASS              0x0001

 #define EFI_VIDEO_DEVICE_CLASS             0x0002

@@ -21,26 +21,15 @@
 #define EFI_INPUT_DEVICE_CLASS             0x0008

 #define EFI_ON_BOARD_DEVICE_CLASS          0x0010

 #define EFI_OTHER_DEVICE_CLASS             0x0020

-#define LABEL_VBIOS                        0x0040

-#define LABEL_DEVICES_LIST                 0x1100

-#define LABEL_NETWORK_DEVICE_LIST_ID       0x1101

-#define LABEL_NETWORK_DEVICE_ID            0x1102

-#define LABEL_END                          0xffff

 

 #define DEVICE_MANAGER_CLASS               0x0000

 #define FRONT_PAGE_SUBCLASS                0x0003

 

-#define DEVICE_MANAGER_FORM_ID             0x1000

-#define NETWORK_DEVICE_LIST_FORM_ID        0x1001

-#define NETWORK_DEVICE_FORM_ID             0x1002

-

-#define DEVICE_MANAGER_KEY_DRIVER_HEALTH   0x1111

-

 formset

-  guid      = FORMSET_GUID,

+  guid      = DEVICE_MANAGER_FORMSET_GUID,

   title     = STRING_TOKEN(STR_DEVICE_MANAGER_TITLE),

   help      = STRING_TOKEN(STR_EMPTY_STRING),

-  classguid = FORMSET_GUID,

+  classguid = DEVICE_MANAGER_FORMSET_GUID,

   class     = DEVICE_MANAGER_CLASS,

   subclass  = FRONT_PAGE_SUBCLASS,