Update sample code for date/time.

Signed-off-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14614 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr b/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
index 0a77e408fa7be360e22d7da30db539fde03e969c..affd45ad1c4b26dae043dbc3cb657123e393923d 100644 (file)
--- a/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
+++ b/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
@@ -521,30 +521,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 = 1/1/2004,\r
 \r
         inconsistentif prompt = STRING_TOKEN(STR_ERROR_POPUP),\r
           ideqval Date.Day == 31\r
@@ -589,30 +571,10 @@ formset
         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

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
index ba72d1220b594cb1857ed9bba97eee0ee1079a52..6dcb4aa77e515a69bfae52c8c995a2c9bba53794 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
@@ -1254,13 +1254,6 @@ GetQuestionValue (
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  //\r
-  // Statement don't have storage, skip them\r
-  //\r
-  if (Question->QuestionId == 0) {\r
-    return Status;\r
-  }\r
-\r
   //\r
   // Question value is provided by an Expression, evaluate it\r
   //\r
@@ -1676,13 +1669,6 @@ SetQuestionValue (
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
-  //\r
-  // Statement don't have storage, skip them\r
-  //\r
-  if (Question->QuestionId == 0) {\r
-    return Status;\r
-  }\r
-\r
   //\r
   // If Question value is provided by an Expression, then it is read only\r
   //\r