X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=IntelFrameworkModulePkg%2FUniversal%2FBdsDxe%2FDeviceMngr%2FDeviceManager.c;h=0dddba7077c54894dda6dcc755356fa99e865037;hp=8ee345e8a7ff642e8e460c33e9a3fdfc49be2d67;hb=bf4a3dbd4751b6411bdfc98bf3ac2c4f928bdfdf;hpb=2fde83b14cf6b789c60c9da79dfdc375c9f644cc
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c b/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c
index 8ee345e8a7..0dddba7077 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c
@@ -1,7 +1,7 @@
/** @file
The platform device manager reference implementation
-Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.
+Copyright (c) 2004 - 2012, Intel Corporation. All rights reserved.
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
@@ -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,
@@ -141,20 +132,19 @@ DeviceManagerCallback (
)
{
UINTN CurIndex;
-
- if ((Action == EFI_BROWSER_ACTION_FORM_OPEN) || (Action == EFI_BROWSER_ACTION_FORM_CLOSE)) {
+
+ if (Action != EFI_BROWSER_ACTION_CHANGING) {
//
- // Do nothing for UEFI OPEN/CLOSE Action
+ // All other action return unsupported.
//
- return EFI_SUCCESS;
+ return EFI_UNSUPPORTED;
}
- if ((Value == NULL) || (ActionRequest == NULL)) {
+ if (Value == NULL) {
return EFI_INVALID_PARAMETER;
}
gCallbackKey = QuestionId;
-
if ((QuestionId < MAX_KEY_SECTION_LEN + NETWORK_DEVICE_LIST_KEY_OFFSET) && (QuestionId >= NETWORK_DEVICE_LIST_KEY_OFFSET)) {
//
// If user select the mac address, need to record mac address string to support next form show.
@@ -165,11 +155,6 @@ DeviceManagerCallback (
}
}
}
-
- //
- // Request to exit SendForm(), so as to switch to selected form
- //
- *ActionRequest = EFI_BROWSER_ACTION_REQUEST_EXIT;
return EFI_SUCCESS;
}
@@ -589,7 +574,6 @@ IsNeedAddNetworkMenu (
EFI_STATUS Status;
UINTN EntryCount;
UINTN Index;
- EFI_HII_HANDLE HiiDeviceManagerHandle;
EFI_HANDLE DriverHandle;
EFI_HANDLE ControllerHandle;
EFI_DEVICE_PATH_PROTOCOL *DevicePath;
@@ -598,7 +582,6 @@ IsNeedAddNetworkMenu (
EFI_OPEN_PROTOCOL_INFORMATION_ENTRY *OpenInfoBuffer;
BOOLEAN IsNeedAdd;
- HiiDeviceManagerHandle = gDeviceManagerPrivate.HiiHandle;
IsNeedAdd = FALSE;
OpenInfoBuffer = NULL;
if ((Handle == NULL) || (ItemCount == NULL)) {
@@ -776,7 +759,7 @@ CallDeviceManager (
// Publish our HII data.
//
HiiHandle = HiiAddPackages (
- &mDeviceManagerGuid,
+ &gDeviceManagerFormSetGuid,
gDeviceManagerPrivate.DriverHandle,
DeviceManagerVfrBin,
BdsDxeStrings,
@@ -885,7 +868,7 @@ CallDeviceManager (
AddNetworkMenu = TRUE;
HiiCreateGotoOpCode (
StartOpCodeHandle,
- DEVICE_MANAGER_FORM_ID,
+ INVALID_FORM_ID,
STRING_TOKEN (STR_FORM_NETWORK_DEVICE_LIST_TITLE),
STRING_TOKEN (STR_FORM_NETWORK_DEVICE_LIST_HELP),
EFI_IFR_FLAG_CALLBACK,
@@ -899,7 +882,7 @@ CallDeviceManager (
while (AddItemCount > 0) {
HiiCreateGotoOpCode (
StartOpCodeHandle,
- NETWORK_DEVICE_LIST_FORM_ID,
+ INVALID_FORM_ID,
mMacDeviceList.NodeList[mMacDeviceList.CurListLen - AddItemCount].PromptId,
STRING_TOKEN (STR_NETWORK_DEVICE_HELP),
EFI_IFR_FLAG_CALLBACK,
@@ -913,7 +896,7 @@ CallDeviceManager (
//
HiiCreateGotoOpCode (
StartOpCodeHandle,
- NETWORK_DEVICE_FORM_ID,
+ INVALID_FORM_ID,
Token,
TokenHelp,
EFI_IFR_FLAG_CALLBACK,
@@ -928,7 +911,7 @@ CallDeviceManager (
if (mNextShowFormId == DEVICE_MANAGER_FORM_ID) {
HiiCreateGotoOpCode (
StartOpCodeHandle,
- DEVICE_MANAGER_FORM_ID,
+ INVALID_FORM_ID,
Token,
TokenHelp,
EFI_IFR_FLAG_CALLBACK,
@@ -981,7 +964,7 @@ CallDeviceManager (
HiiUpdateForm (
HiiHandle,
- &mDeviceManagerGuid,
+ &gDeviceManagerFormSetGuid,
mNextShowFormId,
StartOpCodeHandle,
EndOpCodeHandle
@@ -992,7 +975,7 @@ CallDeviceManager (
gFormBrowser2,
&HiiHandle,
1,
- &mDeviceManagerGuid,
+ &gDeviceManagerFormSetGuid,
mNextShowFormId,
NULL,
&ActionRequest
@@ -1109,25 +1092,25 @@ DriverHealthCallback (
OUT EFI_BROWSER_ACTION_REQUEST *ActionRequest
)
{
- if ((Action == EFI_BROWSER_ACTION_FORM_OPEN) || (Action == EFI_BROWSER_ACTION_FORM_CLOSE)) {
+ if (Action == EFI_BROWSER_ACTION_CHANGED) {
+ if ((Value == NULL) || (ActionRequest == NULL)) {
+ return EFI_INVALID_PARAMETER;
+ }
+
+ gCallbackKey = QuestionId;
+
//
- // Do nothing for UEFI OPEN/CLOSE Action
+ // Request to exit SendForm(), so as to switch to selected form
//
- return EFI_SUCCESS;
- }
+ *ActionRequest = EFI_BROWSER_ACTION_REQUEST_EXIT;
- if ((Value == NULL) || (ActionRequest == NULL)) {
- return EFI_INVALID_PARAMETER;
+ return EFI_SUCCESS;
}
- gCallbackKey = QuestionId;
-
//
- // Request to exit SendForm(), so as to switch to selected form
+ // All other action return unsupported.
//
- *ActionRequest = EFI_BROWSER_ACTION_REQUEST_EXIT;
-
- return EFI_SUCCESS;
+ return EFI_UNSUPPORTED;
}
/**
@@ -1167,11 +1150,9 @@ CallDriverHealth (
DRIVER_HEALTH_INFO *DriverHealthInfo;
LIST_ENTRY *Link;
EFI_DEVICE_PATH_PROTOCOL *DriverDevicePath;
- UINTN Length;
BOOLEAN RebootRequired;
Index = 0;
- Length = 0;
DriverHealthInfo = NULL;
DriverDevicePath = NULL;
InitializeListHead (&DriverHealthList);
@@ -1182,7 +1163,7 @@ CallDriverHealth (
// Publish Driver Health HII data.
//
HiiHandle = HiiAddPackages (
- &mDeviceManagerGuid,
+ &gDeviceManagerFormSetGuid,
gDeviceManagerPrivate.DriverHealthHandle,
DriverHealthVfrBin,
BdsDxeStrings,
@@ -1293,12 +1274,6 @@ CallDriverHealth (
DriverHealthInfo->MessageList->StringId,
NULL
);
- //
- // Assert if can not retrieve the message string
- //
- ASSERT (TmpString != NULL);
- StrnCat (String, TmpString, StrLen (TmpString));
- FreePool (TmpString);
} else {
//
// Update the string will be displayed base on the driver's health status
@@ -1306,32 +1281,29 @@ CallDriverHealth (
switch(DriverHealthInfo->HealthStatus) {
case EfiDriverHealthStatusRepairRequired:
TmpString = GetStringById (STRING_TOKEN (STR_REPAIR_REQUIRED));
- StrCat (String, TmpString);
break;
case EfiDriverHealthStatusConfigurationRequired:
TmpString = GetStringById (STRING_TOKEN (STR_CONFIGURATION_REQUIRED));
- StrCat (String, TmpString);
break;
case EfiDriverHealthStatusFailed:
TmpString = GetStringById (STRING_TOKEN (STR_OPERATION_FAILED));
- StrCat (String, TmpString);
break;
case EfiDriverHealthStatusReconnectRequired:
TmpString = GetStringById (STRING_TOKEN (STR_RECONNECT_REQUIRED));
- StrCat (String, TmpString);
break;
case EfiDriverHealthStatusRebootRequired:
TmpString = GetStringById (STRING_TOKEN (STR_REBOOT_REQUIRED));
- StrCat (String, TmpString);
break;
default:
TmpString = GetStringById (STRING_TOKEN (STR_DRIVER_HEALTH_HEALTHY));
- StrCat (String, TmpString);
break;
}
- FreePool (TmpString);
}
+ ASSERT (TmpString != NULL);
+ StrCat (String, TmpString);
+ FreePool (TmpString);
+
Token = HiiSetString (HiiHandle, 0, String, NULL);
FreePool (String);
@@ -1389,7 +1361,7 @@ CallDriverHealth (
Status = HiiUpdateForm (
HiiHandle,
- &mDriverHealthGuid,
+ &gDriverHealthFormSetGuid,
DRIVER_HEALTH_FORM_ID,
StartOpCodeHandle,
EndOpCodeHandle
@@ -1399,7 +1371,7 @@ CallDriverHealth (
Status = HiiUpdateForm (
HiiHandle,
- &mDriverHealthGuid,
+ &gDriverHealthFormSetGuid,
DRIVER_HEALTH_FORM_ID,
StartOpCodeHandleRepair,
EndOpCodeHandleRepair
@@ -1412,7 +1384,7 @@ CallDriverHealth (
gFormBrowser2,
&HiiHandle,
1,
- &mDriverHealthGuid,
+ &gDriverHealthFormSetGuid,
DRIVER_HEALTH_FORM_ID,
NULL,
&ActionRequest
@@ -2195,7 +2167,7 @@ DriverHealthSelectBestLanguage (
CHAR8 *LanguageVariable;
CHAR8 *BestLanguage;
- LanguageVariable = GetEfiGlobalVariable (Iso639Language ? L"Lang" : L"PlatformLang");
+ GetEfiGlobalVariable2 (Iso639Language ? L"Lang" : L"PlatformLang", &LanguageVariable, NULL);
BestLanguage = GetBestLanguage(
SupportedLanguages,