4. It save all the mapping info in NV variables which will be consumed\r
by platform override protocol driver to publish the platform override protocol.\r
\r
-Copyright (c) 2007 - 2010, Intel Corporation\r
-All rights reserved. This program and the accompanying materials\r
+Copyright (c) 2007 - 2015, 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
http://opensource.org/licenses/bsd-license.php\r
//\r
// module global data\r
//\r
-EFI_GUID mPlatformOverridesManagerGuid = PLAT_OVER_MNGR_GUID;\r
CHAR16 mVariableName[] = L"Data";\r
LIST_ENTRY mMappingDataBase = INITIALIZE_LIST_HEAD_VARIABLE (mMappingDataBase);\r
BOOLEAN mEnvironmentVariableRead = FALSE;\r
EFI_HANDLE *mDriverImageHandleBuffer;\r
\r
INTN mSelectedCtrIndex;\r
-EFI_STRING_ID mControllerToken[MAX_CHOICE_NUM];\r
+EFI_STRING_ID *mControllerToken;\r
UINTN mDriverImageHandleCount;\r
-EFI_STRING_ID mDriverImageToken[MAX_CHOICE_NUM];\r
-EFI_STRING_ID mDriverImageFilePathToken[MAX_CHOICE_NUM];\r
-EFI_LOADED_IMAGE_PROTOCOL *mDriverImageProtocol[MAX_CHOICE_NUM];\r
-EFI_DEVICE_PATH_PROTOCOL *mControllerDevicePathProtocol[MAX_CHOICE_NUM];\r
+EFI_STRING_ID *mDriverImageToken;\r
+EFI_DEVICE_PATH_PROTOCOL **mControllerDevicePathProtocol;\r
UINTN mSelectedDriverImageNum;\r
UINTN mLastSavedDriverImageNum;\r
UINT16 mCurrentPage;\r
EFI_CALLBACK_INFO *mCallbackInfo;\r
+BOOLEAN *mDriSelection;\r
+UINTN mMaxDeviceCount;\r
\r
HII_VENDOR_DEVICE_PATH mHiiVendorDevicePath = {\r
{\r
(UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
}\r
},\r
- EFI_CALLER_ID_GUID\r
+ PLAT_OVER_MNGR_GUID\r
},\r
{\r
END_DEVICE_PATH_TYPE,\r
};\r
\r
/**\r
- Converting a given device to an unicode string. \r
- \r
- This function will dependent on gEfiDevicePathToTextProtocolGuid, if protocol\r
- does not installed, then return unknown device path L"?" directly.\r
- \r
+ Converting a given device to an unicode string.\r
+\r
@param DevPath Given device path instance\r
\r
@return Converted string from given device path.\r
- @retval L"?" Can not locate gEfiDevicePathToTextProtocolGuid protocol for converting.\r
+ @retval L"?" Converting failed.\r
**/\r
CHAR16 *\r
DevicePathToStr (\r
IN EFI_DEVICE_PATH_PROTOCOL *DevPath\r
)\r
{\r
- EFI_STATUS Status;\r
- EFI_DEVICE_PATH_TO_TEXT_PROTOCOL *DevPathToText;\r
- CHAR16 *ToText;\r
- \r
- if (DevPath == NULL) {\r
- return L"";\r
- }\r
- \r
- Status = gBS->LocateProtocol (\r
- &gEfiDevicePathToTextProtocolGuid,\r
- NULL,\r
- (VOID **) &DevPathToText\r
- );\r
- if (!EFI_ERROR (Status)) {\r
- ToText = DevPathToText->ConvertDevicePathToText (\r
- DevPath,\r
- FALSE,\r
- TRUE\r
- );\r
- ASSERT (ToText != NULL);\r
- return ToText;\r
+ CHAR16 *Text;\r
+ Text = ConvertDevicePathToText (\r
+ DevPath,\r
+ FALSE,\r
+ TRUE\r
+ );\r
+ if (Text == NULL) {\r
+ Text = AllocateCopyPool (sizeof (L"?"), L"?");\r
+ ASSERT (Text != NULL);\r
}\r
\r
- return L"?";\r
+ return Text;\r
}\r
\r
/**\r
//\r
// Find the best matching language.\r
//\r
- Language = GetEfiGlobalVariable (VariableName);\r
+ GetEfiGlobalVariable2 (VariableName, (VOID**)&Language, NULL);\r
BestLanguage = GetBestLanguage (\r
ComponentName->SupportedLanguages,\r
(BOOLEAN) (ProtocolGuid == &gEfiComponentNameProtocolGuid),\r
//\r
HiiUpdateForm (\r
Private->RegisteredHandle,\r
- &mPlatformOverridesManagerGuid,\r
+ &gPlatformOverridesManagerGuid,\r
FORM_ID_DEVICE,\r
StartOpCodeHandle, // Label FORM_ID_DEVICE\r
EndOpCodeHandle // LABEL_END\r
return EFI_SUCCESS;\r
}\r
\r
+ mMaxDeviceCount = DevicePathHandleCount;\r
+ mControllerDevicePathProtocol = AllocateZeroPool (DevicePathHandleCount * sizeof (EFI_DEVICE_PATH_PROTOCOL *));\r
+ ASSERT (mControllerDevicePathProtocol != NULL);\r
+ mControllerToken = AllocateZeroPool (DevicePathHandleCount * sizeof (EFI_STRING_ID));\r
+ ASSERT (mControllerToken != NULL);\r
+\r
for (Index = 0; Index < DevicePathHandleCount; Index++) {\r
if (FakeNvData->PciDeviceFilter == 0x01) {\r
//\r
//\r
HiiUpdateForm (\r
Private->RegisteredHandle,\r
- &mPlatformOverridesManagerGuid,\r
+ &gPlatformOverridesManagerGuid,\r
FORM_ID_DEVICE,\r
StartOpCodeHandle, // Label FORM_ID_DEVICE\r
EndOpCodeHandle // LABEL_END\r
VOID *EndOpCodeHandle;\r
EFI_IFR_GUID_LABEL *StartLabel;\r
EFI_IFR_GUID_LABEL *EndLabel;\r
+ EFI_LOADED_IMAGE_PROTOCOL **DriverImageProtocol;\r
+ EFI_STRING_ID *DriverImageFilePathToken;\r
+ UINT8 CheckFlags;\r
\r
//\r
// If user select a controller item in the first page the following code will be run.\r
// Switch the item callback key value to its NO. in mDevicePathHandleBuffer\r
//\r
mSelectedCtrIndex = KeyValue - KEY_VALUE_DEVICE_OFFSET;\r
- ASSERT (mSelectedCtrIndex < MAX_CHOICE_NUM);\r
+ ASSERT (mSelectedCtrIndex >= 0 && mSelectedCtrIndex < MAX_CHOICE_NUM);\r
\r
mLastSavedDriverImageNum = 0;\r
\r
//\r
HiiUpdateForm (\r
Private->RegisteredHandle,\r
- &mPlatformOverridesManagerGuid,\r
+ &gPlatformOverridesManagerGuid,\r
FORM_ID_DRIVER,\r
StartOpCodeHandle,\r
EndOpCodeHandle\r
return EFI_NOT_FOUND;\r
}\r
\r
+ mDriverImageToken = AllocateZeroPool (DriverImageHandleCount * sizeof (EFI_STRING_ID));\r
+ ASSERT (mDriverImageToken != NULL);\r
+ mDriSelection = AllocateZeroPool (DriverImageHandleCount * sizeof (BOOLEAN));\r
+ ASSERT (mDriSelection != NULL);\r
+\r
+ DriverImageProtocol = AllocateZeroPool (DriverImageHandleCount * sizeof (EFI_LOADED_IMAGE_PROTOCOL *));\r
+ ASSERT (DriverImageProtocol != NULL);\r
+ DriverImageFilePathToken = AllocateZeroPool (DriverImageHandleCount * sizeof (EFI_STRING_ID));\r
+ ASSERT (DriverImageFilePathToken != NULL);\r
+\r
mDriverImageHandleCount = DriverImageHandleCount;\r
for (Index = 0; Index < DriverImageHandleCount; Index++) {\r
//\r
EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
);\r
if (EFI_ERROR (Status)) {\r
- FakeNvData->DriSelection[Index] = 0x00;\r
+ mDriSelection[Index] = FALSE;\r
continue;\r
}\r
- mDriverImageProtocol[Index] = LoadedImage;\r
+ DriverImageProtocol[Index] = LoadedImage;\r
//\r
// Find its related driver binding protocol\r
//\r
DriverBindingHandle = GetDriverBindingHandleFromImageHandle (mDriverImageHandleBuffer[Index]);\r
if (DriverBindingHandle == NULL) {\r
- FakeNvData->DriSelection[Index] = 0x00;\r
+ mDriSelection[Index] = FALSE;\r
continue;\r
}\r
\r
(VOID **) &LoadedImageDevicePath\r
);\r
if (LoadedImageDevicePath == NULL) {\r
- FakeNvData->DriSelection[Index] = 0x00;\r
+ mDriSelection[Index] = FALSE;\r
continue;\r
}\r
\r
(VOID **) &BusSpecificDriverOverride\r
);\r
if (EFI_ERROR (Status) || BusSpecificDriverOverride == NULL) {\r
- FakeNvData->DriSelection[Index] = 0x00;\r
+ mDriSelection[Index] = FALSE;\r
continue;\r
}\r
} else {\r
- FakeNvData->DriSelection[Index] = 0x00;\r
+ mDriSelection[Index] = FALSE;\r
continue;\r
}\r
}\r
NewString = AllocateZeroPool (StrSize (DriverName));\r
ASSERT (NewString != NULL); \r
if (EFI_ERROR (CheckMapping (mControllerDevicePathProtocol[mSelectedCtrIndex], LoadedImageDevicePath, &mMappingDataBase, NULL, NULL))) {\r
- FakeNvData->DriSelection[Index] = 0x00;\r
+ mDriSelection[Index] = FALSE;\r
} else {\r
- FakeNvData->DriSelection[Index] = 0x01;\r
+ mDriSelection[Index] = TRUE;\r
mLastSavedDriverImageNum++;\r
}\r
StrCat (NewString, DriverName);\r
NewString = AllocateZeroPool (StrSize (DriverName));\r
ASSERT (NewString != NULL); \r
StrCat (NewString, DriverName);\r
- NewStringHelpToken = HiiSetString (Private->RegisteredHandle, mDriverImageFilePathToken[Index], NewString, NULL);\r
+ NewStringHelpToken = HiiSetString (Private->RegisteredHandle, DriverImageFilePathToken[Index], NewString, NULL);\r
ASSERT (NewStringHelpToken != 0);\r
- mDriverImageFilePathToken[Index] = NewStringHelpToken;\r
+ DriverImageFilePathToken[Index] = NewStringHelpToken;\r
FreePool (NewString);\r
FreePool (DriverName);\r
\r
+ CheckFlags = 0;\r
+ if (mDriSelection[Index]) {\r
+ CheckFlags |= EFI_IFR_CHECKBOX_DEFAULT;\r
+ }\r
+\r
HiiCreateCheckBoxOpCode (\r
StartOpCodeHandle,\r
- (UINT16) (DRIVER_SELECTION_QUESTION_ID + Index),\r
- VARSTORE_ID_PLAT_OVER_MNGR,\r
- (UINT16) (DRIVER_SELECTION_VAR_OFFSET + Index),\r
- NewStringToken,\r
- NewStringHelpToken,\r
+ (UINT16) (KEY_VALUE_DRIVER_OFFSET + Index),\r
0,\r
0,\r
+ NewStringToken,\r
+ NewStringHelpToken,\r
+ EFI_IFR_FLAG_CALLBACK,\r
+ CheckFlags,\r
NULL\r
);\r
}\r
//\r
HiiUpdateForm (\r
Private->RegisteredHandle,\r
- &mPlatformOverridesManagerGuid,\r
+ &gPlatformOverridesManagerGuid,\r
FORM_ID_DRIVER,\r
StartOpCodeHandle, // Label FORM_ID_DRIVER\r
EndOpCodeHandle // LABEL_END\r
\r
HiiFreeOpCodeHandle (StartOpCodeHandle);\r
HiiFreeOpCodeHandle (EndOpCodeHandle);\r
+\r
+ if (DriverImageProtocol != NULL) {\r
+ FreePool (DriverImageProtocol);\r
+ }\r
+\r
+ if (DriverImageFilePathToken != NULL) {\r
+ FreePool (DriverImageFilePathToken);\r
+ }\r
+\r
return EFI_SUCCESS;\r
}\r
\r
//\r
HiiUpdateForm (\r
Private->RegisteredHandle,\r
- &mPlatformOverridesManagerGuid,\r
+ &gPlatformOverridesManagerGuid,\r
FORM_ID_ORDER,\r
StartOpCodeHandle,\r
EndOpCodeHandle\r
//\r
SelectedDriverImageNum = 0;\r
for (Index = 0; Index < mDriverImageHandleCount; Index++) {\r
- if (FakeNvData->DriSelection[Index] != 0) {\r
+ if (mDriSelection[Index]) {\r
SelectedDriverImageNum ++;\r
}\r
}\r
//\r
SelectedDriverImageNum = 0;\r
for (Index = 0; Index < mDriverImageHandleCount; Index++) {\r
- if (FakeNvData->DriSelection[Index] != 0) {\r
+ if (mDriSelection[Index]) {\r
//\r
// Use the NO. in driver binding buffer as value, will use it later\r
//\r
//\r
HiiUpdateForm (\r
Private->RegisteredHandle,\r
- &mPlatformOverridesManagerGuid,\r
+ &gPlatformOverridesManagerGuid,\r
FORM_ID_ORDER,\r
StartOpCodeHandle, // Label FORM_ID_ORDER\r
EndOpCodeHandle // LABEL_END\r
\r
**/\r
EFI_STATUS\r
-CommintChanges (\r
+CommitChanges (\r
IN EFI_CALLBACK_INFO *Private,\r
IN UINT16 KeyValue,\r
IN PLAT_OVER_MNGR_DATA *FakeNvData\r
\r
@retval EFI_SUCCESS The Results is filled with the requested values.\r
@retval EFI_OUT_OF_RESOURCES Not enough memory to store the results.\r
- @retval EFI_INVALID_PARAMETER Request is NULL, illegal syntax, or unknown name.\r
+ @retval EFI_INVALID_PARAMETER Request is illegal syntax, or unknown name.\r
@retval EFI_NOT_FOUND Routing data doesn't match any storage in this driver.\r
\r
**/\r
}\r
\r
*Progress = Request;\r
- if ((Request != NULL) && !HiiIsConfigHdrMatch (Request, &mPlatformOverridesManagerGuid, mVariableName)) {\r
+ if ((Request != NULL) && !HiiIsConfigHdrMatch (Request, &gPlatformOverridesManagerGuid, mVariableName)) {\r
return EFI_NOT_FOUND;\r
}\r
\r
// Allocate and fill a buffer large enough to hold the <ConfigHdr> template\r
// followed by "&OFFSET=0&WIDTH=WWWWWWWWWWWWWWWW" followed by a Null-terminator\r
//\r
- ConfigRequestHdr = HiiConstructConfigHdr (&mPlatformOverridesManagerGuid, mVariableName, Private->DriverHandle);\r
+ ConfigRequestHdr = HiiConstructConfigHdr (&gPlatformOverridesManagerGuid, mVariableName, Private->DriverHandle);\r
Size = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16);\r
ConfigRequest = AllocateZeroPool (Size);\r
ASSERT (ConfigRequest != NULL);\r
EFI_CALLBACK_INFO *Private;\r
UINT16 KeyValue;\r
PLAT_OVER_MNGR_DATA *FakeNvData;\r
+ EFI_STATUS Status;\r
\r
if (Configuration == NULL || Progress == NULL) {\r
return EFI_INVALID_PARAMETER;\r
}\r
*Progress = Configuration;\r
\r
- if (!HiiIsConfigHdrMatch (Configuration, &mPlatformOverridesManagerGuid, mVariableName)) {\r
+ if (!HiiIsConfigHdrMatch (Configuration, &gPlatformOverridesManagerGuid, mVariableName)) {\r
return EFI_NOT_FOUND;\r
}\r
\r
*Progress = Configuration + StrLen (Configuration);\r
Private = EFI_CALLBACK_INFO_FROM_THIS (This);\r
FakeNvData = &Private->FakeNvData;\r
- if (!HiiGetBrowserData (&mPlatformOverridesManagerGuid, mVariableName, sizeof (PLAT_OVER_MNGR_DATA), (UINT8 *) FakeNvData)) {\r
+ if (!HiiGetBrowserData (&gPlatformOverridesManagerGuid, mVariableName, sizeof (PLAT_OVER_MNGR_DATA), (UINT8 *) FakeNvData)) {\r
//\r
// FakeNvData can't be got from SetupBrowser, which doesn't need to be set.\r
//\r
return EFI_SUCCESS;\r
}\r
\r
- if (mCurrentPage == FORM_ID_DRIVER) {\r
- KeyValue = KEY_VALUE_DRIVER_GOTO_ORDER;\r
- UpdatePrioritySelectPage (Private, KeyValue, FakeNvData);\r
- KeyValue = KEY_VALUE_ORDER_SAVE_AND_EXIT;\r
- CommintChanges (Private, KeyValue, FakeNvData);\r
- //\r
- // Since UpdatePrioritySelectPage will change mCurrentPage,\r
- // should ensure the mCurrentPage still indicate the second page here\r
- //\r
- mCurrentPage = FORM_ID_DRIVER;\r
- }\r
+ Status = EFI_SUCCESS;\r
\r
if (mCurrentPage == FORM_ID_ORDER) {\r
KeyValue = KEY_VALUE_ORDER_SAVE_AND_EXIT;\r
- CommintChanges (Private, KeyValue, FakeNvData);\r
+ Status = CommitChanges (Private, KeyValue, FakeNvData);\r
}\r
\r
- return EFI_SUCCESS;\r
+ return Status;\r
}\r
\r
/**\r
EFI_STRING_ID NewStringToken;\r
EFI_INPUT_KEY Key;\r
PLAT_OVER_MNGR_DATA *FakeNvData;\r
- \r
+\r
+ if ((Action != EFI_BROWSER_ACTION_CHANGING) && (Action != EFI_BROWSER_ACTION_CHANGED)) {\r
+ //\r
+ // All other action return unsupported.\r
+ //\r
+ return EFI_UNSUPPORTED;\r
+ }\r
+\r
Private = EFI_CALLBACK_INFO_FROM_THIS (This);\r
FakeNvData = &Private->FakeNvData;\r
- if (!HiiGetBrowserData (&mPlatformOverridesManagerGuid, mVariableName, sizeof (PLAT_OVER_MNGR_DATA), (UINT8 *) FakeNvData)) {\r
+ if (!HiiGetBrowserData (&gPlatformOverridesManagerGuid, mVariableName, sizeof (PLAT_OVER_MNGR_DATA), (UINT8 *) FakeNvData)) {\r
return EFI_NOT_FOUND;\r
}\r
\r
- if (KeyValue == KEY_VALUE_DEVICE_REFRESH ||\r
- KeyValue == KEY_VALUE_DEVICE_FILTER ||\r
- KeyValue == KEY_VALUE_DRIVER_GOTO_PREVIOUS\r
- ) {\r
- UpdateDeviceSelectPage (Private, KeyValue, FakeNvData);\r
- //\r
- // Update page title string\r
- //\r
- NewStringToken = STRING_TOKEN (STR_TITLE);\r
- if (HiiSetString (Private->RegisteredHandle, NewStringToken, L"First, Select the controller by device path", NULL) == 0) {\r
- ASSERT (FALSE);\r
+ if (Action == EFI_BROWSER_ACTION_CHANGING) {\r
+ if (Value == NULL) {\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+ \r
+ if (KeyValue == KEY_VALUE_DRIVER_GOTO_PREVIOUS) {\r
+ UpdateDeviceSelectPage (Private, KeyValue, FakeNvData);\r
+ //\r
+ // Update page title string\r
+ //\r
+ NewStringToken = STRING_TOKEN (STR_TITLE);\r
+ if (HiiSetString (Private->RegisteredHandle, NewStringToken, L"First, Select the controller by device path", NULL) == 0) {\r
+ ASSERT (FALSE);\r
+ }\r
}\r
- }\r
\r
- if (((KeyValue >= KEY_VALUE_DEVICE_OFFSET) && (KeyValue < KEY_VALUE_DEVICE_MAX)) || (KeyValue == KEY_VALUE_ORDER_GOTO_PREVIOUS)) {\r
- if (KeyValue == KEY_VALUE_ORDER_GOTO_PREVIOUS) {\r
- KeyValue = (EFI_QUESTION_ID) (mSelectedCtrIndex + KEY_VALUE_DEVICE_OFFSET);\r
+ if (((KeyValue >= KEY_VALUE_DEVICE_OFFSET) && (KeyValue < KEY_VALUE_DEVICE_OFFSET + mMaxDeviceCount)) || (KeyValue == KEY_VALUE_ORDER_GOTO_PREVIOUS)) {\r
+ if (KeyValue == KEY_VALUE_ORDER_GOTO_PREVIOUS) {\r
+ KeyValue = (EFI_QUESTION_ID) (mSelectedCtrIndex + KEY_VALUE_DEVICE_OFFSET);\r
+ }\r
+ UpdateBindingDriverSelectPage (Private, KeyValue, FakeNvData);\r
+ //\r
+ // Update page title string\r
+ //\r
+ NewStringToken = STRING_TOKEN (STR_TITLE);\r
+ if (HiiSetString (Private->RegisteredHandle, NewStringToken, L"Second, Select drivers for the previous selected controller", NULL) == 0) {\r
+ ASSERT (FALSE);\r
+ }\r
}\r
- UpdateBindingDriverSelectPage (Private, KeyValue, FakeNvData);\r
- //\r
- // Update page title string\r
- //\r
- NewStringToken = STRING_TOKEN (STR_TITLE);\r
- if (HiiSetString (Private->RegisteredHandle, NewStringToken, L"Second, Select drivers for the previous selected controller", NULL) == 0) {\r
- ASSERT (FALSE);\r
+\r
+ if (KeyValue == KEY_VALUE_DRIVER_GOTO_ORDER) {\r
+ UpdatePrioritySelectPage (Private, KeyValue, FakeNvData);\r
+ //\r
+ // Update page title string\r
+ //\r
+ NewStringToken = STRING_TOKEN (STR_TITLE);\r
+ if (HiiSetString (Private->RegisteredHandle, NewStringToken, L"Finally, Set the priority order for the drivers and save them", NULL) == 0) {\r
+ ASSERT (FALSE);\r
+ }\r
}\r
- }\r
\r
- if (KeyValue == KEY_VALUE_DRIVER_GOTO_ORDER) {\r
- UpdatePrioritySelectPage (Private, KeyValue, FakeNvData);\r
- //\r
- // Update page title string\r
- //\r
- NewStringToken = STRING_TOKEN (STR_TITLE);\r
- if (HiiSetString (Private->RegisteredHandle, NewStringToken, L"Finally, Set the priority order for the drivers and save them", NULL) == 0) {\r
- ASSERT (FALSE);\r
+ if (KeyValue == KEY_VALUE_DEVICE_CLEAR) {\r
+ //\r
+ // Deletes all environment variable(s) that contain the override mappings info\r
+ //\r
+ FreeMappingDatabase (&mMappingDataBase);\r
+ Status = SaveOverridesMapping (&mMappingDataBase);\r
+ UpdateDeviceSelectPage (Private, KeyValue, FakeNvData);\r
}\r
- }\r
+ } else if (Action == EFI_BROWSER_ACTION_CHANGED) {\r
+ if ((KeyValue >= KEY_VALUE_DRIVER_OFFSET) && (KeyValue < KEY_VALUE_DRIVER_OFFSET + mDriverImageHandleCount)) {\r
+ mDriSelection[KeyValue - KEY_VALUE_DRIVER_OFFSET] = Value->b;\r
+ } else {\r
+ switch (KeyValue) {\r
+ case KEY_VALUE_DEVICE_REFRESH:\r
+ case KEY_VALUE_DEVICE_FILTER:\r
+ UpdateDeviceSelectPage (Private, KeyValue, FakeNvData);\r
+ //\r
+ // Update page title string\r
+ //\r
+ NewStringToken = STRING_TOKEN (STR_TITLE);\r
+ if (HiiSetString (Private->RegisteredHandle, NewStringToken, L"First, Select the controller by device path", NULL) == 0) {\r
+ ASSERT (FALSE);\r
+ }\r
+ break;\r
+ \r
+ case KEY_VALUE_ORDER_SAVE_AND_EXIT:\r
+ Status = CommitChanges (Private, KeyValue, FakeNvData);\r
+ *ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;\r
+ if (EFI_ERROR (Status)) {\r
+ CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Single Override Info too large, Saving Error!", NULL);\r
+ return EFI_DEVICE_ERROR;\r
+ }\r
+ break;\r
\r
- if (KeyValue == KEY_VALUE_ORDER_SAVE_AND_EXIT) {\r
- Status = CommintChanges (Private, KeyValue, FakeNvData);\r
- *ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;\r
- if (EFI_ERROR (Status)) {\r
- CreatePopUp (EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE, &Key, L"Single Override Info too large, Saving Error!", NULL);\r
- return EFI_DEVICE_ERROR;\r
+ default:\r
+ break;\r
+ }\r
}\r
}\r
\r
- if (KeyValue == KEY_VALUE_DEVICE_CLEAR) {\r
- //\r
- // Deletes all environment variable(s) that contain the override mappings info\r
- //\r
- FreeMappingDatabase (&mMappingDataBase);\r
- Status = SaveOverridesMapping (&mMappingDataBase);\r
- UpdateDeviceSelectPage (Private, KeyValue, FakeNvData);\r
- }\r
//\r
// Pass changed uncommitted data back to Form Browser\r
//\r
- HiiSetBrowserData (&mPlatformOverridesManagerGuid, mVariableName, sizeof (PLAT_OVER_MNGR_DATA), (UINT8 *) FakeNvData, NULL);\r
+ HiiSetBrowserData (&gPlatformOverridesManagerGuid, mVariableName, sizeof (PLAT_OVER_MNGR_DATA), (UINT8 *) FakeNvData, NULL);\r
\r
return EFI_SUCCESS;\r
}\r
returned in DriverImageHandle.\r
@retval EFI_NOT_FOUND A driver override for ControllerHandle was not\r
found.\r
- @retval EFI_INVALID_PARAMETER The handle specified by ControllerHandle is not a\r
- valid handle. DriverImageHandle is not a handle\r
- that was returned on a previous call to\r
- GetDriver().\r
+ @retval EFI_INVALID_PARAMETER The handle specified by ControllerHandle is NULL.\r
+ DriverImageHandle is not a handle that was returned\r
+ on a previous call to GetDriver().\r
\r
**/\r
EFI_STATUS\r
mCallbackInfo->PlatformDriverOverride.GetDriver = GetDriver;\r
mCallbackInfo->PlatformDriverOverride.GetDriverPath = GetDriverPath;\r
mCallbackInfo->PlatformDriverOverride.DriverLoaded = DriverLoaded;\r
+\r
+ //\r
+ // Locate ConfigRouting protocol\r
+ //\r
+ Status = gBS->LocateProtocol (\r
+ &gEfiHiiConfigRoutingProtocolGuid,\r
+ NULL,\r
+ (VOID **) &mCallbackInfo->HiiConfigRouting\r
+ );\r
+ if (EFI_ERROR (Status)) {\r
+ goto Finish;\r
+ }\r
+\r
//\r
// Install Device Path Protocol and Config Access protocol to driver handle\r
// Install Platform Driver Override Protocol to driver handle\r
// Publish our HII data\r
//\r
mCallbackInfo->RegisteredHandle = HiiAddPackages (\r
- &mPlatformOverridesManagerGuid,\r
+ &gPlatformOverridesManagerGuid,\r
mCallbackInfo->DriverHandle,\r
VfrBin,\r
PlatDriOverrideDxeStrings,\r
goto Finish;\r
}\r
\r
- //\r
- // Locate ConfigRouting protocol\r
- //\r
- Status = gBS->LocateProtocol (\r
- &gEfiHiiConfigRoutingProtocolGuid,\r
- NULL,\r
- (VOID **) &mCallbackInfo->HiiConfigRouting\r
- );\r
- if (EFI_ERROR (Status)) {\r
- goto Finish;\r
- }\r
-\r
//\r
// Clear all the globle variable\r
//\r
mDriverImageHandleCount = 0;\r
mCurrentPage = 0;\r
- ZeroMem (mDriverImageToken, MAX_CHOICE_NUM * sizeof (EFI_STRING_ID));\r
- ZeroMem (mDriverImageFilePathToken, MAX_CHOICE_NUM * sizeof (EFI_STRING_ID));\r
- ZeroMem (mControllerToken, MAX_CHOICE_NUM * sizeof (EFI_STRING_ID));\r
- ZeroMem (mDriverImageProtocol, MAX_CHOICE_NUM * sizeof (EFI_LOADED_IMAGE_PROTOCOL *));\r
\r
return EFI_SUCCESS;\r
\r
Finish:\r
- if (mCallbackInfo->DriverHandle != NULL) {\r
- gBS->UninstallMultipleProtocolInterfaces (\r
- mCallbackInfo->DriverHandle,\r
- &gEfiDevicePathProtocolGuid,\r
- &mHiiVendorDevicePath,\r
- &gEfiHiiConfigAccessProtocolGuid,\r
- &mCallbackInfo->ConfigAccess,\r
- &gEfiPlatformDriverOverrideProtocolGuid,\r
- &mCallbackInfo->PlatformDriverOverride,\r
- NULL\r
- );\r
- }\r
- \r
- if (mCallbackInfo->RegisteredHandle != NULL) {\r
- HiiRemovePackages (mCallbackInfo->RegisteredHandle);\r
- }\r
-\r
- if (mCallbackInfo != NULL) {\r
- FreePool (mCallbackInfo);\r
- }\r
+ PlatDriOverrideDxeUnload (ImageHandle);\r
\r
return Status;\r
}\r
IN EFI_HANDLE ImageHandle\r
)\r
{\r
+ ASSERT (mCallbackInfo != NULL);\r
+\r
if (mCallbackInfo->DriverHandle != NULL) {\r
gBS->UninstallMultipleProtocolInterfaces (\r
mCallbackInfo->DriverHandle,\r
HiiRemovePackages (mCallbackInfo->RegisteredHandle);\r
}\r
\r
- if (mCallbackInfo != NULL) {\r
- FreePool (mCallbackInfo);\r
+ FreePool (mCallbackInfo);\r
+\r
+ if (mControllerToken != NULL) {\r
+ FreePool (mControllerToken);\r
+ }\r
+\r
+ if (mControllerDevicePathProtocol != NULL) {\r
+ FreePool (mControllerDevicePathProtocol);\r
+ }\r
+\r
+ if (mDriverImageToken != NULL) {\r
+ FreePool (mDriverImageToken);\r
}\r
\r
return EFI_SUCCESS;\r
projects / mirror_edk2.git / blobdiff