Tracker merger. "There is no "NV" display when change the certain option in NT32"

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3788 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/ProcessOptions.c b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/ProcessOptions.c
index a2dc8083460a2b6ef6521608aaeddf7fe8be1948..c3d52897d1abb9a929f6468d7caa97da1625b6db 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/ProcessOptions.c
+++ b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/ProcessOptions.c
@@ -341,31 +341,32 @@ ProcessOptions (
               //\r
               if (!Tag->Suppress && !Tag->GrayOut) {\r
                 CopyMem (NvRamMap, &Number, MenuOption->ThisTag->StorageWidth);\r
+                break;\r
               }\r
-              break;\r
-            }\r
+            } else {\r
 \r
-            StringPtr = GetToken (PopUp, MenuOption->Handle);\r
+              StringPtr = GetToken (PopUp, MenuOption->Handle);\r
 \r
-            CreatePopUp (GetStringWidth (StringPtr) / 2, 3, &NullCharacter, StringPtr, &NullCharacter);\r
+              CreatePopUp (GetStringWidth (StringPtr) / 2, 3, &NullCharacter, StringPtr, &NullCharacter);\r
 \r
-            do {\r
-              Status = WaitForKeyStroke (&Key);\r
+              do {\r
+                Status = WaitForKeyStroke (&Key);\r
 \r
-              switch (Key.UnicodeChar) {\r
+                switch (Key.UnicodeChar) {\r
 \r
-              case CHAR_CARRIAGE_RETURN:\r
-                //\r
-                // Since the value can be one byte long or two bytes long, do a CopyMem based on StorageWidth\r
-                //\r
-                CopyMem (NvRamMap, &Number, MenuOption->ThisTag->StorageWidth);\r
-                FreePool (StringPtr);\r
-                break;\r
+                case CHAR_CARRIAGE_RETURN:\r
+                  //\r
+                  // Since the value can be one byte long or two bytes long, do a CopyMem based on StorageWidth\r
+                  //\r
+                  CopyMem (NvRamMap, &Number, MenuOption->ThisTag->StorageWidth);\r
+                  FreePool (StringPtr);\r
+                  break;\r
 \r
-              default:\r
-                break;\r
-              }\r
-            } while (Key.UnicodeChar != CHAR_CARRIAGE_RETURN);\r
+                default:\r
+                  break;\r
+                }\r
+              } while (Key.UnicodeChar != CHAR_CARRIAGE_RETURN);\r
+            }\r
           }\r
         }\r
 \r

diff --git a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Ui.c b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Ui.c
index dd56cfbcf75ef3897a62844348a17dabe4d6cdef..c222a72e03d7964fd5b55fb42962ecda423c666b 100644 (file)
--- a/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Ui.c
+++ b/IntelFrameworkModulePkg/Universal/SetupBrowserDxe/Ui.c
@@ -3020,7 +3020,7 @@ Returns:
       //\r
       // After the repaint operation, we should refresh the highlight.\r
       //\r
-      NewLine = TRUE;\r
+      NewLine    = TRUE;\r
       break;\r
 \r
     case CfUiNoOperation:\r