]> git.proxmox.com Git - mirror_edk2.git/blobdiff - MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
MdeModulePkg: Apply uncrustify changes
[mirror_edk2.git] / MdeModulePkg / Universal / SetupBrowserDxe / Presentation.c
index 7f85873730b7cb945a89098500803d11e5ff9582..9587b08d6d82be5a771451d67bb76bd82a446f44 100644 (file)
@@ -9,17 +9,19 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include "Setup.h"\r
 \r
-BOOLEAN            mHiiPackageListUpdated;\r
-UI_MENU_SELECTION  *gCurrentSelection;\r
-EFI_HII_HANDLE     mCurrentHiiHandle = NULL;\r
-EFI_GUID           mCurrentFormSetGuid = {0, 0, 0, {0, 0, 0, 0, 0, 0, 0, 0}};\r
-UINT16             mCurrentFormId = 0;\r
-EFI_EVENT          mValueChangedEvent = NULL;\r
-LIST_ENTRY         mRefreshEventList = INITIALIZE_LIST_HEAD_VARIABLE (mRefreshEventList);\r
-UINT16             mCurFakeQestId;\r
-FORM_DISPLAY_ENGINE_FORM gDisplayFormData;\r
-BOOLEAN            mFinishRetrieveCall = FALSE;\r
-BOOLEAN            mDynamicFormUpdated = FALSE;\r
+BOOLEAN                   mHiiPackageListUpdated;\r
+UI_MENU_SELECTION         *gCurrentSelection;\r
+EFI_HII_HANDLE            mCurrentHiiHandle   = NULL;\r
+EFI_GUID                  mCurrentFormSetGuid = {\r
+  0, 0, 0, { 0, 0, 0, 0, 0, 0, 0, 0 }\r
+};\r
+UINT16                    mCurrentFormId     = 0;\r
+EFI_EVENT                 mValueChangedEvent = NULL;\r
+LIST_ENTRY                mRefreshEventList  = INITIALIZE_LIST_HEAD_VARIABLE (mRefreshEventList);\r
+UINT16                    mCurFakeQestId;\r
+FORM_DISPLAY_ENGINE_FORM  gDisplayFormData;\r
+BOOLEAN                   mFinishRetrieveCall = FALSE;\r
+BOOLEAN                   mDynamicFormUpdated = FALSE;\r
 \r
 /**\r
   Check whether the ConfigAccess protocol is available.\r
@@ -30,16 +32,16 @@ BOOLEAN            mDynamicFormUpdated = FALSE;
 \r
 **/\r
 EFI_STATUS\r
-CheckConfigAccess(\r
+CheckConfigAccess (\r
   IN FORM_BROWSER_FORMSET  *FormSet\r
   )\r
 {\r
-  EFI_STATUS                      Status;\r
+  EFI_STATUS  Status;\r
 \r
   Status = gBS->HandleProtocol (\r
                   FormSet->DriverHandle,\r
                   &gEfiHiiConfigAccessProtocolGuid,\r
-                  (VOID **) &FormSet->ConfigAccess\r
+                  (VOID **)&FormSet->ConfigAccess\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     //\r
@@ -75,13 +77,14 @@ EvaluateFormExpressions (
   Link = GetFirstNode (&Form->ExpressionListHead);\r
   while (!IsNull (&Form->ExpressionListHead, Link)) {\r
     Expression = FORM_EXPRESSION_FROM_LINK (Link);\r
-    Link = GetNextNode (&Form->ExpressionListHead, Link);\r
-\r
-    if (Expression->Type == EFI_HII_EXPRESSION_INCONSISTENT_IF ||\r
-        Expression->Type == EFI_HII_EXPRESSION_NO_SUBMIT_IF ||\r
-        Expression->Type == EFI_HII_EXPRESSION_WARNING_IF ||\r
-        Expression->Type == EFI_HII_EXPRESSION_WRITE ||\r
-        (Expression->Type == EFI_HII_EXPRESSION_READ && Form->FormType != STANDARD_MAP_FORM_TYPE)) {\r
+    Link       = GetNextNode (&Form->ExpressionListHead, Link);\r
+\r
+    if ((Expression->Type == EFI_HII_EXPRESSION_INCONSISTENT_IF) ||\r
+        (Expression->Type == EFI_HII_EXPRESSION_NO_SUBMIT_IF) ||\r
+        (Expression->Type == EFI_HII_EXPRESSION_WARNING_IF) ||\r
+        (Expression->Type == EFI_HII_EXPRESSION_WRITE) ||\r
+        ((Expression->Type == EFI_HII_EXPRESSION_READ) && (Form->FormType != STANDARD_MAP_FORM_TYPE)))\r
+    {\r
       //\r
       // Postpone Form validation to Question editing or Form submitting or Question Write or Question Read for nonstandard form.\r
       //\r
@@ -107,11 +110,11 @@ EvaluateFormExpressions (
 **/\r
 FORM_DISPLAY_ENGINE_STATEMENT *\r
 GetDisplayStatement (\r
-  IN EFI_IFR_OP_HEADER     *OpCode\r
+  IN EFI_IFR_OP_HEADER  *OpCode\r
   )\r
 {\r
-  FORM_DISPLAY_ENGINE_STATEMENT *DisplayStatement;\r
-  LIST_ENTRY                    *Link;\r
+  FORM_DISPLAY_ENGINE_STATEMENT  *DisplayStatement;\r
+  LIST_ENTRY                     *Link;\r
 \r
   Link = GetFirstNode (&gDisplayFormData.StatementListHead);\r
   while (!IsNull (&gDisplayFormData.StatementListHead, Link)) {\r
@@ -120,6 +123,7 @@ GetDisplayStatement (
     if (DisplayStatement->OpCode == OpCode) {\r
       return DisplayStatement;\r
     }\r
+\r
     Link = GetNextNode (&gDisplayFormData.StatementListHead, Link);\r
   }\r
 \r
@@ -135,11 +139,11 @@ FreeRefreshEvent (
   VOID\r
   )\r
 {\r
-  LIST_ENTRY   *Link;\r
-  FORM_BROWSER_REFRESH_EVENT_NODE *EventNode;\r
+  LIST_ENTRY                       *Link;\r
+  FORM_BROWSER_REFRESH_EVENT_NODE  *EventNode;\r
 \r
   while (!IsListEmpty (&mRefreshEventList)) {\r
-    Link = GetFirstNode (&mRefreshEventList);\r
+    Link      = GetFirstNode (&mRefreshEventList);\r
     EventNode = FORM_BROWSER_REFRESH_EVENT_FROM_LINK (Link);\r
     RemoveEntryList (&EventNode->Link);\r
 \r
@@ -158,7 +162,7 @@ FreeRefreshEvent (
 **/\r
 VOID\r
 UpdateStatement (\r
-  IN OUT FORM_BROWSER_STATEMENT        *Statement\r
+  IN OUT FORM_BROWSER_STATEMENT  *Statement\r
   )\r
 {\r
   GetQuestionValue (gCurrentSelection->FormSet, gCurrentSelection->Form, Statement, GetSetValueWithHiiDriver);\r
@@ -177,7 +181,7 @@ UpdateStatement (
     //\r
     // Package list is updated, force to reparse IFR binary of target Formset\r
     //\r
-    mHiiPackageListUpdated = FALSE;\r
+    mHiiPackageListUpdated    = FALSE;\r
     gCurrentSelection->Action = UI_ACTION_REFRESH_FORMSET;\r
   }\r
 }\r
@@ -190,15 +194,15 @@ UpdateStatement (
 **/\r
 VOID\r
 EFIAPI\r
-RefreshEventNotifyForStatement(\r
-  IN      EFI_EVENT Event,\r
-  IN      VOID      *Context\r
+RefreshEventNotifyForStatement (\r
+  IN      EFI_EVENT  Event,\r
+  IN      VOID       *Context\r
   )\r
 {\r
-  FORM_BROWSER_STATEMENT        *Statement;\r
+  FORM_BROWSER_STATEMENT  *Statement;\r
 \r
   Statement = (FORM_BROWSER_STATEMENT *)Context;\r
-  UpdateStatement(Statement);\r
+  UpdateStatement (Statement);\r
   gBS->SignalEvent (mValueChangedEvent);\r
 }\r
 \r
@@ -210,9 +214,9 @@ RefreshEventNotifyForStatement(
 **/\r
 VOID\r
 EFIAPI\r
-RefreshEventNotifyForForm(\r
-  IN      EFI_EVENT Event,\r
-  IN      VOID      *Context\r
+RefreshEventNotifyForForm (\r
+  IN      EFI_EVENT  Event,\r
+  IN      VOID       *Context\r
   )\r
 {\r
   gCurrentSelection->Action = UI_ACTION_REFRESH_FORMSET;\r
@@ -228,29 +232,30 @@ RefreshEventNotifyForForm(
 **/\r
 VOID\r
 CreateRefreshEventForStatement (\r
-  IN     FORM_BROWSER_STATEMENT        *Statement\r
+  IN     FORM_BROWSER_STATEMENT  *Statement\r
   )\r
 {\r
-  EFI_STATUS                      Status;\r
-  EFI_EVENT                       RefreshEvent;\r
-  FORM_BROWSER_REFRESH_EVENT_NODE *EventNode;\r
+  EFI_STATUS                       Status;\r
+  EFI_EVENT                        RefreshEvent;\r
+  FORM_BROWSER_REFRESH_EVENT_NODE  *EventNode;\r
 \r
   //\r
   // If question has refresh guid, create the notify function.\r
   //\r
   Status = gBS->CreateEventEx (\r
-                    EVT_NOTIFY_SIGNAL,\r
-                    TPL_CALLBACK,\r
-                    RefreshEventNotifyForStatement,\r
-                    Statement,\r
-                    &Statement->RefreshGuid,\r
-                    &RefreshEvent);\r
+                  EVT_NOTIFY_SIGNAL,\r
+                  TPL_CALLBACK,\r
+                  RefreshEventNotifyForStatement,\r
+                  Statement,\r
+                  &Statement->RefreshGuid,\r
+                  &RefreshEvent\r
+                  );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   EventNode = AllocateZeroPool (sizeof (FORM_BROWSER_REFRESH_EVENT_NODE));\r
   ASSERT (EventNode != NULL);\r
   EventNode->RefreshEvent = RefreshEvent;\r
-  InsertTailList(&mRefreshEventList, &EventNode->Link);\r
+  InsertTailList (&mRefreshEventList, &EventNode->Link);\r
 }\r
 \r
 /**\r
@@ -261,29 +266,30 @@ CreateRefreshEventForStatement (
 **/\r
 VOID\r
 CreateRefreshEventForForm (\r
-  IN     FORM_BROWSER_FORM        *Form\r
+  IN     FORM_BROWSER_FORM  *Form\r
   )\r
 {\r
-  EFI_STATUS                      Status;\r
-  EFI_EVENT                       RefreshEvent;\r
-  FORM_BROWSER_REFRESH_EVENT_NODE *EventNode;\r
+  EFI_STATUS                       Status;\r
+  EFI_EVENT                        RefreshEvent;\r
+  FORM_BROWSER_REFRESH_EVENT_NODE  *EventNode;\r
 \r
   //\r
   // If question has refresh guid, create the notify function.\r
   //\r
   Status = gBS->CreateEventEx (\r
-                    EVT_NOTIFY_SIGNAL,\r
-                    TPL_CALLBACK,\r
-                    RefreshEventNotifyForForm,\r
-                    Form,\r
-                    &Form->RefreshGuid,\r
-                    &RefreshEvent);\r
+                  EVT_NOTIFY_SIGNAL,\r
+                  TPL_CALLBACK,\r
+                  RefreshEventNotifyForForm,\r
+                  Form,\r
+                  &Form->RefreshGuid,\r
+                  &RefreshEvent\r
+                  );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   EventNode = AllocateZeroPool (sizeof (FORM_BROWSER_REFRESH_EVENT_NODE));\r
   ASSERT (EventNode != NULL);\r
   EventNode->RefreshEvent = RefreshEvent;\r
-  InsertTailList(&mRefreshEventList, &EventNode->Link);\r
+  InsertTailList (&mRefreshEventList, &EventNode->Link);\r
 }\r
 \r
 /**\r
@@ -295,14 +301,14 @@ CreateRefreshEventForForm (
 **/\r
 VOID\r
 InitializeDisplayStatement (\r
-  IN OUT FORM_DISPLAY_ENGINE_STATEMENT *DisplayStatement,\r
-  IN     FORM_BROWSER_STATEMENT        *Statement\r
+  IN OUT FORM_DISPLAY_ENGINE_STATEMENT  *DisplayStatement,\r
+  IN     FORM_BROWSER_STATEMENT         *Statement\r
   )\r
 {\r
-  LIST_ENTRY                 *Link;\r
-  QUESTION_OPTION            *Option;\r
-  DISPLAY_QUESTION_OPTION    *DisplayOption;\r
-  FORM_DISPLAY_ENGINE_STATEMENT *ParentStatement;\r
+  LIST_ENTRY                     *Link;\r
+  QUESTION_OPTION                *Option;\r
+  DISPLAY_QUESTION_OPTION        *DisplayOption;\r
+  FORM_DISPLAY_ENGINE_STATEMENT  *ParentStatement;\r
 \r
   DisplayStatement->Signature = FORM_DISPLAY_ENGINE_STATEMENT_SIGNATURE;\r
   DisplayStatement->Version   = FORM_DISPLAY_ENGINE_STATEMENT_VERSION_1;\r
@@ -310,9 +316,10 @@ InitializeDisplayStatement (
   InitializeListHead (&DisplayStatement->NestStatementList);\r
   InitializeListHead (&DisplayStatement->OptionListHead);\r
 \r
-  if ((EvaluateExpressionList(Statement->Expression, FALSE, NULL, NULL) == ExpressGrayOut) || Statement->Locked) {\r
+  if ((EvaluateExpressionList (Statement->Expression, FALSE, NULL, NULL) == ExpressGrayOut) || Statement->Locked) {\r
     DisplayStatement->Attribute |= HII_DISPLAY_GRAYOUT;\r
   }\r
+\r
   if ((Statement->ValueExpression != NULL) || ((Statement->QuestionFlags & EFI_IFR_FLAG_READ_ONLY) != 0)) {\r
     DisplayStatement->Attribute |= HII_DISPLAY_READONLY;\r
   }\r
@@ -323,9 +330,10 @@ InitializeDisplayStatement (
   Link = GetFirstNode (&Statement->OptionListHead);\r
   while (!IsNull (&Statement->OptionListHead, Link)) {\r
     Option = QUESTION_OPTION_FROM_LINK (Link);\r
-    Link = GetNextNode (&Statement->OptionListHead, Link);\r
+    Link   = GetNextNode (&Statement->OptionListHead, Link);\r
     if ((Option->SuppressExpression != NULL) &&\r
-        ((EvaluateExpressionList(Option->SuppressExpression, FALSE, NULL, NULL) == ExpressSuppress))) {\r
+        ((EvaluateExpressionList (Option->SuppressExpression, FALSE, NULL, NULL) == ExpressSuppress)))\r
+    {\r
       continue;\r
     }\r
 \r
@@ -335,7 +343,7 @@ InitializeDisplayStatement (
     DisplayOption->ImageId      = Option->ImageId;\r
     DisplayOption->Signature    = DISPLAY_QUESTION_OPTION_SIGNATURE;\r
     DisplayOption->OptionOpCode = Option->OpCode;\r
-    InsertTailList(&DisplayStatement->OptionListHead, &DisplayOption->Link);\r
+    InsertTailList (&DisplayStatement->OptionListHead, &DisplayOption->Link);\r
   }\r
 \r
   CopyMem (&DisplayStatement->CurrentValue, &Statement->HiiValue, sizeof (EFI_HII_VALUE));\r
@@ -348,11 +356,11 @@ InitializeDisplayStatement (
     //\r
     // Ordered list opcode may not initilized, get default value here.\r
     //\r
-    if (Statement->OpCode->OpCode == EFI_IFR_ORDERED_LIST_OP && GetArrayData (Statement->BufferValue, Statement->ValueType, 0) == 0) {\r
+    if ((Statement->OpCode->OpCode == EFI_IFR_ORDERED_LIST_OP) && (GetArrayData (Statement->BufferValue, Statement->ValueType, 0) == 0)) {\r
       GetQuestionDefault (gCurrentSelection->FormSet, gCurrentSelection->Form, Statement, 0);\r
     }\r
 \r
-    DisplayStatement->CurrentValue.Buffer    = AllocateCopyPool(Statement->StorageWidth,Statement->BufferValue);\r
+    DisplayStatement->CurrentValue.Buffer    = AllocateCopyPool (Statement->StorageWidth, Statement->BufferValue);\r
     DisplayStatement->CurrentValue.BufferLen = Statement->StorageWidth;\r
   }\r
 \r
@@ -362,7 +370,8 @@ InitializeDisplayStatement (
   // Get the highlight statement for current form.\r
   //\r
   if (((gCurrentSelection->QuestionId != 0) && (Statement->QuestionId == gCurrentSelection->QuestionId)) ||\r
-      ((mCurFakeQestId != 0) && (Statement->FakeQuestionId == mCurFakeQestId))) {\r
+      ((mCurFakeQestId != 0) && (Statement->FakeQuestionId == mCurFakeQestId)))\r
+  {\r
     gDisplayFormData.HighLightedStatement = DisplayStatement;\r
   }\r
 \r
@@ -376,7 +385,7 @@ InitializeDisplayStatement (
   //\r
   // For RTC type of date/time, set default refresh interval to be 1 second.\r
   //\r
-  if ((Statement->Operand == EFI_IFR_DATE_OP || Statement->Operand == EFI_IFR_TIME_OP) && Statement->Storage == NULL) {\r
+  if (((Statement->Operand == EFI_IFR_DATE_OP) || (Statement->Operand == EFI_IFR_TIME_OP)) && (Statement->Storage == NULL)) {\r
     Statement->RefreshInterval = 1;\r
   }\r
 \r
@@ -400,11 +409,11 @@ InitializeDisplayStatement (
   // else insert to the form it belongs to.\r
   //\r
   if (Statement->ParentStatement != NULL) {\r
-    ParentStatement = GetDisplayStatement(Statement->ParentStatement->OpCode);\r
+    ParentStatement = GetDisplayStatement (Statement->ParentStatement->OpCode);\r
     ASSERT (ParentStatement != NULL);\r
-    InsertTailList(&ParentStatement->NestStatementList, &DisplayStatement->DisplayLink);\r
+    InsertTailList (&ParentStatement->NestStatementList, &DisplayStatement->DisplayLink);\r
   } else {\r
-    InsertTailList(&gDisplayFormData.StatementListHead, &DisplayStatement->DisplayLink);\r
+    InsertTailList (&gDisplayFormData.StatementListHead, &DisplayStatement->DisplayLink);\r
   }\r
 }\r
 \r
@@ -418,23 +427,23 @@ InitializeDisplayStatement (
 VOID\r
 EFIAPI\r
 RefreshIntervalProcess (\r
-  IN  EFI_EVENT    Event,\r
-  IN  VOID         *Context\r
+  IN  EFI_EVENT  Event,\r
+  IN  VOID       *Context\r
   )\r
 {\r
-  FORM_BROWSER_STATEMENT        *Statement;\r
-  LIST_ENTRY                    *Link;\r
+  FORM_BROWSER_STATEMENT  *Statement;\r
+  LIST_ENTRY              *Link;\r
 \r
   Link = GetFirstNode (&gCurrentSelection->Form->StatementListHead);\r
   while (!IsNull (&gCurrentSelection->Form->StatementListHead, Link)) {\r
     Statement = FORM_BROWSER_STATEMENT_FROM_LINK (Link);\r
-    Link = GetNextNode (&gCurrentSelection->Form->StatementListHead, Link);\r
+    Link      = GetNextNode (&gCurrentSelection->Form->StatementListHead, Link);\r
 \r
     if (Statement->RefreshInterval == 0) {\r
       continue;\r
     }\r
 \r
-    UpdateStatement(Statement);\r
+    UpdateStatement (Statement);\r
   }\r
 \r
   gBS->SignalEvent (mValueChangedEvent);\r
@@ -458,14 +467,14 @@ UpdateHotkeyList (
   while (!IsNull (&gBrowserHotKeyList, Link)) {\r
     HotKey = BROWSER_HOT_KEY_FROM_LINK (Link);\r
 \r
-    CopyKey             = AllocateCopyPool(sizeof (BROWSER_HOT_KEY), HotKey);\r
+    CopyKey = AllocateCopyPool (sizeof (BROWSER_HOT_KEY), HotKey);\r
     ASSERT (CopyKey != NULL);\r
-    CopyKey->KeyData    = AllocateCopyPool(sizeof (EFI_INPUT_KEY), HotKey->KeyData);\r
+    CopyKey->KeyData = AllocateCopyPool (sizeof (EFI_INPUT_KEY), HotKey->KeyData);\r
     ASSERT (CopyKey->KeyData != NULL);\r
-    CopyKey->HelpString = AllocateCopyPool(StrSize (HotKey->HelpString), HotKey->HelpString);\r
+    CopyKey->HelpString = AllocateCopyPool (StrSize (HotKey->HelpString), HotKey->HelpString);\r
     ASSERT (CopyKey->HelpString != NULL);\r
 \r
-    InsertTailList(&gDisplayFormData.HotKeyListHead, &CopyKey->Link);\r
+    InsertTailList (&gDisplayFormData.HotKeyListHead, &CopyKey->Link);\r
 \r
     Link = GetNextNode (&gBrowserHotKeyList, Link);\r
   }\r
@@ -499,12 +508,13 @@ ProcessQuestionExtraAttr (
   Link = GetFirstNode (&mPrivateData.FormBrowserEx2.OverrideQestListHead);\r
   while (!IsNull (&mPrivateData.FormBrowserEx2.OverrideQestListHead, Link)) {\r
     QuestionDesc = FORM_QUESTION_ATTRIBUTE_OVERRIDE_FROM_LINK (Link);\r
-    Link = GetNextNode (&mPrivateData.FormBrowserEx2.OverrideQestListHead, Link);\r
+    Link         = GetNextNode (&mPrivateData.FormBrowserEx2.OverrideQestListHead, Link);\r
 \r
     if ((QuestionDesc->QuestionId == QuestionId) &&\r
         (QuestionDesc->FormId     == gCurrentSelection->FormId) &&\r
         (QuestionDesc->HiiHandle  == gCurrentSelection->Handle) &&\r
-        CompareGuid (&QuestionDesc->FormSetGuid, &gCurrentSelection->FormSetGuid)) {\r
+        CompareGuid (&QuestionDesc->FormSetGuid, &gCurrentSelection->FormSetGuid))\r
+    {\r
       return QuestionDesc->Attribute;\r
     }\r
   }\r
@@ -523,18 +533,18 @@ AddStatementToDisplayForm (
   VOID\r
   )\r
 {\r
-  EFI_STATUS                    Status;\r
-  LIST_ENTRY                    *Link;\r
-  FORM_BROWSER_STATEMENT        *Statement;\r
-  FORM_DISPLAY_ENGINE_STATEMENT *DisplayStatement;\r
-  UINT8                         MinRefreshInterval;\r
-  EFI_EVENT                     RefreshIntervalEvent;\r
-  FORM_BROWSER_REFRESH_EVENT_NODE *EventNode;\r
-  BOOLEAN                       FormEditable;\r
-  UINT32                        ExtraAttribute;\r
+  EFI_STATUS                       Status;\r
+  LIST_ENTRY                       *Link;\r
+  FORM_BROWSER_STATEMENT           *Statement;\r
+  FORM_DISPLAY_ENGINE_STATEMENT    *DisplayStatement;\r
+  UINT8                            MinRefreshInterval;\r
+  EFI_EVENT                        RefreshIntervalEvent;\r
+  FORM_BROWSER_REFRESH_EVENT_NODE  *EventNode;\r
+  BOOLEAN                          FormEditable;\r
+  UINT32                           ExtraAttribute;\r
 \r
-  MinRefreshInterval   = 0;\r
-  FormEditable         = FALSE;\r
+  MinRefreshInterval = 0;\r
+  FormEditable       = FALSE;\r
 \r
   //\r
   // Process the statement outside the form, these statements are not recognized\r
@@ -543,18 +553,18 @@ AddStatementToDisplayForm (
   Link = GetFirstNode (&gCurrentSelection->FormSet->StatementListOSF);\r
   while (!IsNull (&gCurrentSelection->FormSet->StatementListOSF, Link)) {\r
     Statement = FORM_BROWSER_STATEMENT_FROM_LINK (Link);\r
-    Link = GetNextNode (&gCurrentSelection->FormSet->StatementListOSF, Link);\r
+    Link      = GetNextNode (&gCurrentSelection->FormSet->StatementListOSF, Link);\r
 \r
     DisplayStatement = AllocateZeroPool (sizeof (FORM_DISPLAY_ENGINE_STATEMENT));\r
     ASSERT (DisplayStatement != NULL);\r
     DisplayStatement->Signature = FORM_DISPLAY_ENGINE_STATEMENT_SIGNATURE;\r
     DisplayStatement->Version   = FORM_DISPLAY_ENGINE_STATEMENT_VERSION_1;\r
-    DisplayStatement->OpCode = Statement->OpCode;\r
+    DisplayStatement->OpCode    = Statement->OpCode;\r
 \r
     InitializeListHead (&DisplayStatement->NestStatementList);\r
     InitializeListHead (&DisplayStatement->OptionListHead);\r
 \r
-    InsertTailList(&gDisplayFormData.StatementListOSF, &DisplayStatement->DisplayLink);\r
+    InsertTailList (&gDisplayFormData.StatementListOSF, &DisplayStatement->DisplayLink);\r
   }\r
 \r
   //\r
@@ -565,12 +575,12 @@ AddStatementToDisplayForm (
 \r
   DisplayStatement->Signature = FORM_DISPLAY_ENGINE_STATEMENT_SIGNATURE;\r
   DisplayStatement->Version   = FORM_DISPLAY_ENGINE_STATEMENT_VERSION_1;\r
-  DisplayStatement->OpCode = gCurrentSelection->FormSet->OpCode;\r
+  DisplayStatement->OpCode    = gCurrentSelection->FormSet->OpCode;\r
 \r
   InitializeListHead (&DisplayStatement->NestStatementList);\r
   InitializeListHead (&DisplayStatement->OptionListHead);\r
 \r
-  InsertTailList(&gDisplayFormData.StatementListOSF, &DisplayStatement->DisplayLink);\r
+  InsertTailList (&gDisplayFormData.StatementListOSF, &DisplayStatement->DisplayLink);\r
 \r
   //\r
   // Process the statement in this form.\r
@@ -578,12 +588,12 @@ AddStatementToDisplayForm (
   Link = GetFirstNode (&gCurrentSelection->Form->StatementListHead);\r
   while (!IsNull (&gCurrentSelection->Form->StatementListHead, Link)) {\r
     Statement = FORM_BROWSER_STATEMENT_FROM_LINK (Link);\r
-    Link = GetNextNode (&gCurrentSelection->Form->StatementListHead, Link);\r
+    Link      = GetNextNode (&gCurrentSelection->Form->StatementListHead, Link);\r
 \r
     //\r
     // This statement can't be show, skip it.\r
     //\r
-    if (EvaluateExpressionList(Statement->Expression, FALSE, NULL, NULL) > ExpressGrayOut) {\r
+    if (EvaluateExpressionList (Statement->Expression, FALSE, NULL, NULL) > ExpressGrayOut) {\r
       continue;\r
     }\r
 \r
@@ -601,7 +611,7 @@ AddStatementToDisplayForm (
     //\r
     // Initialize this statement and add it to the display form.\r
     //\r
-    InitializeDisplayStatement(DisplayStatement, Statement);\r
+    InitializeDisplayStatement (DisplayStatement, Statement);\r
 \r
     //\r
     // Set the extra attribute.\r
@@ -616,7 +626,8 @@ AddStatementToDisplayForm (
     // Get the minimal refresh interval value for later use.\r
     //\r
     if ((Statement->RefreshInterval != 0) &&\r
-      (MinRefreshInterval == 0 || Statement->RefreshInterval < MinRefreshInterval)) {\r
+        ((MinRefreshInterval == 0) || (Statement->RefreshInterval < MinRefreshInterval)))\r
+    {\r
       MinRefreshInterval = Statement->RefreshInterval;\r
     }\r
   }\r
@@ -633,7 +644,7 @@ AddStatementToDisplayForm (
     EventNode = AllocateZeroPool (sizeof (FORM_BROWSER_REFRESH_EVENT_NODE));\r
     ASSERT (EventNode != NULL);\r
     EventNode->RefreshEvent = RefreshIntervalEvent;\r
-    InsertTailList(&mRefreshEventList, &EventNode->Link);\r
+    InsertTailList (&mRefreshEventList, &EventNode->Link);\r
   }\r
 \r
   //\r
@@ -649,8 +660,8 @@ AddStatementToDisplayForm (
   //\r
   // Update hotkey list field.\r
   //\r
-  if (gBrowserSettingScope == SystemLevel || FormEditable) {\r
-    UpdateHotkeyList();\r
+  if ((gBrowserSettingScope == SystemLevel) || FormEditable) {\r
+    UpdateHotkeyList ();\r
   }\r
 }\r
 \r
@@ -664,10 +675,10 @@ UpdateDataChangedFlag (
   VOID\r
   )\r
 {\r
-  LIST_ENTRY           *Link;\r
-  FORM_BROWSER_FORMSET *LocalFormSet;\r
+  LIST_ENTRY            *Link;\r
+  FORM_BROWSER_FORMSET  *LocalFormSet;\r
 \r
-  gDisplayFormData.SettingChangedFlag   = FALSE;\r
+  gDisplayFormData.SettingChangedFlag = FALSE;\r
 \r
   if (IsNvUpdateRequiredForForm (gCurrentSelection->Form)) {\r
     gDisplayFormData.SettingChangedFlag = TRUE;\r
@@ -678,30 +689,33 @@ UpdateDataChangedFlag (
   // Base on the system level to check whether need to show the NV flag.\r
   //\r
   switch (gBrowserSettingScope) {\r
-  case SystemLevel:\r
-    //\r
-    // Check the maintain list to see whether there is any change.\r
-    //\r
-    Link = GetFirstNode (&gBrowserFormSetList);\r
-    while (!IsNull (&gBrowserFormSetList, Link)) {\r
-      LocalFormSet = FORM_BROWSER_FORMSET_FROM_LINK (Link);\r
-      if (IsNvUpdateRequiredForFormSet(LocalFormSet)) {\r
+    case SystemLevel:\r
+      //\r
+      // Check the maintain list to see whether there is any change.\r
+      //\r
+      Link = GetFirstNode (&gBrowserFormSetList);\r
+      while (!IsNull (&gBrowserFormSetList, Link)) {\r
+        LocalFormSet = FORM_BROWSER_FORMSET_FROM_LINK (Link);\r
+        if (IsNvUpdateRequiredForFormSet (LocalFormSet)) {\r
+          gDisplayFormData.SettingChangedFlag = TRUE;\r
+          return;\r
+        }\r
+\r
+        Link = GetNextNode (&gBrowserFormSetList, Link);\r
+      }\r
+\r
+      break;\r
+\r
+    case FormSetLevel:\r
+      if (IsNvUpdateRequiredForFormSet (gCurrentSelection->FormSet)) {\r
         gDisplayFormData.SettingChangedFlag = TRUE;\r
         return;\r
       }\r
-      Link = GetNextNode (&gBrowserFormSetList, Link);\r
-    }\r
-    break;\r
 \r
-  case FormSetLevel:\r
-    if (IsNvUpdateRequiredForFormSet(gCurrentSelection->FormSet)) {\r
-      gDisplayFormData.SettingChangedFlag = TRUE;\r
-      return;\r
-    }\r
-    break;\r
+      break;\r
 \r
-  default:\r
-    break;\r
+    default:\r
+      break;\r
   }\r
 }\r
 \r
@@ -727,12 +741,12 @@ InitializeDisplayFormData (
   InitializeListHead (&gDisplayFormData.HotKeyListHead);\r
 \r
   Status = gBS->CreateEvent (\r
-        EVT_NOTIFY_WAIT,\r
-        TPL_CALLBACK,\r
-        EfiEventEmptyFunction,\r
-        NULL,\r
-        &mValueChangedEvent\r
-        );\r
+                  EVT_NOTIFY_WAIT,\r
+                  TPL_CALLBACK,\r
+                  EfiEventEmptyFunction,\r
+                  NULL,\r
+                  &mValueChangedEvent\r
+                  );\r
   ASSERT_EFI_ERROR (Status);\r
 }\r
 \r
@@ -750,7 +764,7 @@ FreeHotkeyList (
   LIST_ENTRY       *Link;\r
 \r
   while (!IsListEmpty (&gDisplayFormData.HotKeyListHead)) {\r
-    Link = GetFirstNode (&gDisplayFormData.HotKeyListHead);\r
+    Link   = GetFirstNode (&gDisplayFormData.HotKeyListHead);\r
     HotKey = BROWSER_HOT_KEY_FROM_LINK (Link);\r
 \r
     RemoveEntryList (&HotKey->Link);\r
@@ -771,14 +785,14 @@ UpdateDisplayFormData (
   VOID\r
   )\r
 {\r
-  gDisplayFormData.FormTitle        = gCurrentSelection->Form->FormTitle;\r
-  gDisplayFormData.FormId           = gCurrentSelection->FormId;\r
-  gDisplayFormData.HiiHandle        = gCurrentSelection->Handle;\r
+  gDisplayFormData.FormTitle = gCurrentSelection->Form->FormTitle;\r
+  gDisplayFormData.FormId    = gCurrentSelection->FormId;\r
+  gDisplayFormData.HiiHandle = gCurrentSelection->Handle;\r
   CopyGuid (&gDisplayFormData.FormSetGuid, &gCurrentSelection->FormSetGuid);\r
 \r
-  gDisplayFormData.Attribute        = 0;\r
-  gDisplayFormData.Attribute       |= gCurrentSelection->Form->ModalForm ? HII_DISPLAY_MODAL : 0;\r
-  gDisplayFormData.Attribute       |= gCurrentSelection->Form->Locked    ? HII_DISPLAY_LOCK  : 0;\r
+  gDisplayFormData.Attribute  = 0;\r
+  gDisplayFormData.Attribute |= gCurrentSelection->Form->ModalForm ? HII_DISPLAY_MODAL : 0;\r
+  gDisplayFormData.Attribute |= gCurrentSelection->Form->Locked    ? HII_DISPLAY_LOCK  : 0;\r
 \r
   gDisplayFormData.FormRefreshEvent     = NULL;\r
   gDisplayFormData.HighLightedStatement = NULL;\r
@@ -797,19 +811,19 @@ UpdateDisplayFormData (
 **/\r
 VOID\r
 FreeStatementData (\r
-  LIST_ENTRY           *StatementList\r
+  LIST_ENTRY  *StatementList\r
   )\r
 {\r
-  LIST_ENTRY                    *Link;\r
-  LIST_ENTRY                    *OptionLink;\r
-  FORM_DISPLAY_ENGINE_STATEMENT *Statement;\r
-  DISPLAY_QUESTION_OPTION       *Option;\r
+  LIST_ENTRY                     *Link;\r
+  LIST_ENTRY                     *OptionLink;\r
+  FORM_DISPLAY_ENGINE_STATEMENT  *Statement;\r
+  DISPLAY_QUESTION_OPTION        *Option;\r
 \r
   //\r
   // Free Statements/Questions\r
   //\r
   while (!IsListEmpty (StatementList)) {\r
-    Link = GetFirstNode (StatementList);\r
+    Link      = GetFirstNode (StatementList);\r
     Statement = FORM_DISPLAY_ENGINE_STATEMENT_FROM_LINK (Link);\r
 \r
     //\r
@@ -817,7 +831,7 @@ FreeStatementData (
     //\r
     while (!IsListEmpty (&Statement->OptionListHead)) {\r
       OptionLink = GetFirstNode (&Statement->OptionListHead);\r
-      Option = DISPLAY_QUESTION_OPTION_FROM_LINK (OptionLink);\r
+      Option     = DISPLAY_QUESTION_OPTION_FROM_LINK (OptionLink);\r
       RemoveEntryList (&Option->Link);\r
       FreePool (Option);\r
     }\r
@@ -826,7 +840,7 @@ FreeStatementData (
     // Free nest statement List\r
     //\r
     if (!IsListEmpty (&Statement->NestStatementList)) {\r
-      FreeStatementData(&Statement->NestStatementList);\r
+      FreeStatementData (&Statement->NestStatementList);\r
     }\r
 \r
     RemoveEntryList (&Statement->DisplayLink);\r
@@ -847,9 +861,9 @@ FreeDisplayFormData (
   FreeStatementData (&gDisplayFormData.StatementListHead);\r
   FreeStatementData (&gDisplayFormData.StatementListOSF);\r
 \r
-  FreeRefreshEvent();\r
+  FreeRefreshEvent ();\r
 \r
-  FreeHotkeyList();\r
+  FreeHotkeyList ();\r
 }\r
 \r
 /**\r
@@ -863,11 +877,11 @@ FreeDisplayFormData (
 **/\r
 FORM_BROWSER_STATEMENT *\r
 GetBrowserStatement (\r
-  IN FORM_DISPLAY_ENGINE_STATEMENT *DisplayStatement\r
+  IN FORM_DISPLAY_ENGINE_STATEMENT  *DisplayStatement\r
   )\r
 {\r
-  FORM_BROWSER_STATEMENT *Statement;\r
-  LIST_ENTRY             *Link;\r
+  FORM_BROWSER_STATEMENT  *Statement;\r
+  LIST_ENTRY              *Link;\r
 \r
   Link = GetFirstNode (&gCurrentSelection->Form->StatementListHead);\r
   while (!IsNull (&gCurrentSelection->Form->StatementListHead, Link)) {\r
@@ -892,17 +906,17 @@ GetBrowserStatement (
 **/\r
 VOID\r
 UpdateStatementStatusForForm (\r
-  IN FORM_BROWSER_FORMSET             *FormSet,\r
-  IN FORM_BROWSER_FORM                *Form\r
+  IN FORM_BROWSER_FORMSET  *FormSet,\r
+  IN FORM_BROWSER_FORM     *Form\r
   )\r
 {\r
-  LIST_ENTRY                  *Link;\r
-  FORM_BROWSER_STATEMENT      *Question;\r
+  LIST_ENTRY              *Link;\r
+  FORM_BROWSER_STATEMENT  *Question;\r
 \r
   Link = GetFirstNode (&Form->StatementListHead);\r
   while (!IsNull (&Form->StatementListHead, Link)) {\r
     Question = FORM_BROWSER_STATEMENT_FROM_LINK (Link);\r
-    Link = GetNextNode (&Form->StatementListHead, Link);\r
+    Link     = GetNextNode (&Form->StatementListHead, Link);\r
 \r
     //\r
     // For password opcode, not set the the value changed flag.\r
@@ -911,7 +925,7 @@ UpdateStatementStatusForForm (
       continue;\r
     }\r
 \r
-    IsQuestionValueChanged(FormSet, Form, Question, GetSetValueWithBuffer);\r
+    IsQuestionValueChanged (FormSet, Form, Question, GetSetValueWithBuffer);\r
   }\r
 }\r
 \r
@@ -923,11 +937,11 @@ UpdateStatementStatusForForm (
 **/\r
 VOID\r
 UpdateStatementStatusForFormSet (\r
-  IN FORM_BROWSER_FORMSET                *FormSet\r
+  IN FORM_BROWSER_FORMSET  *FormSet\r
   )\r
 {\r
-  LIST_ENTRY                  *Link;\r
-  FORM_BROWSER_FORM           *Form;\r
+  LIST_ENTRY         *Link;\r
+  FORM_BROWSER_FORM  *Form;\r
 \r
   Link = GetFirstNode (&FormSet->FormListHead);\r
   while (!IsNull (&FormSet->FormListHead, Link)) {\r
@@ -948,38 +962,39 @@ UpdateStatementStatusForFormSet (
 **/\r
 VOID\r
 UpdateStatementStatus (\r
-  IN FORM_BROWSER_FORMSET             *FormSet,\r
-  IN FORM_BROWSER_FORM                *Form,\r
-  IN BROWSER_SETTING_SCOPE            SettingScope\r
+  IN FORM_BROWSER_FORMSET   *FormSet,\r
+  IN FORM_BROWSER_FORM      *Form,\r
+  IN BROWSER_SETTING_SCOPE  SettingScope\r
   )\r
 {\r
-  LIST_ENTRY                  *Link;\r
-  FORM_BROWSER_FORMSET        *LocalFormSet;\r
+  LIST_ENTRY            *Link;\r
+  FORM_BROWSER_FORMSET  *LocalFormSet;\r
 \r
   switch (SettingScope) {\r
-  case SystemLevel:\r
-    Link = GetFirstNode (&gBrowserFormSetList);\r
-    while (!IsNull (&gBrowserFormSetList, Link)) {\r
-      LocalFormSet = FORM_BROWSER_FORMSET_FROM_LINK (Link);\r
-      Link = GetNextNode (&gBrowserFormSetList, Link);\r
-      if (!ValidateFormSet(LocalFormSet)) {\r
-        continue;\r
+    case SystemLevel:\r
+      Link = GetFirstNode (&gBrowserFormSetList);\r
+      while (!IsNull (&gBrowserFormSetList, Link)) {\r
+        LocalFormSet = FORM_BROWSER_FORMSET_FROM_LINK (Link);\r
+        Link         = GetNextNode (&gBrowserFormSetList, Link);\r
+        if (!ValidateFormSet (LocalFormSet)) {\r
+          continue;\r
+        }\r
+\r
+        UpdateStatementStatusForFormSet (LocalFormSet);\r
       }\r
 \r
-      UpdateStatementStatusForFormSet (LocalFormSet);\r
-    }\r
-    break;\r
+      break;\r
 \r
-  case FormSetLevel:\r
-    UpdateStatementStatusForFormSet (FormSet);\r
-    break;\r
+    case FormSetLevel:\r
+      UpdateStatementStatusForFormSet (FormSet);\r
+      break;\r
 \r
-  case FormLevel:\r
-    UpdateStatementStatusForForm (FormSet, Form);\r
-    break;\r
+    case FormLevel:\r
+      UpdateStatementStatusForForm (FormSet, Form);\r
+      break;\r
 \r
-  default:\r
-    break;\r
+    default:\r
+      break;\r
   }\r
 }\r
 \r
@@ -995,8 +1010,8 @@ UpdateStatementStatus (
 **/\r
 EFI_STATUS\r
 ProcessAction (\r
-  IN UINT32        Action,\r
-  IN UINT16        DefaultId\r
+  IN UINT32  Action,\r
+  IN UINT16  DefaultId\r
   )\r
 {\r
   //\r
@@ -1024,7 +1039,7 @@ ProcessAction (
   }\r
 \r
   if ((Action & BROWSER_ACTION_RESET) == BROWSER_ACTION_RESET) {\r
-    gResetRequiredFormLevel = TRUE;\r
+    gResetRequiredFormLevel   = TRUE;\r
     gResetRequiredSystemLevel = TRUE;\r
   }\r
 \r
@@ -1035,12 +1050,13 @@ ProcessAction (
     // System Exit without saving, CallExitHandler and Exit SendForm.\r
     //\r
     DiscardForm (gCurrentSelection->FormSet, gCurrentSelection->Form, gBrowserSettingScope);\r
-    if (gBrowserSettingScope == FormLevel || gBrowserSettingScope == FormSetLevel) {\r
+    if ((gBrowserSettingScope == FormLevel) || (gBrowserSettingScope == FormSetLevel)) {\r
       FindNextMenu (gCurrentSelection, gBrowserSettingScope);\r
     } else if (gBrowserSettingScope == SystemLevel) {\r
       if (ExitHandlerFunction != NULL) {\r
         ExitHandlerFunction ();\r
       }\r
+\r
       gCurrentSelection->Action = UI_ACTION_EXIT;\r
     }\r
   }\r
@@ -1060,8 +1076,8 @@ ProcessAction (
 **/\r
 BOOLEAN\r
 GetFormsetGuidFromHiiHandle (\r
-  IN EFI_HII_HANDLE       HiiHandle,\r
-  IN EFI_GUID             *FormSetGuid\r
+  IN EFI_HII_HANDLE  HiiHandle,\r
+  IN EFI_GUID        *FormSetGuid\r
   )\r
 {\r
   EFI_HII_PACKAGE_LIST_HEADER  *HiiPackageList;\r
@@ -1086,19 +1102,20 @@ GetFormsetGuidFromHiiHandle (
 \r
     Status = mHiiDatabase->ExportPackageLists (mHiiDatabase, HiiHandle, &BufferSize, HiiPackageList);\r
   }\r
-  if (EFI_ERROR (Status) || HiiPackageList == NULL) {\r
+\r
+  if (EFI_ERROR (Status) || (HiiPackageList == NULL)) {\r
     return FALSE;\r
   }\r
 \r
   //\r
   // Get Form package from this HII package List\r
   //\r
-  Offset = sizeof (EFI_HII_PACKAGE_LIST_HEADER);\r
+  Offset  = sizeof (EFI_HII_PACKAGE_LIST_HEADER);\r
   Offset2 = 0;\r
   CopyMem (&PackageListLength, &HiiPackageList->PackageLength, sizeof (UINT32));\r
 \r
   while (Offset < PackageListLength) {\r
-    Package = ((UINT8 *) HiiPackageList) + Offset;\r
+    Package = ((UINT8 *)HiiPackageList) + Offset;\r
     CopyMem (&PackageHeader, Package, sizeof (EFI_HII_PACKAGE_HEADER));\r
     Offset += PackageHeader.Length;\r
 \r
@@ -1110,16 +1127,17 @@ GetFormsetGuidFromHiiHandle (
       while (Offset2 < PackageHeader.Length) {\r
         OpCodeData = Package + Offset2;\r
 \r
-        if (((EFI_IFR_OP_HEADER *) OpCodeData)->OpCode == EFI_IFR_FORM_SET_OP) {\r
-          if (CompareGuid (FormSetGuid, (EFI_GUID *)(OpCodeData + sizeof (EFI_IFR_OP_HEADER)))){\r
+        if (((EFI_IFR_OP_HEADER *)OpCodeData)->OpCode == EFI_IFR_FORM_SET_OP) {\r
+          if (CompareGuid (FormSetGuid, (EFI_GUID *)(OpCodeData + sizeof (EFI_IFR_OP_HEADER)))) {\r
             FindGuid = TRUE;\r
             break;\r
           }\r
         }\r
 \r
-        Offset2 += ((EFI_IFR_OP_HEADER *) OpCodeData)->Length;\r
+        Offset2 += ((EFI_IFR_OP_HEADER *)OpCodeData)->Length;\r
       }\r
     }\r
+\r
     if (FindGuid) {\r
       break;\r
     }\r
@@ -1146,17 +1164,17 @@ GetFormsetGuidFromHiiHandle (
 **/\r
 EFI_HII_HANDLE\r
 DevicePathToHiiHandle (\r
-  IN EFI_DEVICE_PATH_PROTOCOL   *DevicePath,\r
-  IN EFI_GUID                   *FormsetGuid\r
+  IN EFI_DEVICE_PATH_PROTOCOL  *DevicePath,\r
+  IN EFI_GUID                  *FormsetGuid\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-  EFI_DEVICE_PATH_PROTOCOL    *TmpDevicePath;\r
-  UINTN                       Index;\r
-  EFI_HANDLE                  Handle;\r
-  EFI_HANDLE                  DriverHandle;\r
-  EFI_HII_HANDLE              *HiiHandles;\r
-  EFI_HII_HANDLE              HiiHandle;\r
+  EFI_STATUS                Status;\r
+  EFI_DEVICE_PATH_PROTOCOL  *TmpDevicePath;\r
+  UINTN                     Index;\r
+  EFI_HANDLE                Handle;\r
+  EFI_HANDLE                DriverHandle;\r
+  EFI_HII_HANDLE            *HiiHandles;\r
+  EFI_HII_HANDLE            HiiHandle;\r
 \r
   ASSERT (DevicePath != NULL);\r
 \r
@@ -1192,7 +1210,7 @@ DevicePathToHiiHandle (
                              &Handle\r
                              );\r
     if (!EFI_ERROR (Status) && (Handle == DriverHandle)) {\r
-      if (GetFormsetGuidFromHiiHandle(HiiHandles[Index], FormsetGuid)) {\r
+      if (GetFormsetGuidFromHiiHandle (HiiHandles[Index], FormsetGuid)) {\r
         HiiHandle = HiiHandles[Index];\r
         break;\r
       }\r
@@ -1222,16 +1240,16 @@ DevicePathToHiiHandle (
 **/\r
 EFI_HII_HANDLE\r
 FormSetGuidToHiiHandle (\r
-  EFI_GUID     *ComparingGuid\r
+  EFI_GUID  *ComparingGuid\r
   )\r
 {\r
-  EFI_HII_HANDLE               *HiiHandles;\r
-  EFI_HII_HANDLE               HiiHandle;\r
-  UINTN                        Index;\r
+  EFI_HII_HANDLE  *HiiHandles;\r
+  EFI_HII_HANDLE  HiiHandle;\r
+  UINTN           Index;\r
 \r
   ASSERT (ComparingGuid != NULL);\r
 \r
-  HiiHandle  = NULL;\r
+  HiiHandle = NULL;\r
   //\r
   // Get all the Hii handles\r
   //\r
@@ -1242,7 +1260,7 @@ FormSetGuidToHiiHandle (
   // Search for formset of each class type\r
   //\r
   for (Index = 0; HiiHandles[Index] != NULL; Index++) {\r
-    if (GetFormsetGuidFromHiiHandle(HiiHandles[Index], ComparingGuid)) {\r
+    if (GetFormsetGuidFromHiiHandle (HiiHandles[Index], ComparingGuid)) {\r
       HiiHandle = HiiHandles[Index];\r
       break;\r
     }\r
@@ -1272,15 +1290,15 @@ FormSetGuidToHiiHandle (
 **/\r
 BOOLEAN\r
 ProcessChangedData (\r
-  IN OUT UI_MENU_SELECTION       *Selection,\r
-  IN     BROWSER_SETTING_SCOPE   Scope\r
+  IN OUT UI_MENU_SELECTION      *Selection,\r
+  IN     BROWSER_SETTING_SCOPE  Scope\r
   )\r
 {\r
-  BOOLEAN    RetValue;\r
-  EFI_STATUS Status;\r
+  BOOLEAN     RetValue;\r
+  EFI_STATUS  Status;\r
 \r
   RetValue = TRUE;\r
-  switch (mFormDisplay->ConfirmDataChange()) {\r
+  switch (mFormDisplay->ConfirmDataChange ()) {\r
     case BROWSER_ACTION_DISCARD:\r
       DiscardForm (Selection->FormSet, Selection->Form, Scope);\r
       break;\r
@@ -1290,6 +1308,7 @@ ProcessChangedData (
       if (EFI_ERROR (Status)) {\r
         RetValue = FALSE;\r
       }\r
+\r
       break;\r
 \r
     case BROWSER_ACTION_NONE:\r
@@ -1316,18 +1335,18 @@ ProcessChangedData (
 **/\r
 VOID\r
 FindParentFormSet (\r
-  IN OUT   UI_MENU_SELECTION           *Selection\r
+  IN OUT   UI_MENU_SELECTION  *Selection\r
   )\r
 {\r
-  FORM_ENTRY_INFO            *CurrentMenu;\r
-  FORM_ENTRY_INFO            *ParentMenu;\r
+  FORM_ENTRY_INFO  *CurrentMenu;\r
+  FORM_ENTRY_INFO  *ParentMenu;\r
 \r
   CurrentMenu = Selection->CurrentMenu;\r
-  ParentMenu  = UiFindParentMenu(CurrentMenu, FormSetLevel);\r
+  ParentMenu  = UiFindParentMenu (CurrentMenu, FormSetLevel);\r
 \r
   if (ParentMenu != NULL) {\r
     CopyMem (&Selection->FormSetGuid, &ParentMenu->FormSetGuid, sizeof (EFI_GUID));\r
-    Selection->Handle = ParentMenu->HiiHandle;\r
+    Selection->Handle     = ParentMenu->HiiHandle;\r
     Selection->FormId     = ParentMenu->FormId;\r
     Selection->QuestionId = ParentMenu->QuestionId;\r
   } else {\r
@@ -1335,7 +1354,7 @@ FindParentFormSet (
     Selection->QuestionId = CurrentMenu->QuestionId;\r
   }\r
 \r
-  Selection->Statement  = NULL;\r
+  Selection->Statement = NULL;\r
 }\r
 \r
 /**\r
@@ -1349,15 +1368,15 @@ FindParentFormSet (
 **/\r
 EFI_STATUS\r
 ProcessGotoOpCode (\r
-  IN OUT   FORM_BROWSER_STATEMENT      *Statement,\r
-  IN OUT   UI_MENU_SELECTION           *Selection\r
+  IN OUT   FORM_BROWSER_STATEMENT  *Statement,\r
+  IN OUT   UI_MENU_SELECTION       *Selection\r
   )\r
 {\r
-  CHAR16                          *StringPtr;\r
-  EFI_DEVICE_PATH_PROTOCOL        *DevicePath;\r
-  FORM_BROWSER_FORM               *RefForm;\r
-  EFI_STATUS                      Status;\r
-  EFI_HII_HANDLE                  HiiHandle;\r
+  CHAR16                    *StringPtr;\r
+  EFI_DEVICE_PATH_PROTOCOL  *DevicePath;\r
+  FORM_BROWSER_FORM         *RefForm;\r
+  EFI_STATUS                Status;\r
+  EFI_HII_HANDLE            HiiHandle;\r
 \r
   Status    = EFI_SUCCESS;\r
   StringPtr = NULL;\r
@@ -1373,7 +1392,7 @@ ProcessGotoOpCode (
   //\r
   // Check whether the device path string is a valid string.\r
   //\r
-  if (Statement->HiiValue.Value.ref.DevicePath != 0 && StringPtr != NULL && StringPtr[0] != L'\0') {\r
+  if ((Statement->HiiValue.Value.ref.DevicePath != 0) && (StringPtr != NULL) && (StringPtr[0] != L'\0')) {\r
     if (Selection->Form->ModalForm) {\r
       return Status;\r
     }\r
@@ -1382,17 +1401,18 @@ ProcessGotoOpCode (
     // Goto another Hii Package list\r
     //\r
     if (mPathFromText != NULL) {\r
-      DevicePath = mPathFromText->ConvertTextToDevicePath(StringPtr);\r
+      DevicePath = mPathFromText->ConvertTextToDevicePath (StringPtr);\r
       if (DevicePath != NULL) {\r
         HiiHandle = DevicePathToHiiHandle (DevicePath, &Statement->HiiValue.Value.ref.FormSetGuid);\r
         FreePool (DevicePath);\r
       }\r
+\r
       FreePool (StringPtr);\r
     } else {\r
       //\r
       // Not found the EFI_DEVICE_PATH_FROM_TEXT_PROTOCOL protocol.\r
       //\r
-      PopupErrorMessage(BROWSER_PROTOCOL_NOT_FOUND, NULL, NULL, NULL);\r
+      PopupErrorMessage (BROWSER_PROTOCOL_NOT_FOUND, NULL, NULL, NULL);\r
       FreePool (StringPtr);\r
       return Status;\r
     }\r
@@ -1401,9 +1421,10 @@ ProcessGotoOpCode (
       //\r
       // Goto another Formset, check for uncommitted data\r
       //\r
-      if ((gBrowserSettingScope == FormLevel || gBrowserSettingScope == FormSetLevel) &&\r
-          IsNvUpdateRequiredForFormSet(Selection->FormSet)) {\r
-        if (!ProcessChangedData(Selection, FormSetLevel)) {\r
+      if (((gBrowserSettingScope == FormLevel) || (gBrowserSettingScope == FormSetLevel)) &&\r
+          IsNvUpdateRequiredForFormSet (Selection->FormSet))\r
+      {\r
+        if (!ProcessChangedData (Selection, FormSetLevel)) {\r
           return EFI_SUCCESS;\r
         }\r
       }\r
@@ -1415,48 +1436,50 @@ ProcessGotoOpCode (
       //\r
       // If target Hii Handle not found, exit current formset.\r
       //\r
-      FindParentFormSet(Selection);\r
+      FindParentFormSet (Selection);\r
       return EFI_SUCCESS;\r
     }\r
 \r
-    CopyMem (&Selection->FormSetGuid,&Statement->HiiValue.Value.ref.FormSetGuid, sizeof (EFI_GUID));\r
-    Selection->FormId = Statement->HiiValue.Value.ref.FormId;\r
+    CopyMem (&Selection->FormSetGuid, &Statement->HiiValue.Value.ref.FormSetGuid, sizeof (EFI_GUID));\r
+    Selection->FormId     = Statement->HiiValue.Value.ref.FormId;\r
     Selection->QuestionId = Statement->HiiValue.Value.ref.QuestionId;\r
   } else if (!IsZeroGuid (&Statement->HiiValue.Value.ref.FormSetGuid)) {\r
     if (Selection->Form->ModalForm) {\r
       return Status;\r
     }\r
+\r
     if (!CompareGuid (&Statement->HiiValue.Value.ref.FormSetGuid, &Selection->FormSetGuid)) {\r
       //\r
       // Goto another Formset, check for uncommitted data\r
       //\r
-      if ((gBrowserSettingScope == FormLevel || gBrowserSettingScope == FormSetLevel) &&\r
-         IsNvUpdateRequiredForFormSet(Selection->FormSet)) {\r
-        if (!ProcessChangedData(Selection, FormSetLevel)) {\r
+      if (((gBrowserSettingScope == FormLevel) || (gBrowserSettingScope == FormSetLevel)) &&\r
+          IsNvUpdateRequiredForFormSet (Selection->FormSet))\r
+      {\r
+        if (!ProcessChangedData (Selection, FormSetLevel)) {\r
           return EFI_SUCCESS;\r
         }\r
       }\r
     }\r
 \r
     Selection->Action = UI_ACTION_REFRESH_FORMSET;\r
-    Selection->Handle = FormSetGuidToHiiHandle(&Statement->HiiValue.Value.ref.FormSetGuid);\r
+    Selection->Handle = FormSetGuidToHiiHandle (&Statement->HiiValue.Value.ref.FormSetGuid);\r
     if (Selection->Handle == NULL) {\r
       //\r
       // If target Hii Handle not found, exit current formset.\r
       //\r
-      FindParentFormSet(Selection);\r
+      FindParentFormSet (Selection);\r
       return EFI_SUCCESS;\r
     }\r
 \r
     CopyMem (&Selection->FormSetGuid, &Statement->HiiValue.Value.ref.FormSetGuid, sizeof (EFI_GUID));\r
-    Selection->FormId = Statement->HiiValue.Value.ref.FormId;\r
+    Selection->FormId     = Statement->HiiValue.Value.ref.FormId;\r
     Selection->QuestionId = Statement->HiiValue.Value.ref.QuestionId;\r
   } else if (Statement->HiiValue.Value.ref.FormId != 0) {\r
     //\r
     // Goto another Form, check for uncommitted data\r
     //\r
     if (Statement->HiiValue.Value.ref.FormId != Selection->FormId) {\r
-      if ((gBrowserSettingScope == FormLevel && IsNvUpdateRequiredForForm(Selection->Form))) {\r
+      if (((gBrowserSettingScope == FormLevel) && IsNvUpdateRequiredForForm (Selection->Form))) {\r
         if (!ProcessChangedData (Selection, FormLevel)) {\r
           return EFI_SUCCESS;\r
         }\r
@@ -1465,16 +1488,16 @@ ProcessGotoOpCode (
 \r
     RefForm = IdToForm (Selection->FormSet, Statement->HiiValue.Value.ref.FormId);\r
     if ((RefForm != NULL) && (RefForm->SuppressExpression != NULL)) {\r
-      if (EvaluateExpressionList(RefForm->SuppressExpression, TRUE, Selection->FormSet, RefForm) != ExpressFalse) {\r
+      if (EvaluateExpressionList (RefForm->SuppressExpression, TRUE, Selection->FormSet, RefForm) != ExpressFalse) {\r
         //\r
         // Form is suppressed.\r
         //\r
-        PopupErrorMessage(BROWSER_FORM_SUPPRESS, NULL, NULL, NULL);\r
+        PopupErrorMessage (BROWSER_FORM_SUPPRESS, NULL, NULL, NULL);\r
         return EFI_SUCCESS;\r
       }\r
     }\r
 \r
-    Selection->FormId = Statement->HiiValue.Value.ref.FormId;\r
+    Selection->FormId     = Statement->HiiValue.Value.ref.FormId;\r
     Selection->QuestionId = Statement->HiiValue.Value.ref.QuestionId;\r
   } else if (Statement->HiiValue.Value.ref.QuestionId != 0) {\r
     Selection->QuestionId = Statement->HiiValue.Value.ref.QuestionId;\r
@@ -1483,7 +1506,6 @@ ProcessGotoOpCode (
   return Status;\r
 }\r
 \r
-\r
 /**\r
   Process Question Config.\r
 \r
@@ -1500,9 +1522,9 @@ ProcessQuestionConfig (
   IN  FORM_BROWSER_STATEMENT  *Question\r
   )\r
 {\r
-  EFI_STATUS                      Status;\r
-  CHAR16                          *ConfigResp;\r
-  CHAR16                          *Progress;\r
+  EFI_STATUS  Status;\r
+  CHAR16      *ConfigResp;\r
+  CHAR16      *Progress;\r
 \r
   if (Question->QuestionConfig == 0) {\r
     return EFI_SUCCESS;\r
@@ -1522,10 +1544,10 @@ ProcessQuestionConfig (
   // Send config to Configuration Driver\r
   //\r
   Status = mHiiConfigRouting->RouteConfig (\r
-                           mHiiConfigRouting,\r
-                           ConfigResp,\r
-                           &Progress\r
-                           );\r
+                                mHiiConfigRouting,\r
+                                ConfigResp,\r
+                                &Progress\r
+                                );\r
 \r
   return Status;\r
 }\r
@@ -1541,11 +1563,11 @@ ProcessQuestionConfig (
 **/\r
 EFI_STATUS\r
 ProcessUserInput (\r
-  IN USER_INPUT               *UserInput\r
+  IN USER_INPUT  *UserInput\r
   )\r
 {\r
-  EFI_STATUS                    Status;\r
-  FORM_BROWSER_STATEMENT        *Statement;\r
+  EFI_STATUS              Status;\r
+  FORM_BROWSER_STATEMENT  *Statement;\r
 \r
   Status    = EFI_SUCCESS;\r
   Statement = NULL;\r
@@ -1559,8 +1581,8 @@ ProcessUserInput (
   // Remove the last highligh question id, this id will update when show next form.\r
   //\r
   gCurrentSelection->QuestionId = 0;\r
-  if (UserInput->SelectedStatement != NULL){\r
-    Statement = GetBrowserStatement(UserInput->SelectedStatement);\r
+  if (UserInput->SelectedStatement != NULL) {\r
+    Statement = GetBrowserStatement (UserInput->SelectedStatement);\r
     ASSERT (Statement != NULL);\r
 \r
     //\r
@@ -1583,77 +1605,79 @@ ProcessUserInput (
   // First process the Action field in USER_INPUT.\r
   //\r
   if (UserInput->Action != 0) {\r
-    Status = ProcessAction (UserInput->Action, UserInput->DefaultId);\r
+    Status                       = ProcessAction (UserInput->Action, UserInput->DefaultId);\r
     gCurrentSelection->Statement = NULL;\r
   } else {\r
     ASSERT (Statement != NULL);\r
     gCurrentSelection->Statement = Statement;\r
     switch (Statement->Operand) {\r
-    case EFI_IFR_REF_OP:\r
-      Status = ProcessGotoOpCode(Statement, gCurrentSelection);\r
-      break;\r
-\r
-    case EFI_IFR_ACTION_OP:\r
-      //\r
-      // Process the Config string <ConfigResp>\r
-      //\r
-      Status = ProcessQuestionConfig (gCurrentSelection, Statement);\r
-      break;\r
-\r
-    case EFI_IFR_RESET_BUTTON_OP:\r
-      //\r
-      // Reset Question to default value specified by DefaultId\r
-      //\r
-      Status = ExtractDefault (gCurrentSelection->FormSet, NULL, Statement->DefaultId, FormSetLevel, GetDefaultForAll, NULL, FALSE, FALSE);\r
-      UpdateStatementStatus (gCurrentSelection->FormSet, NULL, FormSetLevel);\r
-      break;\r
-\r
-    default:\r
-      switch (Statement->Operand) {\r
-      case EFI_IFR_STRING_OP:\r
-        DeleteString(Statement->HiiValue.Value.string, gCurrentSelection->FormSet->HiiHandle);\r
-        Statement->HiiValue.Value.string = UserInput->InputValue.Value.string;\r
-        CopyMem (Statement->BufferValue, UserInput->InputValue.Buffer, (UINTN) UserInput->InputValue.BufferLen);\r
-        FreePool (UserInput->InputValue.Buffer);\r
+      case EFI_IFR_REF_OP:\r
+        Status = ProcessGotoOpCode (Statement, gCurrentSelection);\r
         break;\r
 \r
-      case EFI_IFR_PASSWORD_OP:\r
-        if (UserInput->InputValue.Buffer == NULL) {\r
-          //\r
-          // User not input new password, just return.\r
-          //\r
-          break;\r
-        }\r
-\r
-        DeleteString(Statement->HiiValue.Value.string, gCurrentSelection->FormSet->HiiHandle);\r
-        Statement->HiiValue.Value.string = UserInput->InputValue.Value.string;\r
-        CopyMem (Statement->BufferValue, UserInput->InputValue.Buffer, (UINTN) UserInput->InputValue.BufferLen);\r
-        ZeroMem (UserInput->InputValue.Buffer, (UINTN) UserInput->InputValue.BufferLen);\r
-        FreePool (UserInput->InputValue.Buffer);\r
+      case EFI_IFR_ACTION_OP:\r
         //\r
-        // Two password match, send it to Configuration Driver\r
+        // Process the Config string <ConfigResp>\r
         //\r
-        if ((Statement->QuestionFlags & EFI_IFR_FLAG_CALLBACK) != 0) {\r
-          PasswordCheck (NULL, UserInput->SelectedStatement, (CHAR16 *) Statement->BufferValue);\r
-          //\r
-          // Clean the value after saved it.\r
-          //\r
-          ZeroMem (Statement->BufferValue, (UINTN) UserInput->InputValue.BufferLen);\r
-          HiiSetString (gCurrentSelection->FormSet->HiiHandle, Statement->HiiValue.Value.string, (CHAR16*)Statement->BufferValue, NULL);\r
-        } else {\r
-          SetQuestionValue (gCurrentSelection->FormSet, gCurrentSelection->Form, Statement, GetSetValueWithHiiDriver);\r
-        }\r
+        Status = ProcessQuestionConfig (gCurrentSelection, Statement);\r
         break;\r
 \r
-      case EFI_IFR_ORDERED_LIST_OP:\r
-        CopyMem (Statement->BufferValue, UserInput->InputValue.Buffer, UserInput->InputValue.BufferLen);\r
+      case EFI_IFR_RESET_BUTTON_OP:\r
+        //\r
+        // Reset Question to default value specified by DefaultId\r
+        //\r
+        Status = ExtractDefault (gCurrentSelection->FormSet, NULL, Statement->DefaultId, FormSetLevel, GetDefaultForAll, NULL, FALSE, FALSE);\r
+        UpdateStatementStatus (gCurrentSelection->FormSet, NULL, FormSetLevel);\r
         break;\r
 \r
       default:\r
-        CopyMem (&Statement->HiiValue, &UserInput->InputValue, sizeof (EFI_HII_VALUE));\r
+        switch (Statement->Operand) {\r
+          case EFI_IFR_STRING_OP:\r
+            DeleteString (Statement->HiiValue.Value.string, gCurrentSelection->FormSet->HiiHandle);\r
+            Statement->HiiValue.Value.string = UserInput->InputValue.Value.string;\r
+            CopyMem (Statement->BufferValue, UserInput->InputValue.Buffer, (UINTN)UserInput->InputValue.BufferLen);\r
+            FreePool (UserInput->InputValue.Buffer);\r
+            break;\r
+\r
+          case EFI_IFR_PASSWORD_OP:\r
+            if (UserInput->InputValue.Buffer == NULL) {\r
+              //\r
+              // User not input new password, just return.\r
+              //\r
+              break;\r
+            }\r
+\r
+            DeleteString (Statement->HiiValue.Value.string, gCurrentSelection->FormSet->HiiHandle);\r
+            Statement->HiiValue.Value.string = UserInput->InputValue.Value.string;\r
+            CopyMem (Statement->BufferValue, UserInput->InputValue.Buffer, (UINTN)UserInput->InputValue.BufferLen);\r
+            ZeroMem (UserInput->InputValue.Buffer, (UINTN)UserInput->InputValue.BufferLen);\r
+            FreePool (UserInput->InputValue.Buffer);\r
+            //\r
+            // Two password match, send it to Configuration Driver\r
+            //\r
+            if ((Statement->QuestionFlags & EFI_IFR_FLAG_CALLBACK) != 0) {\r
+              PasswordCheck (NULL, UserInput->SelectedStatement, (CHAR16 *)Statement->BufferValue);\r
+              //\r
+              // Clean the value after saved it.\r
+              //\r
+              ZeroMem (Statement->BufferValue, (UINTN)UserInput->InputValue.BufferLen);\r
+              HiiSetString (gCurrentSelection->FormSet->HiiHandle, Statement->HiiValue.Value.string, (CHAR16 *)Statement->BufferValue, NULL);\r
+            } else {\r
+              SetQuestionValue (gCurrentSelection->FormSet, gCurrentSelection->Form, Statement, GetSetValueWithHiiDriver);\r
+            }\r
+\r
+            break;\r
+\r
+          case EFI_IFR_ORDERED_LIST_OP:\r
+            CopyMem (Statement->BufferValue, UserInput->InputValue.Buffer, UserInput->InputValue.BufferLen);\r
+            break;\r
+\r
+          default:\r
+            CopyMem (&Statement->HiiValue, &UserInput->InputValue, sizeof (EFI_HII_VALUE));\r
+            break;\r
+        }\r
+\r
         break;\r
-      }\r
-      break;\r
     }\r
   }\r
 \r
@@ -1672,9 +1696,9 @@ DisplayForm (
   VOID\r
   )\r
 {\r
-  EFI_STATUS               Status;\r
-  USER_INPUT               UserInput;\r
-  FORM_ENTRY_INFO          *CurrentMenu;\r
+  EFI_STATUS       Status;\r
+  USER_INPUT       UserInput;\r
+  FORM_ENTRY_INFO  *CurrentMenu;\r
 \r
   ZeroMem (&UserInput, sizeof (USER_INPUT));\r
 \r
@@ -1686,15 +1710,19 @@ DisplayForm (
     //\r
     // Current menu not found, add it to the menu tree\r
     //\r
-    CurrentMenu = UiAddMenuList (gCurrentSelection->Handle, &gCurrentSelection->FormSetGuid,\r
-                                 gCurrentSelection->FormId, gCurrentSelection->QuestionId);\r
+    CurrentMenu = UiAddMenuList (\r
+                    gCurrentSelection->Handle,\r
+                    &gCurrentSelection->FormSetGuid,\r
+                    gCurrentSelection->FormId,\r
+                    gCurrentSelection->QuestionId\r
+                    );\r
     ASSERT (CurrentMenu != NULL);\r
   }\r
 \r
   //\r
   // Back up the form view history data for this form.\r
   //\r
-  UiCopyMenuList(&gCurrentSelection->Form->FormViewListHead, &mPrivateData.FormBrowserEx2.FormViewHistoryHead);\r
+  UiCopyMenuList (&gCurrentSelection->Form->FormViewListHead, &mPrivateData.FormBrowserEx2.FormViewHistoryHead);\r
 \r
   gCurrentSelection->CurrentMenu = CurrentMenu;\r
 \r
@@ -1715,14 +1743,14 @@ DisplayForm (
   ASSERT (gDisplayFormData.BrowserStatus == BROWSER_SUCCESS);\r
   Status = mFormDisplay->FormDisplay (&gDisplayFormData, &UserInput);\r
   if (EFI_ERROR (Status)) {\r
-    FreeDisplayFormData();\r
+    FreeDisplayFormData ();\r
     return Status;\r
   }\r
 \r
-  CheckConfigAccess(gCurrentSelection->FormSet);\r
+  CheckConfigAccess (gCurrentSelection->FormSet);\r
 \r
   Status = ProcessUserInput (&UserInput);\r
-  FreeDisplayFormData();\r
+  FreeDisplayFormData ();\r
   return Status;\r
 }\r
 \r
@@ -1755,15 +1783,15 @@ DisplayForm (
 EFI_STATUS\r
 EFIAPI\r
 FormUpdateNotify (\r
-  IN UINT8                              PackageType,\r
-  IN CONST EFI_GUID                     *PackageGuid,\r
-  IN CONST EFI_HII_PACKAGE_HEADER       *Package,\r
-  IN EFI_HII_HANDLE                     Handle,\r
-  IN EFI_HII_DATABASE_NOTIFY_TYPE       NotifyType\r
+  IN UINT8                         PackageType,\r
+  IN CONST EFI_GUID                *PackageGuid,\r
+  IN CONST EFI_HII_PACKAGE_HEADER  *Package,\r
+  IN EFI_HII_HANDLE                Handle,\r
+  IN EFI_HII_DATABASE_NOTIFY_TYPE  NotifyType\r
   )\r
 {\r
   mHiiPackageListUpdated = TRUE;\r
-  mDynamicFormUpdated = TRUE;\r
+  mDynamicFormUpdated    = TRUE;\r
 \r
   return EFI_SUCCESS;\r
 }\r
@@ -1779,9 +1807,9 @@ IsNvUpdateRequiredForFormSet (
   IN FORM_BROWSER_FORMSET  *FormSet\r
   )\r
 {\r
-  LIST_ENTRY              *Link;\r
-  FORM_BROWSER_FORM       *Form;\r
-  BOOLEAN                 RetVal;\r
+  LIST_ENTRY         *Link;\r
+  FORM_BROWSER_FORM  *Form;\r
+  BOOLEAN            RetVal;\r
 \r
   //\r
   // Not finished question initialization, return FALSE.\r
@@ -1796,7 +1824,7 @@ IsNvUpdateRequiredForFormSet (
   while (!IsNull (&FormSet->FormListHead, Link)) {\r
     Form = FORM_BROWSER_FORM_FROM_LINK (Link);\r
 \r
-    RetVal = IsNvUpdateRequiredForForm(Form);\r
+    RetVal = IsNvUpdateRequiredForForm (Form);\r
     if (RetVal) {\r
       break;\r
     }\r
@@ -1815,7 +1843,7 @@ IsNvUpdateRequiredForFormSet (
 **/\r
 BOOLEAN\r
 IsNvUpdateRequiredForForm (\r
-  IN FORM_BROWSER_FORM    *Form\r
+  IN FORM_BROWSER_FORM  *Form\r
   )\r
 {\r
   LIST_ENTRY              *Link;\r
@@ -1850,20 +1878,20 @@ IsNvUpdateRequiredForForm (
 **/\r
 BOOLEAN\r
 FindNextMenu (\r
-  IN OUT UI_MENU_SELECTION        *Selection,\r
-  IN     BROWSER_SETTING_SCOPE     SettingLevel\r
+  IN OUT UI_MENU_SELECTION      *Selection,\r
+  IN     BROWSER_SETTING_SCOPE  SettingLevel\r
   )\r
 {\r
-  FORM_ENTRY_INFO            *CurrentMenu;\r
-  FORM_ENTRY_INFO            *ParentMenu;\r
-  BROWSER_SETTING_SCOPE      Scope;\r
+  FORM_ENTRY_INFO        *CurrentMenu;\r
+  FORM_ENTRY_INFO        *ParentMenu;\r
+  BROWSER_SETTING_SCOPE  Scope;\r
 \r
   CurrentMenu = Selection->CurrentMenu;\r
   Scope       = FormSetLevel;\r
 \r
-  ParentMenu = UiFindParentMenu(CurrentMenu, SettingLevel);\r
-  while (ParentMenu != NULL && !ValidateHiiHandle(ParentMenu->HiiHandle)) {\r
-    ParentMenu = UiFindParentMenu(ParentMenu, SettingLevel);\r
+  ParentMenu = UiFindParentMenu (CurrentMenu, SettingLevel);\r
+  while (ParentMenu != NULL && !ValidateHiiHandle (ParentMenu->HiiHandle)) {\r
+    ParentMenu = UiFindParentMenu (ParentMenu, SettingLevel);\r
   }\r
 \r
   if (ParentMenu != NULL) {\r
@@ -1877,9 +1905,10 @@ FindNextMenu (
   //\r
   // Form Level Check whether the data is changed.\r
   //\r
-  if ((gBrowserSettingScope == FormLevel && IsNvUpdateRequiredForForm (Selection->Form)) ||\r
-      (gBrowserSettingScope == FormSetLevel && IsNvUpdateRequiredForFormSet(Selection->FormSet) && Scope == FormSetLevel)) {\r
-    if (!ProcessChangedData(Selection, gBrowserSettingScope)) {\r
+  if (((gBrowserSettingScope == FormLevel) && IsNvUpdateRequiredForForm (Selection->Form)) ||\r
+      ((gBrowserSettingScope == FormSetLevel) && IsNvUpdateRequiredForFormSet (Selection->FormSet) && (Scope == FormSetLevel)))\r
+  {\r
+    if (!ProcessChangedData (Selection, gBrowserSettingScope)) {\r
       return FALSE;\r
     }\r
   }\r
@@ -1898,7 +1927,7 @@ FindNextMenu (
 \r
     Selection->Statement = NULL;\r
 \r
-    Selection->FormId = ParentMenu->FormId;\r
+    Selection->FormId     = ParentMenu->FormId;\r
     Selection->QuestionId = ParentMenu->QuestionId;\r
 \r
     //\r
@@ -1927,14 +1956,14 @@ FindNextMenu (
 **/\r
 BOOLEAN\r
 ReconnectController (\r
-  IN EFI_HANDLE   DriverHandle\r
+  IN EFI_HANDLE  DriverHandle\r
   )\r
 {\r
-  EFI_STATUS                      Status;\r
+  EFI_STATUS  Status;\r
 \r
-  Status = gBS->DisconnectController(DriverHandle, NULL, NULL);\r
+  Status = gBS->DisconnectController (DriverHandle, NULL, NULL);\r
   if (!EFI_ERROR (Status)) {\r
-    Status = gBS->ConnectController(DriverHandle, NULL, NULL, TRUE);\r
+    Status = gBS->ConnectController (DriverHandle, NULL, NULL, TRUE);\r
   }\r
 \r
   return Status == EFI_SUCCESS;\r
@@ -1958,12 +1987,12 @@ ReconnectController (
 **/\r
 EFI_STATUS\r
 ProcessCallBackFunction (\r
-  IN OUT UI_MENU_SELECTION               *Selection,\r
-  IN     FORM_BROWSER_FORMSET            *FormSet,\r
-  IN     FORM_BROWSER_FORM               *Form,\r
-  IN     FORM_BROWSER_STATEMENT          *Question,\r
-  IN     EFI_BROWSER_ACTION              Action,\r
-  IN     BOOLEAN                         SkipSaveOrDiscard\r
+  IN OUT UI_MENU_SELECTION       *Selection,\r
+  IN     FORM_BROWSER_FORMSET    *FormSet,\r
+  IN     FORM_BROWSER_FORM       *Form,\r
+  IN     FORM_BROWSER_STATEMENT  *Question,\r
+  IN     EFI_BROWSER_ACTION      Action,\r
+  IN     BOOLEAN                 SkipSaveOrDiscard\r
   )\r
 {\r
   EFI_STATUS                      Status;\r
@@ -1982,7 +2011,7 @@ ProcessCallBackFunction (
   UINT8                           *BackUpBuffer;\r
   CHAR16                          *NewString;\r
 \r
-  ConfigAccess = FormSet->ConfigAccess;\r
+  ConfigAccess          = FormSet->ConfigAccess;\r
   SubmitFormIsRequired  = FALSE;\r
   SettingLevel          = FormSetLevel;\r
   DiscardFormIsRequired = FALSE;\r
@@ -1998,7 +2027,7 @@ ProcessCallBackFunction (
   Link = GetFirstNode (&Form->StatementListHead);\r
   while (!IsNull (&Form->StatementListHead, Link)) {\r
     Statement = FORM_BROWSER_STATEMENT_FROM_LINK (Link);\r
-    Link = GetNextNode (&Form->StatementListHead, Link);\r
+    Link      = GetNextNode (&Form->StatementListHead, Link);\r
 \r
     //\r
     // if Question != NULL, only process the question. Else, process all question in this form.\r
@@ -2015,18 +2044,18 @@ ProcessCallBackFunction (
     // Check whether Statement is disabled.\r
     //\r
     if (Statement->Expression != NULL) {\r
-      if (EvaluateExpressionList(Statement->Expression, TRUE, FormSet, Form) == ExpressDisable) {\r
+      if (EvaluateExpressionList (Statement->Expression, TRUE, FormSet, Form) == ExpressDisable) {\r
         continue;\r
       }\r
     }\r
 \r
-    HiiValue = &Statement->HiiValue;\r
+    HiiValue  = &Statement->HiiValue;\r
     TypeValue = &HiiValue->Value;\r
     if (HiiValue->Type == EFI_IFR_TYPE_BUFFER) {\r
       //\r
       // For OrderedList, passing in the value buffer to Callback()\r
       //\r
-      TypeValue = (EFI_IFR_TYPE_VALUE *) Statement->BufferValue;\r
+      TypeValue = (EFI_IFR_TYPE_VALUE *)Statement->BufferValue;\r
     }\r
 \r
     //\r
@@ -2034,7 +2063,7 @@ ProcessCallBackFunction (
     //\r
     if (Action == EFI_BROWSER_ACTION_CHANGING) {\r
       if (HiiValue->Type == EFI_IFR_TYPE_BUFFER) {\r
-        BackUpBuffer = AllocateCopyPool(Statement->StorageWidth, Statement->BufferValue);\r
+        BackUpBuffer = AllocateCopyPool (Statement->StorageWidth, Statement->BufferValue);\r
         ASSERT (BackUpBuffer != NULL);\r
       } else {\r
         CopyMem (&BackUpValue, &HiiValue->Value, sizeof (EFI_IFR_TYPE_VALUE));\r
@@ -2042,14 +2071,14 @@ ProcessCallBackFunction (
     }\r
 \r
     ActionRequest = EFI_BROWSER_ACTION_REQUEST_NONE;\r
-    Status = ConfigAccess->Callback (\r
-                             ConfigAccess,\r
-                             Action,\r
-                             Statement->QuestionId,\r
-                             HiiValue->Type,\r
-                             TypeValue,\r
-                             &ActionRequest\r
-                             );\r
+    Status        = ConfigAccess->Callback (\r
+                                    ConfigAccess,\r
+                                    Action,\r
+                                    Statement->QuestionId,\r
+                                    HiiValue->Type,\r
+                                    TypeValue,\r
+                                    &ActionRequest\r
+                                    );\r
     if (!EFI_ERROR (Status)) {\r
       //\r
       // Need to sync the value between Statement->HiiValue->Value and Statement->BufferValue\r
@@ -2065,6 +2094,7 @@ ProcessCallBackFunction (
         } else {\r
           CopyMem (Statement->BufferValue, NewString, Statement->StorageWidth);\r
         }\r
+\r
         FreePool (NewString);\r
       }\r
 \r
@@ -2072,85 +2102,87 @@ ProcessCallBackFunction (
       // Only for EFI_BROWSER_ACTION_CHANGED need to handle this ActionRequest.\r
       //\r
       switch (Action) {\r
-      case EFI_BROWSER_ACTION_CHANGED:\r
-        switch (ActionRequest) {\r
-        case EFI_BROWSER_ACTION_REQUEST_RESET:\r
-          DiscardFormIsRequired = TRUE;\r
-          gResetRequiredFormLevel = TRUE;\r
-          gResetRequiredSystemLevel = TRUE;\r
-          NeedExit              = TRUE;\r
-          break;\r
-\r
-        case EFI_BROWSER_ACTION_REQUEST_SUBMIT:\r
-          SubmitFormIsRequired = TRUE;\r
-          NeedExit              = TRUE;\r
-          break;\r
-\r
-        case EFI_BROWSER_ACTION_REQUEST_EXIT:\r
-          DiscardFormIsRequired = TRUE;\r
-          NeedExit              = TRUE;\r
-          break;\r
-\r
-        case EFI_BROWSER_ACTION_REQUEST_FORM_SUBMIT_EXIT:\r
-          SubmitFormIsRequired  = TRUE;\r
-          SettingLevel          = FormLevel;\r
-          NeedExit              = TRUE;\r
-          break;\r
-\r
-        case EFI_BROWSER_ACTION_REQUEST_FORM_DISCARD_EXIT:\r
-          DiscardFormIsRequired = TRUE;\r
-          SettingLevel          = FormLevel;\r
-          NeedExit              = TRUE;\r
-          break;\r
-\r
-        case EFI_BROWSER_ACTION_REQUEST_FORM_APPLY:\r
-          SubmitFormIsRequired  = TRUE;\r
-          SettingLevel          = FormLevel;\r
-          break;\r
+        case EFI_BROWSER_ACTION_CHANGED:\r
+          switch (ActionRequest) {\r
+            case EFI_BROWSER_ACTION_REQUEST_RESET:\r
+              DiscardFormIsRequired     = TRUE;\r
+              gResetRequiredFormLevel   = TRUE;\r
+              gResetRequiredSystemLevel = TRUE;\r
+              NeedExit                  = TRUE;\r
+              break;\r
+\r
+            case EFI_BROWSER_ACTION_REQUEST_SUBMIT:\r
+              SubmitFormIsRequired = TRUE;\r
+              NeedExit             = TRUE;\r
+              break;\r
+\r
+            case EFI_BROWSER_ACTION_REQUEST_EXIT:\r
+              DiscardFormIsRequired = TRUE;\r
+              NeedExit              = TRUE;\r
+              break;\r
+\r
+            case EFI_BROWSER_ACTION_REQUEST_FORM_SUBMIT_EXIT:\r
+              SubmitFormIsRequired = TRUE;\r
+              SettingLevel         = FormLevel;\r
+              NeedExit             = TRUE;\r
+              break;\r
+\r
+            case EFI_BROWSER_ACTION_REQUEST_FORM_DISCARD_EXIT:\r
+              DiscardFormIsRequired = TRUE;\r
+              SettingLevel          = FormLevel;\r
+              NeedExit              = TRUE;\r
+              break;\r
+\r
+            case EFI_BROWSER_ACTION_REQUEST_FORM_APPLY:\r
+              SubmitFormIsRequired = TRUE;\r
+              SettingLevel         = FormLevel;\r
+              break;\r
+\r
+            case EFI_BROWSER_ACTION_REQUEST_FORM_DISCARD:\r
+              DiscardFormIsRequired = TRUE;\r
+              SettingLevel          = FormLevel;\r
+              break;\r
+\r
+            case EFI_BROWSER_ACTION_REQUEST_RECONNECT:\r
+              gCallbackReconnect = TRUE;\r
+              break;\r
+\r
+            default:\r
+              break;\r
+          }\r
 \r
-        case EFI_BROWSER_ACTION_REQUEST_FORM_DISCARD:\r
-          DiscardFormIsRequired = TRUE;\r
-          SettingLevel          = FormLevel;\r
           break;\r
 \r
-        case EFI_BROWSER_ACTION_REQUEST_RECONNECT:\r
-          gCallbackReconnect    = TRUE;\r
-          break;\r
+        case EFI_BROWSER_ACTION_CHANGING:\r
+          //\r
+          // Do the question validation.\r
+          //\r
+          Status = ValueChangedValidation (gCurrentSelection->FormSet, gCurrentSelection->Form, Statement);\r
+          if (!EFI_ERROR (Status)) {\r
+            //\r
+            // check whether the question value  changed compared with edit buffer before updating edit buffer\r
+            // if changed, set the ValueChanged flag to TRUE,in order to trig the CHANGED callback function\r
+            //\r
+            IsQuestionValueChanged (gCurrentSelection->FormSet, gCurrentSelection->Form, Statement, GetSetValueWithEditBuffer);\r
+            //\r
+            // According the spec, return value from call back of "changing" and\r
+            // "retrieve" should update to the question's temp buffer.\r
+            //\r
+            SetQuestionValue (FormSet, Form, Statement, GetSetValueWithEditBuffer);\r
+          }\r
 \r
-        default:\r
           break;\r
-        }\r
-        break;\r
 \r
-      case EFI_BROWSER_ACTION_CHANGING:\r
-        //\r
-        // Do the question validation.\r
-        //\r
-        Status = ValueChangedValidation (gCurrentSelection->FormSet, gCurrentSelection->Form, Statement);\r
-        if (!EFI_ERROR (Status)) {\r
-          //\r
-          //check whether the question value  changed compared with edit buffer before updating edit buffer\r
-          // if changed, set the ValueChanged flag to TRUE,in order to trig the CHANGED callback function\r
-          //\r
-          IsQuestionValueChanged(gCurrentSelection->FormSet, gCurrentSelection->Form, Statement, GetSetValueWithEditBuffer);\r
+        case EFI_BROWSER_ACTION_RETRIEVE:\r
           //\r
           // According the spec, return value from call back of "changing" and\r
           // "retrieve" should update to the question's temp buffer.\r
           //\r
-          SetQuestionValue(FormSet, Form, Statement, GetSetValueWithEditBuffer);\r
-        }\r
-        break;\r
-\r
-      case EFI_BROWSER_ACTION_RETRIEVE:\r
-        //\r
-        // According the spec, return value from call back of "changing" and\r
-        // "retrieve" should update to the question's temp buffer.\r
-        //\r
-        SetQuestionValue(FormSet, Form, Statement, GetSetValueWithEditBuffer);\r
-        break;\r
+          SetQuestionValue (FormSet, Form, Statement, GetSetValueWithEditBuffer);\r
+          break;\r
 \r
-      default:\r
-        break;\r
+        default:\r
+          break;\r
       }\r
     } else {\r
       //\r
@@ -2158,7 +2190,7 @@ ProcessCallBackFunction (
       // then the browser will use the value passed to Callback() and ignore the\r
       // value returned by Callback().\r
       //\r
-      if (Action  == EFI_BROWSER_ACTION_CHANGING && Status == EFI_UNSUPPORTED) {\r
+      if ((Action  == EFI_BROWSER_ACTION_CHANGING) && (Status == EFI_UNSUPPORTED)) {\r
         if (HiiValue->Type == EFI_IFR_TYPE_BUFFER) {\r
           CopyMem (Statement->BufferValue, BackUpBuffer, Statement->StorageWidth);\r
         } else {\r
@@ -2171,11 +2203,11 @@ ProcessCallBackFunction (
         InternalStatus = ValueChangedValidation (gCurrentSelection->FormSet, gCurrentSelection->Form, Statement);\r
         if (!EFI_ERROR (InternalStatus)) {\r
           //\r
-          //check whether the question value  changed compared with edit buffer before updating edit buffer\r
+          // check whether the question value  changed compared with edit buffer before updating edit buffer\r
           // if changed, set the ValueChanged flag to TRUE,in order to trig the CHANGED callback function\r
           //\r
-          IsQuestionValueChanged(gCurrentSelection->FormSet, gCurrentSelection->Form, Statement, GetSetValueWithEditBuffer);\r
-          SetQuestionValue(FormSet, Form, Statement, GetSetValueWithEditBuffer);\r
+          IsQuestionValueChanged (gCurrentSelection->FormSet, gCurrentSelection->Form, Statement, GetSetValueWithEditBuffer);\r
+          SetQuestionValue (FormSet, Form, Statement, GetSetValueWithEditBuffer);\r
         }\r
       }\r
 \r
@@ -2183,16 +2215,16 @@ ProcessCallBackFunction (
       // According the spec, return fail from call back of "changing" and\r
       // "retrieve", should restore the question's value.\r
       //\r
-      if (Action == EFI_BROWSER_ACTION_CHANGING && Status != EFI_UNSUPPORTED) {\r
+      if ((Action == EFI_BROWSER_ACTION_CHANGING) && (Status != EFI_UNSUPPORTED)) {\r
         if (Statement->Storage != NULL) {\r
-          GetQuestionValue(FormSet, Form, Statement, GetSetValueWithEditBuffer);\r
+          GetQuestionValue (FormSet, Form, Statement, GetSetValueWithEditBuffer);\r
         } else if ((Statement->QuestionFlags & EFI_IFR_FLAG_CALLBACK) != 0) {\r
           ProcessCallBackFunction (Selection, FormSet, Form, Question, EFI_BROWSER_ACTION_RETRIEVE, FALSE);\r
         }\r
       }\r
 \r
       if (Action == EFI_BROWSER_ACTION_RETRIEVE) {\r
-        GetQuestionValue(FormSet, Form, Statement, GetSetValueWithEditBuffer);\r
+        GetQuestionValue (FormSet, Form, Statement, GetSetValueWithEditBuffer);\r
       }\r
 \r
       if (Status == EFI_UNSUPPORTED) {\r
@@ -2221,21 +2253,21 @@ ProcessCallBackFunction (
     //\r
     // Confirm changes with user first.\r
     //\r
-    if (IsNvUpdateRequiredForFormSet(FormSet)) {\r
-      if (BROWSER_ACTION_DISCARD == PopupErrorMessage(BROWSER_RECONNECT_SAVE_CHANGES, NULL, NULL, NULL)) {\r
-        gCallbackReconnect = FALSE;\r
+    if (IsNvUpdateRequiredForFormSet (FormSet)) {\r
+      if (BROWSER_ACTION_DISCARD == PopupErrorMessage (BROWSER_RECONNECT_SAVE_CHANGES, NULL, NULL, NULL)) {\r
+        gCallbackReconnect    = FALSE;\r
         DiscardFormIsRequired = TRUE;\r
       } else {\r
         SubmitFormIsRequired = TRUE;\r
       }\r
     } else {\r
-      PopupErrorMessage(BROWSER_RECONNECT_REQUIRED, NULL, NULL, NULL);\r
+      PopupErrorMessage (BROWSER_RECONNECT_REQUIRED, NULL, NULL, NULL);\r
     }\r
 \r
     //\r
     // Exit current formset before do the reconnect.\r
     //\r
-    NeedExit = TRUE;\r
+    NeedExit     = TRUE;\r
     SettingLevel = FormSetLevel;\r
   }\r
 \r
@@ -2274,16 +2306,16 @@ ProcessRetrieveForQuestion (
   IN     FORM_BROWSER_FORMSET            *FormSet\r
   )\r
 {\r
-  EFI_STATUS                      Status;\r
-  EFI_BROWSER_ACTION_REQUEST      ActionRequest;\r
-  EFI_HII_VALUE                   *HiiValue;\r
-  EFI_IFR_TYPE_VALUE              *TypeValue;\r
-  CHAR16                          *NewString;\r
+  EFI_STATUS                  Status;\r
+  EFI_BROWSER_ACTION_REQUEST  ActionRequest;\r
+  EFI_HII_VALUE               *HiiValue;\r
+  EFI_IFR_TYPE_VALUE          *TypeValue;\r
+  CHAR16                      *NewString;\r
 \r
-  Status                = EFI_SUCCESS;\r
-  ActionRequest         = EFI_BROWSER_ACTION_REQUEST_NONE;\r
+  Status        = EFI_SUCCESS;\r
+  ActionRequest = EFI_BROWSER_ACTION_REQUEST_NONE;\r
 \r
-  if (((Statement->QuestionFlags & EFI_IFR_FLAG_CALLBACK) != EFI_IFR_FLAG_CALLBACK) || ConfigAccess == NULL) {\r
+  if (((Statement->QuestionFlags & EFI_IFR_FLAG_CALLBACK) != EFI_IFR_FLAG_CALLBACK) || (ConfigAccess == NULL)) {\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r
@@ -2293,19 +2325,19 @@ ProcessRetrieveForQuestion (
     //\r
     // For OrderedList, passing in the value buffer to Callback()\r
     //\r
-    TypeValue = (EFI_IFR_TYPE_VALUE *) Statement->BufferValue;\r
+    TypeValue = (EFI_IFR_TYPE_VALUE *)Statement->BufferValue;\r
   }\r
 \r
   ActionRequest = EFI_BROWSER_ACTION_REQUEST_NONE;\r
-  Status = ConfigAccess->Callback (\r
-                           ConfigAccess,\r
-                           EFI_BROWSER_ACTION_RETRIEVE,\r
-                           Statement->QuestionId,\r
-                           HiiValue->Type,\r
-                           TypeValue,\r
-                           &ActionRequest\r
-                           );\r
-  if (!EFI_ERROR (Status) && HiiValue->Type == EFI_IFR_TYPE_STRING) {\r
+  Status        = ConfigAccess->Callback (\r
+                                  ConfigAccess,\r
+                                  EFI_BROWSER_ACTION_RETRIEVE,\r
+                                  Statement->QuestionId,\r
+                                  HiiValue->Type,\r
+                                  TypeValue,\r
+                                  &ActionRequest\r
+                                  );\r
+  if (!EFI_ERROR (Status) && (HiiValue->Type == EFI_IFR_TYPE_STRING)) {\r
     NewString = GetToken (Statement->HiiValue.Value.string, FormSet->HiiHandle);\r
     ASSERT (NewString != NULL);\r
 \r
@@ -2316,6 +2348,7 @@ ProcessRetrieveForQuestion (
     } else {\r
       CopyMem (Statement->BufferValue, NewString, Statement->StorageWidth);\r
     }\r
+\r
     FreePool (NewString);\r
   }\r
 \r
@@ -2337,7 +2370,7 @@ ProcessRetrieveForQuestion (
 **/\r
 EFI_STATUS\r
 SetupBrowser (\r
-  IN OUT UI_MENU_SELECTION    *Selection\r
+  IN OUT UI_MENU_SELECTION  *Selection\r
   )\r
 {\r
   EFI_STATUS                      Status;\r
@@ -2379,7 +2412,6 @@ SetupBrowser (
   mCurFakeQestId = 0;\r
 \r
   do {\r
-\r
     //\r
     // Reset Status to prevent the next break from returning incorrect error status.\r
     //\r
@@ -2391,7 +2423,7 @@ SetupBrowser (
     // EFI_BROWSER_ACTION_RETRIEVE, so code place here.\r
     //\r
     if (mHiiPackageListUpdated) {\r
-      Selection->Action = UI_ACTION_REFRESH_FORMSET;\r
+      Selection->Action      = UI_ACTION_REFRESH_FORMSET;\r
       mHiiPackageListUpdated = FALSE;\r
       break;\r
     }\r
@@ -2405,7 +2437,7 @@ SetupBrowser (
       //\r
       Link = GetFirstNode (&Selection->FormSet->FormListHead);\r
 \r
-      Selection->Form = FORM_BROWSER_FORM_FROM_LINK (Link);\r
+      Selection->Form   = FORM_BROWSER_FORM_FROM_LINK (Link);\r
       Selection->FormId = Selection->Form->FormId;\r
     } else {\r
       Selection->Form = IdToForm (Selection->FormSet, Selection->FormId);\r
@@ -2423,11 +2455,11 @@ SetupBrowser (
     // Check Form is suppressed.\r
     //\r
     if (Selection->Form->SuppressExpression != NULL) {\r
-      if (EvaluateExpressionList(Selection->Form->SuppressExpression, TRUE, Selection->FormSet, Selection->Form) == ExpressSuppress) {\r
+      if (EvaluateExpressionList (Selection->Form->SuppressExpression, TRUE, Selection->FormSet, Selection->Form) == ExpressSuppress) {\r
         //\r
         // Form is suppressed.\r
         //\r
-        PopupErrorMessage(BROWSER_FORM_SUPPRESS, NULL, NULL, NULL);\r
+        PopupErrorMessage (BROWSER_FORM_SUPPRESS, NULL, NULL, NULL);\r
         Status = EFI_NOT_FOUND;\r
         goto Done;\r
       }\r
@@ -2439,8 +2471,9 @@ SetupBrowser (
     // New form may be the first form, or the different form after another form close.\r
     //\r
     if (((Selection->Handle != mCurrentHiiHandle) ||\r
-        (!CompareGuid (&Selection->FormSetGuid, &mCurrentFormSetGuid)) ||\r
-        (Selection->FormId != mCurrentFormId))) {\r
+         (!CompareGuid (&Selection->FormSetGuid, &mCurrentFormSetGuid)) ||\r
+         (Selection->FormId != mCurrentFormId)))\r
+    {\r
       //\r
       // Update Retrieve flag.\r
       //\r
@@ -2449,9 +2482,9 @@ SetupBrowser (
       //\r
       // Keep current form information\r
       //\r
-      mCurrentHiiHandle   = Selection->Handle;\r
+      mCurrentHiiHandle = Selection->Handle;\r
       CopyGuid (&mCurrentFormSetGuid, &Selection->FormSetGuid);\r
-      mCurrentFormId      = Selection->FormId;\r
+      mCurrentFormId = Selection->FormId;\r
 \r
       if (ConfigAccess != NULL) {\r
         Status = ProcessCallBackFunction (Selection, Selection->FormSet, Selection->Form, NULL, EFI_BROWSER_ACTION_FORM_OPEN, FALSE);\r
@@ -2463,7 +2496,7 @@ SetupBrowser (
         // IFR is updated during callback of EFI_BROWSER_ACTION_FORM_OPEN, force to reparse the IFR binary\r
         //\r
         if (mHiiPackageListUpdated) {\r
-          Selection->Action = UI_ACTION_REFRESH_FORMSET;\r
+          Selection->Action      = UI_ACTION_REFRESH_FORMSET;\r
           mHiiPackageListUpdated = FALSE;\r
           break;\r
         }\r
@@ -2494,7 +2527,7 @@ SetupBrowser (
         // IFR is updated during callback of open form, force to reparse the IFR binary\r
         //\r
         if (mHiiPackageListUpdated) {\r
-          Selection->Action = UI_ACTION_REFRESH_FORMSET;\r
+          Selection->Action      = UI_ACTION_REFRESH_FORMSET;\r
           mHiiPackageListUpdated = FALSE;\r
           break;\r
         }\r
@@ -2516,14 +2549,15 @@ SetupBrowser (
     if (Statement != NULL) {\r
       if ((ConfigAccess != NULL) &&\r
           ((Statement->QuestionFlags & EFI_IFR_FLAG_CALLBACK) == EFI_IFR_FLAG_CALLBACK) &&\r
-          (Statement->Operand != EFI_IFR_PASSWORD_OP)) {\r
-        Status = ProcessCallBackFunction(Selection, Selection->FormSet, Selection->Form, Statement, EFI_BROWSER_ACTION_CHANGING, FALSE);\r
+          (Statement->Operand != EFI_IFR_PASSWORD_OP))\r
+      {\r
+        Status = ProcessCallBackFunction (Selection, Selection->FormSet, Selection->Form, Statement, EFI_BROWSER_ACTION_CHANGING, FALSE);\r
         if (Statement->Operand == EFI_IFR_REF_OP) {\r
           //\r
           // Process dynamic update ref opcode.\r
           //\r
           if (!EFI_ERROR (Status)) {\r
-            Status = ProcessGotoOpCode(Statement, Selection);\r
+            Status = ProcessGotoOpCode (Statement, Selection);\r
           }\r
 \r
           //\r
@@ -2535,25 +2569,25 @@ SetupBrowser (
             //\r
             Selection->Handle = mCurrentHiiHandle;\r
             CopyMem (&Selection->FormSetGuid, &mCurrentFormSetGuid, sizeof (EFI_GUID));\r
-            Selection->FormId = mCurrentFormId;\r
+            Selection->FormId     = mCurrentFormId;\r
             Selection->QuestionId = 0;\r
-            Selection->Action = UI_ACTION_REFRESH_FORM;\r
+            Selection->Action     = UI_ACTION_REFRESH_FORM;\r
           }\r
         }\r
 \r
-\r
         if (!EFI_ERROR (Status) &&\r
             (Statement->Operand != EFI_IFR_REF_OP) &&\r
-            ((Statement->Storage == NULL) || (Statement->Storage != NULL && Statement->ValueChanged))) {\r
+            ((Statement->Storage == NULL) || ((Statement->Storage != NULL) && Statement->ValueChanged)))\r
+        {\r
           //\r
           // Only question value has been changed, browser will trig CHANGED callback.\r
           //\r
-          ProcessCallBackFunction(Selection, Selection->FormSet, Selection->Form, Statement, EFI_BROWSER_ACTION_CHANGED, FALSE);\r
+          ProcessCallBackFunction (Selection, Selection->FormSet, Selection->Form, Statement, EFI_BROWSER_ACTION_CHANGED, FALSE);\r
           //\r
-          //check whether the question value changed compared with buffer value\r
-          //if doesn't change ,set the ValueChanged flag to FALSE ,in order not to display the "configuration changed "information on the screen\r
+          // check whether the question value changed compared with buffer value\r
+          // if doesn't change ,set the ValueChanged flag to FALSE ,in order not to display the "configuration changed "information on the screen\r
           //\r
-          IsQuestionValueChanged(gCurrentSelection->FormSet, gCurrentSelection->Form, Statement, GetSetValueWithBuffer);\r
+          IsQuestionValueChanged (gCurrentSelection->FormSet, gCurrentSelection->Form, Statement, GetSetValueWithBuffer);\r
         }\r
       } else {\r
         //\r
@@ -2565,7 +2599,7 @@ SetupBrowser (
           //\r
           // Verify whether question value has checked, update the ValueChanged flag in Question.\r
           //\r
-          IsQuestionValueChanged(gCurrentSelection->FormSet, gCurrentSelection->Form, Statement, GetSetValueWithBuffer);\r
+          IsQuestionValueChanged (gCurrentSelection->FormSet, gCurrentSelection->Form, Statement, GetSetValueWithBuffer);\r
         }\r
       }\r
 \r
@@ -2574,9 +2608,10 @@ SetupBrowser (
       // and process question success till here, trig the gResetFlag/gFlagReconnect.\r
       //\r
       if ((Status == EFI_SUCCESS) &&\r
-          (Statement->Storage == NULL)) {\r
+          (Statement->Storage == NULL))\r
+      {\r
         if ((Statement->QuestionFlags & EFI_IFR_FLAG_RESET_REQUIRED) != 0) {\r
-          gResetRequiredFormLevel = TRUE;\r
+          gResetRequiredFormLevel   = TRUE;\r
           gResetRequiredSystemLevel = TRUE;\r
         }\r
 \r
@@ -2591,17 +2626,17 @@ SetupBrowser (
     //\r
     if (gExitRequired) {\r
       switch (gBrowserSettingScope) {\r
-      case SystemLevel:\r
-        Selection->Action = UI_ACTION_EXIT;\r
-        break;\r
+        case SystemLevel:\r
+          Selection->Action = UI_ACTION_EXIT;\r
+          break;\r
 \r
-      case FormSetLevel:\r
-      case FormLevel:\r
-        FindNextMenu (Selection, gBrowserSettingScope);\r
-        break;\r
+        case FormSetLevel:\r
+        case FormLevel:\r
+          FindNextMenu (Selection, gBrowserSettingScope);\r
+          break;\r
 \r
-      default:\r
-        break;\r
+        default:\r
+          break;\r
       }\r
 \r
       gExitRequired = FALSE;\r
@@ -2615,8 +2650,8 @@ SetupBrowser (
         ((Selection->Action == UI_ACTION_EXIT) ||\r
          (Selection->Handle != mCurrentHiiHandle) ||\r
          (!CompareGuid (&Selection->FormSetGuid, &mCurrentFormSetGuid)) ||\r
-         (Selection->FormId != mCurrentFormId))) {\r
-\r
+         (Selection->FormId != mCurrentFormId)))\r
+    {\r
       Status = ProcessCallBackFunction (Selection, Selection->FormSet, Selection->Form, NULL, EFI_BROWSER_ACTION_FORM_CLOSE, FALSE);\r
       if (EFI_ERROR (Status)) {\r
         goto Done;\r
@@ -2628,7 +2663,7 @@ Done:
   //\r
   // Reset current form information to the initial setting when error happens or form exit.\r
   //\r
-  if (EFI_ERROR (Status) || Selection->Action == UI_ACTION_EXIT) {\r
+  if (EFI_ERROR (Status) || (Selection->Action == UI_ACTION_EXIT)) {\r
     mCurrentHiiHandle = NULL;\r
     CopyGuid (&mCurrentFormSetGuid, &gZeroGuid);\r
     mCurrentFormId = 0;\r
@@ -2638,8 +2673,8 @@ Done:
   // Unregister notify for Form package update\r
   //\r
   mHiiDatabase->UnregisterPackageNotify (\r
-                   mHiiDatabase,\r
-                   NotifyHandle\r
-                   );\r
+                  mHiiDatabase,\r
+                  NotifyHandle\r
+                  );\r
   return Status;\r
 }\r