X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=MdeModulePkg%2FUniversal%2FDriverSampleDxe%2FVfr.vfr;h=03ae667e7c1b85a942bf343347ee9d8c5bc0968f;hb=4a6876b72f2d654c168bfe7e3a80da7b98fff8b5;hp=d3165111336558fe3fde3baff93cb37079481d5f;hpb=78c2b9a33478ee0cb7e39466fb12191dde56b210;p=mirror_edk2.git

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr b/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
index d316511133..03ae667e7c 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
+++ b/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
@@ -43,6 +43,9 @@
 #define EFI_VARIABLE_RUNTIME_ACCESS     0x00000004
 #define EFI_VARIABLE_READ_ONLY          0x00000008
 
+#define EFI_USER_INFO_ACCESS_SETUP_ADMIN_GUID \
+  { 0x85b75607, 0xf7ce, 0x471e, { 0xb7, 0xe4, 0x2a, 0xea, 0x5f, 0x72, 0x32, 0xee } }
+
 //
 // Labels definition
 //
@@ -51,7 +54,7 @@
 #define LABEL_UPDATE_BBS            0x2222
 
 formset
-  guid      = FORMSET_GUID,
+  guid      = DRIVER_SAMPLE_FORMSET_GUID,
   title     = STRING_TOKEN(STR_FORM_SET_TITLE),
   help      = STRING_TOKEN(STR_FORM_SET_TITLE_HELP),
   classguid = EFI_HII_PLATFORM_SETUP_FORMSET_GUID,
@@ -71,7 +74,7 @@ formset
   varstore DRIVER_SAMPLE_CONFIGURATION,     // This is the data structure type
     varid = CONFIGURATION_VARSTORE_ID,      // Optional VarStore ID
     name  = MyIfrNVData,                    // Define referenced name in vfr
-    guid  = FORMSET_GUID;                   // GUID of this buffer storage
+    guid  = DRIVER_SAMPLE_FORMSET_GUID;     // GUID of this buffer storage
 
   //
   // Define a EFI variable Storage (EFI_IFR_VARSTORE_EFI)
@@ -79,7 +82,7 @@ formset
   efivarstore MY_EFI_VARSTORE_DATA,
     attribute = EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_NON_VOLATILE,  // EFI variable attribures  
     name  = MyEfiVar,
-    guid  = FORMSET_GUID;
+    guid  = DRIVER_SAMPLE_FORMSET_GUID;
 
   //
   // Define a Name/Value Storage (EFI_IFR_VARSTORE_NAME_VALUE)
@@ -88,7 +91,7 @@ formset
     name = STRING_TOKEN(STR_NAME_VALUE_VAR_NAME0), // Define Name list of this storage, refer it by MyNameValueVar[0]
     name = STRING_TOKEN(STR_NAME_VALUE_VAR_NAME1), // Define Name list of this storage, refer it by MyNameValueVar[1]
     name = STRING_TOKEN(STR_NAME_VALUE_VAR_NAME2), // Define Name list of this storage, refer it by MyNameValueVar[2]
-    guid = FORMSET_GUID;                           // GUID of this Name/Value storage
+    guid = DRIVER_SAMPLE_FORMSET_GUID;             // GUID of this Name/Value storage
 
   defaultstore MyStandardDefault,
     prompt      = STRING_TOKEN(STR_STANDARD_DEFAULT_PROMPT),
@@ -355,6 +358,7 @@ formset
             minimum = 0,
             maximum = 0xff,
             step    = 0,
+            locked,
     endnumeric;
 
     numeric varid   = MyNameValueVar[1],     // This numeric take NameValueVar1 as storage
@@ -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
       help   = STRING_TOKEN(STR_GOTO_HELP);
 
+    goto 
+      formsetguid = DRIVER_SAMPLE_INVENTORY_GUID,
+      formid  = 0x1,
+      question = 0x1,
+      prompt  = STRING_TOKEN(STR_GOTO_ANOTHER_FORMSET),
+      help    = STRING_TOKEN(STR_GOTO_ANOTHER_FORMSET_HELP);
+
     guidop 
-      guid = FORMSET_GUID,
+      guid = DRIVER_SAMPLE_FORMSET_GUID,
       datatype = MY_EFI_VARSTORE_DATA,
         data.Field8  = 0x21, 
         data.Field16 = 0x2121,
@@ -605,7 +616,7 @@ formset
             varid   = MyIfrNVData.Time, 
             prompt  = STRING_TOKEN(STR_TIME_PROMPT), 
             help    = STRING_TOKEN(STR_TIME_PROMPT), 
-            flags   = STORAGE_NORMAL, 
+            flags   = STORAGE_NORMAL | SECOND_SUPPRESS,
             default = 15:33:33, 
       endtime;
       
@@ -680,7 +691,7 @@ formset
 
   formmap formid = 4,            
     maptitle = STRING_TOKEN(STR_SAMPL_MAP_METHOD);  
-    mapguid  = FORMSET_GUID;
+    mapguid  = DRIVER_SAMPLE_FORMSET_GUID;
     maptitle = STRING_TOKEN(STR_STANDARD_MAP_METHOD);  
     mapguid  = EFI_HII_STANDARD_FORM_GUID;