MdeModulePkg: Add match2 opcode support in SetupBrowserDxe and sample code in DriverS...

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

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr b/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
index 4f6ac07071fe60095bde8c02447d7ed0d6c1044d..bd90fcd9c35966728457c9773733953ab9a39b31 100644 (file)
--- a/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
+++ b/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
@@ -46,6 +46,9 @@
 #define EFI_USER_INFO_ACCESS_SETUP_ADMIN_GUID \\r
   { 0x85b75607, 0xf7ce, 0x471e, { 0xb7, 0xe4, 0x2a, 0xea, 0x5f, 0x72, 0x32, 0xee } }\r
 \r
+#define PERL_GUID \\r
+  { 0x63E60A51, 0x497D, 0xD427, {0xC4, 0xA5, 0xB8, 0xAB, 0xDC, 0x3A, 0xAE, 0xB6 }}\r
+\r
 //\r
 // Labels definition\r
 //\r
@@ -125,28 +128,24 @@ formset
     text\r
       help   = STRING_TOKEN(STR_EXIT_TEXT),\r
       text   = STRING_TOKEN(STR_EXIT_TEXT),\r
-        text   = STRING_TOKEN(STR_EXIT_TEXT),\r
       flags  = INTERACTIVE,   // VfrCompiler will generate opcode EFI_IFR_ACTION for Text marked as INTERACTIVE\r
       key    = 0x1237;\r
 \r
     text\r
       help   = STRING_TOKEN(STR_SAVE_TEXT),\r
       text   = STRING_TOKEN(STR_SAVE_TEXT),\r
-        text   = STRING_TOKEN(STR_SAVE_TEXT),\r
       flags  = INTERACTIVE,\r
       key    = 0x1238;\r
 \r
     text\r
       help   = STRING_TOKEN(STR_SAVE_CURRENT),\r
       text   = STRING_TOKEN(STR_SAVE_CURRENT),\r
-        text   = STRING_TOKEN(STR_SAVE_CURRENT),\r
       flags  = INTERACTIVE,\r
       key    = 0x1243;\r
 \r
     text\r
       help   = STRING_TOKEN(STR_DISCARD_CURRENT_AND_EXIT),\r
       text   = STRING_TOKEN(STR_DISCARD_CURRENT_AND_EXIT),\r
-        text   = STRING_TOKEN(STR_DISCARD_CURRENT_AND_EXIT),\r
       flags  = INTERACTIVE,\r
       key    = 0x1244;\r
     //\r
@@ -186,11 +185,10 @@ formset
                  // CHECKBOX_DEFAULT_MFG indicate EFI_IFR_CHECKBOX_DEFAULT_MFG.\r
                  //\r
                  flags    = CHECKBOX_DEFAULT | CHECKBOX_DEFAULT_MFG,\r
-                 key      = 0,\r
-                 default  = 1,\r
+                 default  = TRUE,\r
         endcheckbox;\r
       endif;\r
-       endif;\r
+    endif;\r
 \r
     //\r
     // Ordered list:\r
@@ -211,11 +209,12 @@ formset
                 varid       = MyIfrNVData.BootOrder,\r
                 prompt      = STRING_TOKEN(STR_BOOT_OPTIONS),\r
                 help        = STRING_TOKEN(STR_NULL_STRING),\r
-                option text = STRING_TOKEN(STR_BOOT_OPTION2), value = 2, flags = RESET_REQUIRED;\r
-                option text = STRING_TOKEN(STR_BOOT_OPTION1), value = 1, flags = RESET_REQUIRED;\r
-                option text = STRING_TOKEN(STR_BOOT_OPTION3), value = 3, flags = RESET_REQUIRED;\r
+                flags       = RESET_REQUIRED,\r
+                option text = STRING_TOKEN(STR_BOOT_OPTION2), value = 2, flags = 0;\r
+                option text = STRING_TOKEN(STR_BOOT_OPTION1), value = 1, flags = 0;\r
+                option text = STRING_TOKEN(STR_BOOT_OPTION3), value = 3, flags = 0;\r
               suppressif ideqval MyIfrNVData.BootOrderLarge == 0;\r
-                option text = STRING_TOKEN(STR_BOOT_OPTION4), value = 4, flags = RESET_REQUIRED;\r
+                option text = STRING_TOKEN(STR_BOOT_OPTION4), value = 4, flags = 0;\r
               endif\r
       endlist;\r
 \r
@@ -231,9 +230,10 @@ formset
         varid       = MyIfrNVData.OrderedList,\r
         prompt      = STRING_TOKEN(STR_TEST_OPCODE),\r
         help        = STRING_TOKEN(STR_TEXT_HELP),\r
-        option text = STRING_TOKEN(STR_ONE_OF_TEXT1), value = 3, flags = RESET_REQUIRED;\r
-        option text = STRING_TOKEN(STR_ONE_OF_TEXT2), value = 2, flags = RESET_REQUIRED;\r
-        option text = STRING_TOKEN(STR_ONE_OF_TEXT3), value = 1, flags = RESET_REQUIRED;\r
+        flags       = RESET_REQUIRED,\r
+        option text = STRING_TOKEN(STR_ONE_OF_TEXT1), value = 3, flags = 0;\r
+        option text = STRING_TOKEN(STR_ONE_OF_TEXT2), value = 2, flags = 0;\r
+        option text = STRING_TOKEN(STR_ONE_OF_TEXT3), value = 1, flags = 0;\r
       endlist;\r
     endif;\r
 \r
@@ -257,8 +257,9 @@ formset
     oneof varid  = MyIfrNVData.TestLateCheck,\r
       prompt      = STRING_TOKEN(STR_TEST_OPCODE),\r
       help        = STRING_TOKEN(STR_ONE_OF_HELP),\r
-      option text = STRING_TOKEN(STR_ONE_OF_TEXT1), value = 0, flags = RESET_REQUIRED;\r
-      option text = STRING_TOKEN(STR_ONE_OF_TEXT2), value = 1, flags = DEFAULT | RESET_REQUIRED;\r
+      flags       = RESET_REQUIRED,\r
+      option text = STRING_TOKEN(STR_ONE_OF_TEXT1), value = 0, flags = 0;\r
+      option text = STRING_TOKEN(STR_ONE_OF_TEXT2), value = 1, flags = DEFAULT;\r
       warningif prompt = STRING_TOKEN(STR_WARNING_POPUP), timeout = 5,\r
         ideqval MyIfrNVData.TestLateCheck == 0\r
       endif\r
@@ -268,8 +269,9 @@ formset
     oneof varid  = MyIfrNVData.TestLateCheck2,\r
       prompt      = STRING_TOKEN(STR_TEST_OPCODE2),\r
       help        = STRING_TOKEN(STR_ONE_OF_HELP),\r
-      option text = STRING_TOKEN(STR_ONE_OF_TEXT1), value = 0, flags = DEFAULT | RESET_REQUIRED;\r
-      option text = STRING_TOKEN(STR_ONE_OF_TEXT2), value = 1, flags = RESET_REQUIRED;\r
+      flags       = RESET_REQUIRED,\r
+      option text = STRING_TOKEN(STR_ONE_OF_TEXT1), value = 0, flags = DEFAULT;\r
+      option text = STRING_TOKEN(STR_ONE_OF_TEXT2), value = 1, flags = 0;\r
 \r
       inconsistentif prompt = STRING_TOKEN(STR_ERROR_POPUP),\r
         ideqid MyIfrNVData.TestLateCheck == MyIfrNVData.TestLateCheck2\r
@@ -280,10 +282,10 @@ formset
     oneof varid  = MyIfrNVData.QuestionAboutTreeHugging,\r
       prompt      = STRING_TOKEN(STR_ONE_OF_PROMPT),\r
       help        = STRING_TOKEN(STR_ONE_OF_HELP),\r
-      option text = STRING_TOKEN(STR_ONE_OF_TEXT1), value = 0, flags = RESET_REQUIRED;\r
-      option text = STRING_TOKEN(STR_ONE_OF_TEXT2), value = 1, flags = DEFAULT | RESET_REQUIRED;\r
-      option text = STRING_TOKEN(STR_ONE_OF_TEXT3), value = 0x03, flags = RESET_REQUIRED;\r
-\r
+      flags       = RESET_REQUIRED,\r
+      option text = STRING_TOKEN(STR_ONE_OF_TEXT1), value = 0, flags = 0;\r
+      option text = STRING_TOKEN(STR_ONE_OF_TEXT2), value = 1, flags = DEFAULT;\r
+      option text = STRING_TOKEN(STR_ONE_OF_TEXT3), value = 3, flags = 0;\r
     endoneof;\r
 \r
     //\r
@@ -563,14 +565,12 @@ formset
       text\r
         help   = STRING_TOKEN(STR_SAVE_CURRENT_AND_EXIT),\r
         text   = STRING_TOKEN(STR_SAVE_CURRENT_AND_EXIT),\r
-          text   = STRING_TOKEN(STR_SAVE_CURRENT_AND_EXIT),\r
         flags  = INTERACTIVE,\r
         key    = 0x1241;\r
 \r
       text\r
         help   = STRING_TOKEN(STR_DISCARD_CURRENT),\r
         text   = STRING_TOKEN(STR_DISCARD_CURRENT),\r
-          text   = STRING_TOKEN(STR_DISCARD_CURRENT),\r
         flags  = INTERACTIVE,\r
         key    = 0x1242;\r
 \r
@@ -593,7 +593,6 @@ formset
               prompt   = STRING_TOKEN(STR_CHECK_BOX_PROMPT),\r
               help     = STRING_TOKEN(STR_CHECK_BOX_HELP),\r
               flags    = CHECKBOX_DEFAULT,\r
-              key      = 0,\r
       endcheckbox;\r
 \r
       text\r
@@ -654,6 +653,16 @@ formset
             refresh interval = 3             // Refresh interval in seconds\r
     endnumeric;\r
 \r
+    grayoutif  match2 (stringref(STRING_TOKEN(STR_STRING)), stringref(STRING_TOKEN(STR_PATTERN)), PERL_GUID);\r
+      numeric \r
+        varid   = MyIfrNVData.Match2,\r
+        prompt  = STRING_TOKEN(STR_MATCH2_PROMPT),\r
+        help    = STRING_TOKEN(STR_MATCH2_HELP),\r
+        minimum = 0,\r
+        maximum = 243,\r
+      endnumeric;\r
+    endif;\r
+\r
     label LABEL_UPDATE2;\r
     label LABEL_END;\r
 \r
@@ -727,14 +736,12 @@ formset
     text\r
       help   = STRING_TOKEN(STR_EXIT_TEXT),\r
       text   = STRING_TOKEN(STR_EXIT_TEXT),\r
-        text   = STRING_TOKEN(STR_EXIT_TEXT),\r
       flags  = INTERACTIVE,   // VfrCompiler will generate opcode EFI_IFR_ACTION for Text marked as INTERACTIVE\r
       key    = 0x1245;\r
 \r
     text\r
       help   = STRING_TOKEN(STR_SAVE_TEXT),\r
       text   = STRING_TOKEN(STR_SAVE_TEXT),\r
-        text   = STRING_TOKEN(STR_SAVE_TEXT),\r
       flags  = INTERACTIVE,   // VfrCompiler will generate opcode EFI_IFR_ACTION for Text marked as INTERACTIVE\r
       key    = 0x1246;\r
   endform;\r