Clean up the framework style code.

Contributed-under: TianoCore Contribution Agreement 1.0
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@15899 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr b/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
index ee9f7c7dc4cf8f4f592e4eb6e448d7f06a8acebd..b808abc627edb82ddd5a2dd41dd897c4ffb210e1 100644 (file)
--- a/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
+++ b/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
@@ -182,10 +182,10 @@ formset
                  // CHECKBOX_DEFAULT_MFG indicate EFI_IFR_CHECKBOX_DEFAULT_MFG.\r
                  //\r
                  flags    = CHECKBOX_DEFAULT | CHECKBOX_DEFAULT_MFG,\r
-                 default  = 1,\r
+                 default  = TRUE,\r
         endcheckbox;\r
       endif;\r
-       endif;\r
+    endif;\r
 \r
     //\r
     // Ordered list:\r
@@ -206,11 +206,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
@@ -226,9 +227,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
@@ -252,8 +254,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
@@ -263,8 +266,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
@@ -275,10 +279,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