Add a reference of 2nd buffer storage in a formset.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5271 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/NVDataStruc.h b/MdeModulePkg/Universal/DriverSampleDxe/NVDataStruc.h
index 0ed3c8da7104fea7823ea50efbc1d1acc95e6fe1..6a1c7280127a7b878b3d502c1c005284ddbe3f32 100644 (file)
--- a/MdeModulePkg/Universal/DriverSampleDxe/NVDataStruc.h
+++ b/MdeModulePkg/Universal/DriverSampleDxe/NVDataStruc.h
@@ -59,6 +59,17 @@ typedef struct {
   UINT8   BootOrderLarge;
   UINT8   DynamicCheck;
 } DRIVER_SAMPLE_CONFIGURATION;
+
+//
+// 2nd NV data structure definition
+//
+typedef struct {
+  UINT8         Field8;
+  UINT16        Field16;
+  UINT8         OrderedList[3];
+} MY_DATA2;
+
+
 #pragma pack()
 
 #endif

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr b/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
index 799cdf2d3a925d0712ff77c35274c52e2f827053..ed431a5e72b6ffe43bef15889682fafb919c508c 100644 (file)
--- a/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
+++ b/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
@@ -43,15 +43,6 @@
 #define EFI_VARIABLE_RUNTIME_ACCESS     0x00000004\r
 #define EFI_VARIABLE_READ_ONLY          0x00000008\r
 \r
-//\r
-// NV data structure definition\r
-//\r
-typedef struct {\r
-  UINT8         Field8;\r
-  UINT16        Field16;\r
-  UINT8         OrderedList[3];\r
-} MY_DATA2;\r
-\r
 //\r
 // Labels definition\r
 //\r
@@ -331,6 +322,16 @@ formset
 \r
     endnumeric;\r
 \r
+    numeric varid   = MyIfrNVData2.Field8,                           // Reference of MyIfrNVData2 storage\r
+            prompt  = STRING_TOKEN(STR_MYIFRNVDATA2_HEX_PROMPT),\r
+            help    = STRING_TOKEN(STR_MYIFRNVDATA2_HEX_HELP),\r
+            flags   = DISPLAY_UINT_HEX,                   // Display in HEX format (if not specified, default is in decimal format)\r
+            minimum = 0,\r
+            maximum = 250,\r
+            default = 175,\r
+\r
+    endnumeric;\r
+\r
     label LABEL_1_VALUE;\r
     label LABEL_2_VALUE;\r
 \r

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/VfrStrings.uni b/MdeModulePkg/Universal/DriverSampleDxe/VfrStrings.uni
index b065abd555e125c2a8ccd2789e329071a3148fc9..32e93b513ceee20f2e27af4dedd10df3d4dc6872 100644 (file)
Binary files a/MdeModulePkg/Universal/DriverSampleDxe/VfrStrings.uni and b/MdeModulePkg/Universal/DriverSampleDxe/VfrStrings.uni differ