This is an example of how a driver might export data to the HII protocol to be\r
later utilized by the Setup Protocol\r
\r
-Copyright (c) 2004 - 2013, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2014, 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
//\r
// Get user input password\r
//\r
- Password = &PrivateData->Configuration.WhatIsThePassword2[0];\r
+ Password = PrivateData->Configuration.WhatIsThePassword2;\r
PasswordSize = sizeof (PrivateData->Configuration.WhatIsThePassword2);\r
ZeroMem (Password, PasswordSize);\r
\r
DRIVER_SAMPLE_CONFIGURATION *Configuration;\r
BOOLEAN ActionFlag;\r
EFI_STRING ConfigRequestHdr;\r
+ EFI_STRING NameRequestHdr;\r
MY_EFI_VARSTORE_DATA *VarStoreConfig;\r
EFI_INPUT_KEY HotKey;\r
EFI_FORM_BROWSER_EXTENSION_PROTOCOL *FormBrowserEx;\r
- EFI_DEVICE_PATH_TO_TEXT_PROTOCOL *PathToText;\r
\r
//\r
// Initialize the local variables.\r
//\r
ConfigRequestHdr = NULL;\r
NewString = NULL;\r
- PathToText = NULL;\r
\r
//\r
// Initialize screen dimensions for SendForm().\r
}\r
\r
PrivateData->HiiHandle[1] = HiiHandle[1];\r
- \r
- Status = gBS->LocateProtocol (\r
- &gEfiDevicePathToTextProtocolGuid,\r
- NULL,\r
- (VOID **) &PathToText\r
- );\r
- ASSERT_EFI_ERROR (Status);\r
\r
//\r
// Update the device path string.\r
//\r
- NewString = PathToText->ConvertDevicePathToText((EFI_DEVICE_PATH_PROTOCOL*)&mHiiVendorDevicePath0, FALSE, FALSE);\r
+ NewString = ConvertDevicePathToText((EFI_DEVICE_PATH_PROTOCOL*)&mHiiVendorDevicePath0, FALSE, FALSE);\r
if (HiiSetString (HiiHandle[0], STRING_TOKEN (STR_DEVICE_PATH), NewString, NULL) == 0) {\r
DriverSampleUnload (ImageHandle);\r
return EFI_OUT_OF_RESOURCES;\r
ConfigRequestHdr = HiiConstructConfigHdr (&gDriverSampleFormSetGuid, VariableName, DriverHandle[0]);\r
ASSERT (ConfigRequestHdr != NULL);\r
\r
+ NameRequestHdr = HiiConstructConfigHdr (&gDriverSampleFormSetGuid, NULL, DriverHandle[0]);\r
+ ASSERT (NameRequestHdr != NULL);\r
+\r
BufferSize = sizeof (DRIVER_SAMPLE_CONFIGURATION);\r
Status = gRT->GetVariable (VariableName, &gDriverSampleFormSetGuid, NULL, &BufferSize, Configuration);\r
if (EFI_ERROR (Status)) {\r
sizeof (DRIVER_SAMPLE_CONFIGURATION),\r
Configuration\r
);\r
- ASSERT (Status == EFI_SUCCESS);\r
+ if (EFI_ERROR (Status)) {\r
+ DriverSampleUnload (ImageHandle);\r
+ return Status;\r
+ }\r
//\r
// EFI variable for NV config doesn't exit, we should build this variable\r
// based on default values stored in IFR\r
//\r
+ ActionFlag = HiiSetToDefaults (NameRequestHdr, EFI_HII_DEFAULT_CLASS_STANDARD);\r
+ if (!ActionFlag) {\r
+ DriverSampleUnload (ImageHandle);\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+\r
ActionFlag = HiiSetToDefaults (ConfigRequestHdr, EFI_HII_DEFAULT_CLASS_STANDARD);\r
- ASSERT (ActionFlag);\r
+ if (!ActionFlag) {\r
+ DriverSampleUnload (ImageHandle);\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
} else {\r
//\r
// EFI variable does exist and Validate Current Setting\r
//\r
+ ActionFlag = HiiValidateSettings (NameRequestHdr);\r
+ if (!ActionFlag) {\r
+ DriverSampleUnload (ImageHandle);\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
+\r
ActionFlag = HiiValidateSettings (ConfigRequestHdr);\r
- ASSERT (ActionFlag);\r
+ if (!ActionFlag) {\r
+ DriverSampleUnload (ImageHandle);\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
}\r
FreePool (ConfigRequestHdr);\r
\r
sizeof (MY_EFI_VARSTORE_DATA),\r
VarStoreConfig\r
);\r
- ASSERT (Status == EFI_SUCCESS);\r
+ if (EFI_ERROR (Status)) {\r
+ DriverSampleUnload (ImageHandle);\r
+ return Status;\r
+ }\r
//\r
// EFI variable for NV config doesn't exit, we should build this variable\r
// based on default values stored in IFR\r
//\r
ActionFlag = HiiSetToDefaults (ConfigRequestHdr, EFI_HII_DEFAULT_CLASS_STANDARD);\r
- ASSERT (ActionFlag);\r
+ if (!ActionFlag) {\r
+ DriverSampleUnload (ImageHandle);\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
} else {\r
//\r
// EFI variable does exist and Validate Current Setting\r
//\r
ActionFlag = HiiValidateSettings (ConfigRequestHdr);\r
- ASSERT (ActionFlag);\r
+ if (!ActionFlag) {\r
+ DriverSampleUnload (ImageHandle);\r
+ return EFI_INVALID_PARAMETER;\r
+ }\r
}\r
FreePool (ConfigRequestHdr);\r
\r