MdeModulePkg/DriverSample: Remove the password related codes

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

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr b/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
index 1366e827f21810202953ba5d07fed27f216b2544..4bdaf765bc2667016665a1b76e2e20db58d8a4f9 100644 (file)
--- a/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
+++ b/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
@@ -2,7 +2,7 @@
 //\r
 //    Sample Setup formset.\r
 //\r
-//  Copyright (c) 2004 - 2015, Intel Corporation. All rights reserved.<BR>\r
+//  Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>\r
 //  This program and the accompanying materials\r
 //  are licensed and made available under the terms and conditions of the BSD License\r
 //  which accompanies this distribution.  The full text of the license may be found at\r
@@ -215,7 +215,7 @@ formset
                 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 = 0;\r
-              endif\r
+              endif;\r
       endlist;\r
 \r
       //\r
@@ -234,6 +234,7 @@ formset
         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
+        default     = {1,2,3},\r
       endlist;\r
     endif;\r
 \r
@@ -262,7 +263,7 @@ formset
       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
+      endif;\r
 \r
     endoneof;\r
 \r
@@ -275,7 +276,7 @@ formset
 \r
       inconsistentif prompt = STRING_TOKEN(STR_ERROR_POPUP),\r
         ideqid MyIfrNVData.TestLateCheck == MyIfrNVData.TestLateCheck2\r
-      endif\r
+      endif;\r
 \r
     endoneof;\r
 \r
@@ -300,7 +301,7 @@ formset
               maxsize  = 40,\r
               inconsistentif prompt = STRING_TOKEN(STR_STRING_CHECK_ERROR_POPUP),\r
                 pushthis != stringref(STRING_TOKEN(STR_STRING_CHECK))\r
-              endif\r
+              endif;\r
     endstring;\r
 \r
     //\r
@@ -333,7 +334,7 @@ formset
               ideqid  MyIfrNVData.HowOldAreYouInYearsManual == MyEfiVar.Field8\r
               OR\r
               ideqvallist MyIfrNVData.HowOldAreYouInYearsManual == 1 3 5 7\r
-            endif\r
+            endif;\r
 \r
     endnumeric;\r
 \r
@@ -433,6 +434,17 @@ formset
             step    = 1,\r
             default = 18,\r
     endnumeric;\r
+\r
+    orderedlist\r
+        varid       = MyIfrNVData.GetDefaultValueFromCallBackForOrderedList,\r
+        questionid  = 0x1252,\r
+        prompt      = STRING_TOKEN(STR_DEFAULT_VALUE_FROM_CALLBACK_PROMPT),\r
+        help        = STRING_TOKEN(STR_DEFAULT_VALUE_FROM_CALLBACK_HELP),\r
+        flags       = INTERACTIVE,\r
+        option text = STRING_TOKEN(STR_ONE_OF_TEXT1), value = 1, 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 = 3, flags = 0;\r
+    endlist;\r
         \r
     resetbutton\r
       defaultstore = MyStandardDefault,\r
@@ -446,35 +458,6 @@ formset
       help     = STRING_TOKEN(STR_MANUFACTURE_DEFAULT_HELP),\r
     endresetbutton;\r
 \r
-    //\r
-    // Non-interactive password, validate by Setup Browser\r
-    //\r
-    password  varid    = MyIfrNVData.WhatIsThePassword,\r
-              prompt   = STRING_TOKEN(STR_PASSWORD_PROMPT),\r
-              help     = STRING_TOKEN(STR_PASSWORD_HELP),\r
-              minsize  = 6,\r
-              maxsize  = 20,\r
-    endpassword;\r
-\r
-    string    varid    = MyIfrNVData.PasswordClearText,\r
-              prompt   = STRING_TOKEN(STR_MY_STRING_PROMPT),\r
-              help     = STRING_TOKEN(STR_MY_STRING_HELP),\r
-              minsize  = 6,\r
-              maxsize  = 0x14,\r
-    endstring;\r
-\r
-    //\r
-    // Interactive password, validate via ConfigAccess.Callback()\r
-    //\r
-    password  varid    = MyIfrNVData.WhatIsThePassword2,\r
-              prompt   = STRING_TOKEN(STR_PASSWORD_CALLBACK_PROMPT),\r
-              help     = STRING_TOKEN(STR_PASSWORD_HELP),\r
-              flags    = INTERACTIVE,\r
-              key      = 0x2000,\r
-              minsize  = 6,\r
-              maxsize  = 20,\r
-    endpassword;\r
-\r
     //\r
     // Sample use case for IFR Security op-code\r
     //\r
@@ -483,6 +466,16 @@ formset
         help = STRING_TOKEN(STR_TEXT_SECRUITY_TEST_HELP),\r
         text = STRING_TOKEN(STR_TEXT_SECRUITY_TEST_TEXT);\r
     endif;\r
+\r
+    numeric varid   = MyEfiVar.SubmittedCallback,\r
+            questionid = 0x1250,\r
+            prompt  = STRING_TOKEN(STR_SUBMITTED_CALLBACK_TEST_PROMPT),\r
+            help    = STRING_TOKEN(STR_SUBMITTED_CALLBACK_TEST_HELP),\r
+            flags   = INTERACTIVE,\r
+            minimum = 0,\r
+            maximum = 255,\r
+            default = 18,\r
+    endnumeric;\r
     \r
     goto 2,\r
       prompt = STRING_TOKEN(STR_GOTO_FORM2), //SecondSetupPage  // this too has no end-op and basically it's a jump to a form ONLY\r
@@ -537,7 +530,7 @@ formset
           ideqval Date.Day == 31\r
           AND\r
           ideqvallist Date.Month == 2 4 6 9 11\r
-        endif\r
+        endif;\r
 \r
         //\r
         // If the day is 30 AND month is 2\r
@@ -546,7 +539,7 @@ formset
           ideqval Date.Day == 30\r
           AND\r
           ideqval Date.Month == 2\r
-        endif\r
+        endif;\r
 \r
         //\r
         // If the day is 29 AND month is 2 AND it year is NOT a leapyear\r
@@ -558,7 +551,7 @@ formset
           AND\r
           NOT\r
           ideqvallist Date.Year == 2004 2008 20012 20016 2020 2024 2028 2032 2036\r
-        endif\r
+        endif;\r
 \r
       enddate;\r
 \r