Cc: Eric Dong <eric.d...@intel.com>
Cc: Liming Gao <liming....@intel.com>
Cc: Ruiyu Ni <ruiyu...@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Dandan Bi <dandan...@intel.com>
---
.../Universal/DriverSampleDxe/DriverSample.c | 57 ++++++++++++++++++++++
.../Universal/DriverSampleDxe/DriverSample.h | 1 +
.../Universal/DriverSampleDxe/NVDataStruc.h | 18 +++++++
MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr | 25 ++++++++++
.../Universal/DriverSampleDxe/VfrStrings.uni | 4 ++
5 files changed, 105 insertions(+)
diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
index f103b9c..c4cd7f2 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
+++ b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
@@ -18,10 +18,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
EXPRESS OR IMPLIED.
#define DISPLAY_ONLY_MY_ITEM 0x0002
CHAR16 VariableName[] = L"MyIfrNVData";
CHAR16 MyEfiVar[] = L"MyEfiVar";
+CHAR16 MyUnionVar[] = L"MyUnionVar";
EFI_HANDLE DriverHandle[2] = {NULL, NULL};
DRIVER_SAMPLE_PRIVATE_DATA *mPrivateData = NULL;
EFI_EVENT mEvent;
HII_VENDOR_DEVICE_PATH mHiiVendorDevicePath0 = {
@@ -662,10 +663,14 @@ ExtractConfig (
// through hii database, not support in this path.
//
if (HiiIsConfigHdrMatch(Request, &gDriverSampleFormSetGuid, MyEfiVar)) {
return EFI_UNSUPPORTED;
}
+
+ if (HiiIsConfigHdrMatch(Request, &gDriverSampleFormSetGuid, MyUnionVar)) {
+ return EFI_UNSUPPORTED;
+ }
//
// Set Request to the unified request string.
//
ConfigRequest = Request;
//
@@ -884,10 +889,14 @@ RouteConfig (
//
if (HiiIsConfigHdrMatch(Configuration, &gDriverSampleFormSetGuid, MyEfiVar))
{
return EFI_UNSUPPORTED;
}
+ if (HiiIsConfigHdrMatch(Configuration, &gDriverSampleFormSetGuid,
MyUnionVar)) {
+ return EFI_UNSUPPORTED;
+ }
+
//
// Get Buffer Storage data from EFI variable
//
BufferSize = sizeof (DRIVER_SAMPLE_CONFIGURATION);
Status = gRT->GetVariable (
@@ -1685,10 +1694,11 @@ DriverSampleInit (
EFI_STRING ConfigRequestHdr;
EFI_STRING NameRequestHdr;
MY_EFI_VARSTORE_DATA *VarStoreConfig;
EFI_INPUT_KEY HotKey;
EDKII_FORM_BROWSER_EXTENSION_PROTOCOL *FormBrowserEx;
+ MY_UNION_DATA *UnionConfig;
//
// Initialize the local variables.
//
ConfigRequestHdr = NULL;
@@ -1962,10 +1972,57 @@ DriverSampleInit (
return EFI_INVALID_PARAMETER;
}
}
FreePool (ConfigRequestHdr);
+ //
+ // Initialize Union efi varstore configuration data
+ //
+ UnionConfig = &mPrivateData->UnionConfig;
+ ZeroMem (UnionConfig, sizeof (MY_UNION_DATA));
+
+ ConfigRequestHdr = HiiConstructConfigHdr (&gDriverSampleFormSetGuid,
MyUnionVar, DriverHandle[0]);
+ ASSERT (ConfigRequestHdr != NULL);
+
+ BufferSize = sizeof (MY_UNION_DATA);
+ Status = gRT->GetVariable (MyUnionVar, &gDriverSampleFormSetGuid, NULL,
&BufferSize, UnionConfig);
+ if (EFI_ERROR (Status)) {
+ //
+ // Store zero data to EFI variable Storage.
+ //
+ Status = gRT->SetVariable(
+ MyUnionVar,
+ &gDriverSampleFormSetGuid,
+ EFI_VARIABLE_NON_VOLATILE |
EFI_VARIABLE_BOOTSERVICE_ACCESS,
+ sizeof (MY_UNION_DATA),
+ UnionConfig
+ );
+ if (EFI_ERROR (Status)) {
+ DriverSampleUnload (ImageHandle);
+ return Status;
+ }
+ //
+ // EFI variable for NV config doesn't exit, we should build this variable
+ // based on default values stored in IFR
+ //
+ ActionFlag = HiiSetToDefaults (ConfigRequestHdr,
EFI_HII_DEFAULT_CLASS_STANDARD);
+ if (!ActionFlag) {
+ DriverSampleUnload (ImageHandle);
+ return EFI_INVALID_PARAMETER;
+ }
+ } else {
+ //
+ // EFI variable does exist and Validate Current Setting
+ //
+ ActionFlag = HiiValidateSettings (ConfigRequestHdr);
+ if (!ActionFlag) {
+ DriverSampleUnload (ImageHandle);
+ return EFI_INVALID_PARAMETER;
+ }
+ }
+ FreePool (ConfigRequestHdr);
+
Status = gBS->CreateEventEx (
EVT_NOTIFY_SIGNAL,
TPL_NOTIFY,
EfiEventEmptyFunction,
NULL,
diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h
b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h
index 6c97239..895547a 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h
+++ b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h
@@ -82,10 +82,11 @@ typedef struct {
EFI_HANDLE DriverHandle[2];
EFI_HII_HANDLE HiiHandle[2];
DRIVER_SAMPLE_CONFIGURATION Configuration;
MY_EFI_VARSTORE_DATA VarStoreConfig;
+ MY_UNION_DATA UnionConfig;
//
// Name/Value storage Name list
//
EFI_STRING_ID NameStringId[NAME_VALUE_NAME_NUMBER];
diff --git a/MdeModulePkg/Universal/DriverSampleDxe/NVDataStruc.h
b/MdeModulePkg/Universal/DriverSampleDxe/NVDataStruc.h
index 195cc8a..eee7282 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/NVDataStruc.h
+++ b/MdeModulePkg/Universal/DriverSampleDxe/NVDataStruc.h
@@ -31,10 +31,22 @@ Revision History:
#include <Guid/ZeroGuid.h>
#define CONFIGURATION_VARSTORE_ID 0x1234
#pragma pack(1)
+
+typedef struct {
+ UINT8 Field8;
+ UINT16 Field16;
+ UINT8 OrderedList[6];
+} MY_EFI_VARSTORE2_DATA;
+
+typedef union {
+ MY_EFI_VARSTORE2_DATA Data2;
+ UINT8 HowOldAreYouInYearsManual;
+} UNION_DATA_TEST;
+
typedef struct {
UINT16 MyStringData[40];
UINT16 SomethingHiddenForHtml;
UINT8 HowOldAreYouInYearsManual;
UINT16 HowTallAreYouManual;
@@ -62,10 +74,11 @@ typedef struct {
UINT16 SerialPortIo;
UINT8 SerialPortIrq;
UINT8 GetDefaultValueFromCallBack;
UINT8 GetDefaultValueFromAccess;
EFI_HII_TIME Time;
+ UNION_DATA_TEST UnionData;
UINT8 RefreshGuidCount;
UINT8 Match2;
UINT8 GetDefaultValueFromCallBackForOrderedList[3];
} DRIVER_SAMPLE_CONFIGURATION;
@@ -77,10 +90,15 @@ typedef struct {
UINT16 Field16;
UINT8 OrderedList[3];
UINT16 SubmittedCallback;
} MY_EFI_VARSTORE_DATA;
+typedef union {
+ MY_EFI_VARSTORE_DATA Data1;
+ MY_EFI_VARSTORE2_DATA Data2;
+} MY_UNION_DATA;
+
//
// Labels definition
//
#define LABEL_UPDATE1 0x1234
#define LABEL_UPDATE2 0x2234
diff --git a/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
b/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
index 4bdaf76..9dc88ab 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
+++ b/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
@@ -85,10 +85,15 @@ formset
efivarstore MY_EFI_VARSTORE_DATA,
attribute = EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_NON_VOLATILE,
// EFI variable attribures
name = MyEfiVar,
guid = DRIVER_SAMPLE_FORMSET_GUID;
+ efivarstore MY_UNION_DATA,
+ attribute = EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_NON_VOLATILE,
// EFI variable attribures
+ name = MyUnionVar,
+ guid = DRIVER_SAMPLE_FORMSET_GUID;
+
//
// Define a Name/Value Storage (EFI_IFR_VARSTORE_NAME_VALUE)
//
namevaluevarstore MyNameValueVar, // Define storage reference
name in vfr
name = STRING_TOKEN(STR_NAME_VALUE_VAR_NAME0), // Define Name list of this
storage, refer it by MyNameValueVar[0]
@@ -112,10 +117,30 @@ formset
subtitle text = STRING_TOKEN(STR_SUBTITLE_TEXT);
subtitle text = STRING_TOKEN(STR_SUBTITLE_TEXT2);
+ numeric varid = MyUnionVar.Data2.Field8,
+ prompt = STRING_TOKEN(STR_UNION_NUMERIC_PROMPT),
+ help = STRING_TOKEN(STR_UNION_NUMERIC_HELP),
+ minimum = 0,
+ maximum = 20,
+ step = 0,
+ default = 7, defaultstore = MyStandardDefault, // This is
standard default value
+ default = 8, defaultstore = MyManufactureDefault, // This is
manufacture default value
+ endnumeric;
+
+ numeric varid = MyIfrNVData.UnionData.Data2.Field8,
+ prompt = STRING_TOKEN(STR_UNION_NUMERIC_PROMPT),
+ help = STRING_TOKEN(STR_UNION_NUMERIC_HELP),
+ minimum = 0,
+ maximum = 20,
+ step = 0,
+ default = 7, defaultstore = MyStandardDefault, // This is
standard default value
+ default = 8, defaultstore = MyManufactureDefault, // This is
manufacture default value
+ endnumeric;
+
//
// Define a display only text (EFI_IFR_TEXT)
//
text
help = STRING_TOKEN(STR_TEXT_HELP), // Help string
diff --git a/MdeModulePkg/Universal/DriverSampleDxe/VfrStrings.uni
b/MdeModulePkg/Universal/DriverSampleDxe/VfrStrings.uni
index 8d24a47..2a632d4 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/VfrStrings.uni
+++ b/MdeModulePkg/Universal/DriverSampleDxe/VfrStrings.uni
@@ -86,10 +86,14 @@
#language fr-FR "Éste es el mensaje de
la ayuda para la activación del armamento nuclear. Cuál es exactamente
resistente calcular fuera sobre de eso?"
#string STR_CHECK_DYNAMIC_PROMPT #language en-US "Activate Dynamic check
box"
#language fr-FR "Activate Dynamico
check box"
#string STR_CHECK_DYNAMIC_HELP #language en-US "This is the help
message for the activation of check boxes. This is not to be confused with
activating Czech boxes, since one can never tell what the ramifications are of
activating foreign controlled boxes are."
#language fr-FR "Spanish - This is the
help message for the activation of check boxes. This is not to be confused
with activating Czech boxes, since one can never tell what the ramifications
are of activating foreign controlled boxes are."
+#string STR_UNION_NUMERIC_PROMPT #language en-US "UNION numeric"
+ #language fr-FR "UNION numeric"
+#string STR_UNION_NUMERIC_HELP #language en-US "Varstore refer to
union type"
+ #language fr-FR "Varstore refer to
union type"
#string STR_NUMERIC_PROMPT #language en-US "How old are you?"
#language fr-FR "Cómo viejo es usted?"
#string STR_NUMERIC_STEP_PROMPT #language en-US "How old are you?
(Step)"
#language fr-FR "Cómo viejo es
usted?(Step)"
#string STR_NUMERIC_PROMPT1 #language en-US "How tall are you?"
--
1.9.5.msysgit.1
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
