OvmfPkg NvVarsFileLib: Set NvVars variable after writing vars file

[mirror_edk2.git] / MdeModulePkg / Universal / DriverSampleDxe / Vfr.vfr

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr b/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
index 78c93d0ebff3a4bb7495f559d4267781d25c415d..0a77e408fa7be360e22d7da30db539fde03e969c 100644 (file)
--- a/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
+++ b/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
@@ -43,6 +43,9 @@
 #define EFI_VARIABLE_RUNTIME_ACCESS     0x00000004\r
 #define EFI_VARIABLE_READ_ONLY          0x00000008\r
 \r
+#define EFI_USER_INFO_ACCESS_SETUP_ADMIN_GUID \\r
+  { 0x85b75607, 0xf7ce, 0x471e, { 0xb7, 0xe4, 0x2a, 0xea, 0x5f, 0x72, 0x32, 0xee } }\r
+\r
 //\r
 // Labels definition\r
 //\r
@@ -317,7 +320,7 @@ formset
             minimum = 0,\r
             maximum = 0xf0,\r
             step    = 0,\r
-            default = 21,\r
+            default value = questionrefval(devicepath = STRING_TOKEN (STR_DEVICE_PATH), guid = DRIVER_SAMPLE_FORMSET_GUID, 0x1111),\r
 \r
             inconsistentif prompt = STRING_TOKEN(STR_ERROR_POPUP),\r
               ideqval MyIfrNVData.HowOldAreYouInYearsManual == 99\r
@@ -355,6 +358,9 @@ formset
             minimum = 0,\r
             maximum = 0xff,\r
             step    = 0,\r
+            locked,\r
+            default = 16, defaultstore = MyStandardDefault,     // This is standard default value\r
+            default = 17, defaultstore = MyManufactureDefault,  // This is manufacture default value\r
     endnumeric;\r
 \r
     numeric varid   = MyNameValueVar[1],     // This numeric take NameValueVar1 as storage\r
@@ -364,6 +370,8 @@ formset
             minimum = 0,\r
             maximum = 0xffff,\r
             step    = 0,\r
+            default = 18, defaultstore = MyStandardDefault,     // This is standard default value\r
+            default = 19, defaultstore = MyManufactureDefault,  // This is manufacture default value\r
     endnumeric;\r
 \r
     //\r
@@ -491,6 +499,13 @@ formset
       prompt = STRING_TOKEN(STR_GOTO_FORM6), //SixthSetupPage  // this too has no end-op and basically it's a jump to a form ONLY\r
       help   = STRING_TOKEN(STR_GOTO_HELP);\r
 \r
+    goto \r
+      formsetguid = DRIVER_SAMPLE_INVENTORY_GUID,\r
+      formid  = 0x1,\r
+      question = 0x1,\r
+      prompt  = STRING_TOKEN(STR_GOTO_ANOTHER_FORMSET),\r
+      help    = STRING_TOKEN(STR_GOTO_ANOTHER_FORMSET_HELP);\r
+\r
     guidop \r
       guid = DRIVER_SAMPLE_FORMSET_GUID,\r
       datatype = MY_EFI_VARSTORE_DATA,\r
@@ -605,7 +620,7 @@ formset
             varid   = MyIfrNVData.Time, \r
             prompt  = STRING_TOKEN(STR_TIME_PROMPT), \r
             help    = STRING_TOKEN(STR_TIME_PROMPT), \r
-            flags   = STORAGE_NORMAL, \r
+            flags   = STORAGE_NORMAL | SECOND_SUPPRESS,\r
             default = 15:33:33, \r
       endtime;\r
       \r
@@ -634,11 +649,12 @@ formset
       prompt  = STRING_TOKEN(STR_GOTO_DYNAMIC3),\r
       help    = STRING_TOKEN(STR_GOTO_DYNAMIC3_HELP),\r
       flags   = INTERACTIVE,\r
-      key     = 0x1248;\r
+      key     = 0x1248,\r
       //\r
       // Set the defult value, format is QuestionId; FormId; FormsetGuid; Device Path String Token\r
       //\r
       default = 0;0;ZERO_GUID;STRING_TOKEN(STR_NULL_STRING),  \r
+    ;                                                         // goto opcode end flag.\r
 \r
     goto \r
       prompt  = STRING_TOKEN(STR_GOTO_DYNAMIC4),\r