Update code to support VS2013 tool chain.

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

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr b/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
index 60e9cf2a34a29c80361611016c79cb1bb85c7e83..9c31ed4429c2f2b39295d4309fdd1e4088163618 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 - 2011, Intel Corporation. All rights reserved.<BR>\r
+//  Copyright (c) 2004 - 2014, 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
@@ -125,28 +125,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
@@ -259,6 +255,9 @@ formset
       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
+      warningif prompt = STRING_TOKEN(STR_WARNING_POPUP), timeout = 5,\r
+        ideqval MyIfrNVData.TestLateCheck == 0\r
+      endif\r
 \r
     endoneof;\r
 \r
@@ -359,6 +358,8 @@ formset
             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
@@ -368,6 +369,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
@@ -517,30 +520,12 @@ formset
     form formid = 2,               // SecondSetupPage,\r
       title = STRING_TOKEN(STR_FORM2_TITLE);  // note formid is a variable (for readability) (UINT16) - also added Form to the line to signify the Op-Code\r
 \r
-\r
-      date    year varid  = Date.Year,    // Note that it is a member of NULL, so the RTC will be the system resource to retrieve and save from\r
-              prompt      = STRING_TOKEN(STR_DATE_PROMPT),\r
-              help        = STRING_TOKEN(STR_DATE_HELP),\r
-              minimum     = 1998,\r
-              maximum     = 2099,\r
-              step        = 1,\r
-              default     = 2004,\r
-\r
-              month varid = Date.Month,    // Note that it is a member of NULL, so the RTC will be the system resource to retrieve and save from\r
-              prompt      = STRING_TOKEN(STR_DATE_PROMPT),\r
-              help        = STRING_TOKEN(STR_DATE_HELP),\r
-              minimum     = 1,\r
-              maximum     = 12,\r
-              step        = 1,\r
-              default     = 1,\r
-\r
-              day varid   = Date.Day,          // Note that it is a member of NULL, so the RTC will be the system resource to retrieve and save from\r
-              prompt      = STRING_TOKEN(STR_DATE_PROMPT),\r
-              help        = STRING_TOKEN(STR_DATE_HELP),\r
-              minimum     = 1,\r
-              maximum     = 31,\r
-              step        = 0x1,\r
-              default     = 1,\r
+      date\r
+        name    = Date,\r
+        prompt  = STRING_TOKEN(STR_DATE_PROMPT),\r
+        help    = STRING_TOKEN(STR_DATE_HELP),\r
+        flags   = STORAGE_TIME,\r
+        default = 2004/1/1,\r
 \r
         inconsistentif prompt = STRING_TOKEN(STR_ERROR_POPUP),\r
           ideqval Date.Day == 31\r
@@ -574,41 +559,19 @@ 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
-      time    hour varid  = Time.Hour,         // Note that it is a member of NULL, so the RTC will be the system resource to retrieve and save from\r
-              prompt      = STRING_TOKEN(STR_TIME_PROMPT),\r
-              help        = STRING_TOKEN(STR_TIME_HELP),\r
-              minimum     = 0,\r
-              maximum     = 23,\r
-              step        = 1,\r
-              default     = 0,\r
-\r
-              minute varid  = Time.Minute,       // Note that it is a member of NULL, so the RTC will be the system resource to retrieve and save from\r
-              prompt        = STRING_TOKEN(STR_TIME_PROMPT),\r
-              help          = STRING_TOKEN(STR_TIME_HELP),\r
-              minimum       = 0,\r
-              maximum       = 59,\r
-              step          = 1,\r
-              default       = 0,\r
-\r
-              second varid  = Time.Second,       // Note that it is a member of NULL, so the RTC will be the system resource to retrieve and save from\r
-              prompt        = STRING_TOKEN(STR_TIME_PROMPT),\r
-              help          = STRING_TOKEN(STR_TIME_HELP),\r
-              minimum       = 0,\r
-              maximum       = 59,\r
-              step          = 1,\r
-              default       = 0,\r
-\r
+      time\r
+        prompt  = STRING_TOKEN(STR_TIME_PROMPT),\r
+        help    = STRING_TOKEN(STR_TIME_HELP),\r
+        flags   = STORAGE_TIME,\r
       endtime;\r
       \r
       time \r
@@ -758,14 +721,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