3 files changed, 21 insertions, 9 deletions
diff --git a/MdeModulePkg/Universal/DriverSampleDxe/NVDataStruc.h b/MdeModulePkg/Universal/DriverSampleDxe/NVDataStruc.h
index 0ed3c8d..6a1c728 100644
--- 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 799cdf2..ed431a5 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
+++ b/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
@@ -44,15 +44,6 @@
 #define EFI_VARIABLE_READ_ONLY          0x00000008
 
 //
-// NV data structure definition
-//
-typedef struct {
-  UINT8         Field8;
-  UINT16        Field16;
-  UINT8         OrderedList[3];
-} MY_DATA2;
-
-//
 // Labels definition
 //
 #define LABEL_1_VALUE               0x01
@@ -331,6 +322,16 @@ formset
 
     endnumeric;
 
+    numeric varid   = MyIfrNVData2.Field8,                           // Reference of MyIfrNVData2 storage
+            prompt  = STRING_TOKEN(STR_MYIFRNVDATA2_HEX_PROMPT),
+            help    = STRING_TOKEN(STR_MYIFRNVDATA2_HEX_HELP),
+            flags   = DISPLAY_UINT_HEX,                   // Display in HEX format (if not specified, default is in decimal format)
+            minimum = 0,
+            maximum = 250,
+            default = 175,
+
+    endnumeric;
+
     label LABEL_1_VALUE;
     label LABEL_2_VALUE;
 
diff --git a/MdeModulePkg/Universal/DriverSampleDxe/VfrStrings.uni b/MdeModulePkg/Universal/DriverSampleDxe/VfrStrings.uni
index b065abd..32e93b5 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/VfrStrings.uni
+++ b/MdeModulePkg/Universal/DriverSampleDxe/VfrStrings.uni