diff options
| author | vanjeff <vanjeff> | 2013-09-26 05:43:51 +0000 |
|---|---|---|
| committer | vanjeff <vanjeff@6f19259b-4bc3-4df7-8a09-765794883524> | 2013-09-26 05:43:51 +0000 |
| commit | ff19a31583f2f6e0c67b6653c38c7d95bad78c21 (patch) | |
| tree | 0bf39c21ec93e99e075b458f22c77764fdbacca4 /MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c | |
| parent | 40b1052550a52f2bed8907741c8f35064e6008a7 (diff) | |
| download | edk2-ff19a31583f2f6e0c67b6653c38c7d95bad78c21.zip edk2-ff19a31583f2f6e0c67b6653c38c7d95bad78c21.tar.gz edk2-ff19a31583f2f6e0c67b6653c38c7d95bad78c21.tar.bz2 | |
Sync patches r14451, r14452, r14453 and r14474 from main trunk.
Update HiiDataBase and UefiHiiLib to support Name/Value varstore.
git-svn-id: https://svn.code.sf.net/p/edk2/code/branches/UDK2010.SR1@14732 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c')
| -rw-r--r-- | MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c index 4208a22..f5c44d0 100644 --- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c +++ b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c @@ -1794,6 +1794,7 @@ DriverSampleInit ( DRIVER_SAMPLE_CONFIGURATION *Configuration;
BOOLEAN ActionFlag;
EFI_STRING ConfigRequestHdr;
+ EFI_STRING NameRequestHdr;
MY_EFI_VARSTORE_DATA *VarStoreConfig;
//
@@ -1962,6 +1963,9 @@ DriverSampleInit ( ConfigRequestHdr = HiiConstructConfigHdr (&gDriverSampleFormSetGuid, VariableName, DriverHandle[0]);
ASSERT (ConfigRequestHdr != NULL);
+ NameRequestHdr = HiiConstructConfigHdr (&gDriverSampleFormSetGuid, NULL, DriverHandle[0]);
+ ASSERT (NameRequestHdr != NULL);
+
BufferSize = sizeof (DRIVER_SAMPLE_CONFIGURATION);
Status = gRT->GetVariable (VariableName, &gDriverSampleFormSetGuid, NULL, &BufferSize, Configuration);
if (EFI_ERROR (Status)) {
@@ -1980,12 +1984,18 @@ DriverSampleInit ( // EFI variable for NV config doesn't exit, we should build this variable
// based on default values stored in IFR
//
+ ActionFlag = HiiSetToDefaults (NameRequestHdr, EFI_HII_DEFAULT_CLASS_STANDARD);
+ ASSERT (ActionFlag);
+
ActionFlag = HiiSetToDefaults (ConfigRequestHdr, EFI_HII_DEFAULT_CLASS_STANDARD);
ASSERT (ActionFlag);
} else {
//
// EFI variable does exist and Validate Current Setting
//
+ ActionFlag = HiiValidateSettings (NameRequestHdr);
+ ASSERT (ActionFlag);
+
ActionFlag = HiiValidateSettings (ConfigRequestHdr);
ASSERT (ActionFlag);
}
|