Patch include:

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

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr b/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
index d3165111336558fe3fde3baff93cb37079481d5f..03ae667e7c1b85a942bf343347ee9d8c5bc0968f 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
@@ -51,7 +54,7 @@
 #define LABEL_UPDATE_BBS            0x2222\r
 \r
 formset\r
-  guid      = FORMSET_GUID,\r
+  guid      = DRIVER_SAMPLE_FORMSET_GUID,\r
   title     = STRING_TOKEN(STR_FORM_SET_TITLE),\r
   help      = STRING_TOKEN(STR_FORM_SET_TITLE_HELP),\r
   classguid = EFI_HII_PLATFORM_SETUP_FORMSET_GUID,\r
@@ -71,7 +74,7 @@ formset
   varstore DRIVER_SAMPLE_CONFIGURATION,     // This is the data structure type\r
     varid = CONFIGURATION_VARSTORE_ID,      // Optional VarStore ID\r
     name  = MyIfrNVData,                    // Define referenced name in vfr\r
-    guid  = FORMSET_GUID;                   // GUID of this buffer storage\r
+    guid  = DRIVER_SAMPLE_FORMSET_GUID;     // GUID of this buffer storage\r
 \r
   //\r
   // Define a EFI variable Storage (EFI_IFR_VARSTORE_EFI)\r
@@ -79,7 +82,7 @@ formset
   efivarstore MY_EFI_VARSTORE_DATA,\r
     attribute = EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_NON_VOLATILE,  // EFI variable attribures  \r
     name  = MyEfiVar,\r
-    guid  = FORMSET_GUID;\r
+    guid  = DRIVER_SAMPLE_FORMSET_GUID;\r
 \r
   //\r
   // Define a Name/Value Storage (EFI_IFR_VARSTORE_NAME_VALUE)\r
@@ -88,7 +91,7 @@ formset
     name = STRING_TOKEN(STR_NAME_VALUE_VAR_NAME0), // Define Name list of this storage, refer it by MyNameValueVar[0]\r
     name = STRING_TOKEN(STR_NAME_VALUE_VAR_NAME1), // Define Name list of this storage, refer it by MyNameValueVar[1]\r
     name = STRING_TOKEN(STR_NAME_VALUE_VAR_NAME2), // Define Name list of this storage, refer it by MyNameValueVar[2]\r
-    guid = FORMSET_GUID;                           // GUID of this Name/Value storage\r
+    guid = DRIVER_SAMPLE_FORMSET_GUID;             // GUID of this Name/Value storage\r
 \r
   defaultstore MyStandardDefault,\r
     prompt      = STRING_TOKEN(STR_STANDARD_DEFAULT_PROMPT),\r
@@ -355,6 +358,7 @@ formset
             minimum = 0,\r
             maximum = 0xff,\r
             step    = 0,\r
+            locked,\r
     endnumeric;\r
 \r
     numeric varid   = MyNameValueVar[1],     // This numeric take NameValueVar1 as storage\r
@@ -491,8 +495,15 @@ 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 = FORMSET_GUID,\r
+      guid = DRIVER_SAMPLE_FORMSET_GUID,\r
       datatype = MY_EFI_VARSTORE_DATA,\r
         data.Field8  = 0x21, \r
         data.Field16 = 0x2121,\r
@@ -605,7 +616,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
@@ -680,7 +691,7 @@ formset
 \r
   formmap formid = 4,            \r
     maptitle = STRING_TOKEN(STR_SAMPL_MAP_METHOD);  \r
-    mapguid  = FORMSET_GUID;\r
+    mapguid  = DRIVER_SAMPLE_FORMSET_GUID;\r
     maptitle = STRING_TOKEN(STR_STANDARD_MAP_METHOD);  \r
     mapguid  = EFI_HII_STANDARD_FORM_GUID;\r
 \r