]> git.proxmox.com Git - mirror_edk2.git/blobdiff - MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenance.c
MdeModulePkg: Apply uncrustify changes
[mirror_edk2.git] / MdeModulePkg / Library / BootMaintenanceManagerUiLib / BootMaintenance.c
index 28592f9f47bd429ecb4736e9a3df8c5559593266..19751642a30cc4817d113a91b779e7846f385f36 100644 (file)
@@ -8,23 +8,23 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 #include "BootMaintenanceManager.h"\r
 \r
-#define FRONT_PAGE_KEY_OFFSET          0x4000\r
+#define FRONT_PAGE_KEY_OFFSET  0x4000\r
 //\r
 // Boot video resolution and text mode.\r
 //\r
-UINT32    mBmmBootHorizontalResolution    = 0;\r
-UINT32    mBmmBootVerticalResolution      = 0;\r
-UINT32    mBmmBootTextModeColumn          = 0;\r
-UINT32    mBmmBootTextModeRow             = 0;\r
+UINT32  mBmmBootHorizontalResolution = 0;\r
+UINT32  mBmmBootVerticalResolution   = 0;\r
+UINT32  mBmmBootTextModeColumn       = 0;\r
+UINT32  mBmmBootTextModeRow          = 0;\r
 //\r
 // BIOS setup video resolution and text mode.\r
 //\r
-UINT32    mBmmSetupTextModeColumn         = 0;\r
-UINT32    mBmmSetupTextModeRow            = 0;\r
-UINT32    mBmmSetupHorizontalResolution   = 0;\r
-UINT32    mBmmSetupVerticalResolution     = 0;\r
+UINT32  mBmmSetupTextModeColumn       = 0;\r
+UINT32  mBmmSetupTextModeRow          = 0;\r
+UINT32  mBmmSetupHorizontalResolution = 0;\r
+UINT32  mBmmSetupVerticalResolution   = 0;\r
 \r
-BOOLEAN   mBmmModeInitialized             = FALSE;\r
+BOOLEAN  mBmmModeInitialized = FALSE;\r
 \r
 EFI_DEVICE_PATH_PROTOCOL  EndDevicePath[] = {\r
   {\r
@@ -43,28 +43,29 @@ HII_VENDOR_DEVICE_PATH  mBmmHiiVendorDevicePath = {
       HARDWARE_DEVICE_PATH,\r
       HW_VENDOR_DP,\r
       {\r
-        (UINT8) (sizeof (VENDOR_DEVICE_PATH)),\r
-        (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
+        (UINT8)(sizeof (VENDOR_DEVICE_PATH)),\r
+        (UINT8)((sizeof (VENDOR_DEVICE_PATH)) >> 8)\r
       }\r
     },\r
     //\r
     // {165A028F-0BB2-4b5f-8747-77592E3F6499}\r
     //\r
-    { 0x165a028f, 0xbb2, 0x4b5f, { 0x87, 0x47, 0x77, 0x59, 0x2e, 0x3f, 0x64, 0x99 } }\r
+    { 0x165a028f, 0xbb2, 0x4b5f, { 0x87, 0x47, 0x77, 0x59, 0x2e, 0x3f, 0x64, 0x99 }\r
+    }\r
   },\r
   {\r
     END_DEVICE_PATH_TYPE,\r
     END_ENTIRE_DEVICE_PATH_SUBTYPE,\r
     {\r
-      (UINT8) (END_DEVICE_PATH_LENGTH),\r
-      (UINT8) ((END_DEVICE_PATH_LENGTH) >> 8)\r
+      (UINT8)(END_DEVICE_PATH_LENGTH),\r
+      (UINT8)((END_DEVICE_PATH_LENGTH) >> 8)\r
     }\r
   }\r
 };\r
 \r
-EFI_GUID mBootMaintGuid          = BOOT_MAINT_FORMSET_GUID;\r
+EFI_GUID  mBootMaintGuid = BOOT_MAINT_FORMSET_GUID;\r
 \r
-CHAR16  mBootMaintStorageName[]     = L"BmmData";\r
+CHAR16             mBootMaintStorageName[] = L"BmmData";\r
 BMM_CALLBACK_DATA  gBootMaintenancePrivate = {\r
   BMM_CALLBACK_DATA_SIGNATURE,\r
   NULL,\r
@@ -76,9 +77,9 @@ BMM_CALLBACK_DATA  gBootMaintenancePrivate = {
   }\r
 };\r
 \r
-BMM_CALLBACK_DATA *mBmmCallbackInfo = &gBootMaintenancePrivate;\r
-BOOLEAN  mAllMenuInit               = FALSE;\r
-BOOLEAN  mFirstEnterBMMForm         = FALSE;\r
+BMM_CALLBACK_DATA  *mBmmCallbackInfo  = &gBootMaintenancePrivate;\r
+BOOLEAN            mAllMenuInit       = FALSE;\r
+BOOLEAN            mFirstEnterBMMForm = FALSE;\r
 \r
 /**\r
   Init all memu.\r
@@ -88,7 +89,7 @@ BOOLEAN  mFirstEnterBMMForm         = FALSE;
 **/\r
 VOID\r
 InitAllMenu (\r
-  IN  BMM_CALLBACK_DATA    *CallbackData\r
+  IN  BMM_CALLBACK_DATA  *CallbackData\r
   );\r
 \r
 /**\r
@@ -152,7 +153,7 @@ BmmSetConsoleMode (
   Status = gBS->HandleProtocol (\r
                   gST->ConsoleOutHandle,\r
                   &gEfiGraphicsOutputProtocolGuid,\r
-                  (VOID**)&GraphicsOutput\r
+                  (VOID **)&GraphicsOutput\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     GraphicsOutput = NULL;\r
@@ -161,7 +162,7 @@ BmmSetConsoleMode (
   Status = gBS->HandleProtocol (\r
                   gST->ConsoleOutHandle,\r
                   &gEfiSimpleTextOutProtocolGuid,\r
-                  (VOID**)&SimpleTextOut\r
+                  (VOID **)&SimpleTextOut\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     SimpleTextOut = NULL;\r
@@ -190,7 +191,7 @@ BmmSetConsoleMode (
   }\r
 \r
   if (GraphicsOutput != NULL) {\r
-    MaxGopMode  = GraphicsOutput->Mode->MaxMode;\r
+    MaxGopMode = GraphicsOutput->Mode->MaxMode;\r
   }\r
 \r
   if (SimpleTextOut != NULL) {\r
@@ -206,22 +207,24 @@ BmmSetConsoleMode (
   //\r
   for (ModeNumber = 0; ModeNumber < MaxGopMode; ModeNumber++) {\r
     Status = GraphicsOutput->QueryMode (\r
-                       GraphicsOutput,\r
-                       ModeNumber,\r
-                       &SizeOfInfo,\r
-                       &Info\r
-                       );\r
+                               GraphicsOutput,\r
+                               ModeNumber,\r
+                               &SizeOfInfo,\r
+                               &Info\r
+                               );\r
     if (!EFI_ERROR (Status)) {\r
       if ((Info->HorizontalResolution == NewHorizontalResolution) &&\r
-          (Info->VerticalResolution == NewVerticalResolution)) {\r
+          (Info->VerticalResolution == NewVerticalResolution))\r
+      {\r
         if ((GraphicsOutput->Mode->Info->HorizontalResolution == NewHorizontalResolution) &&\r
-            (GraphicsOutput->Mode->Info->VerticalResolution == NewVerticalResolution)) {\r
+            (GraphicsOutput->Mode->Info->VerticalResolution == NewVerticalResolution))\r
+        {\r
           //\r
           // Current resolution is same with required resolution, check if text mode need be set\r
           //\r
           Status = SimpleTextOut->QueryMode (SimpleTextOut, SimpleTextOut->Mode->Mode, &CurrentColumn, &CurrentRow);\r
           ASSERT_EFI_ERROR (Status);\r
-          if (CurrentColumn == NewColumns && CurrentRow == NewRows) {\r
+          if ((CurrentColumn == NewColumns) && (CurrentRow == NewRows)) {\r
             //\r
             // If current text mode is same with required text mode. Do nothing\r
             //\r
@@ -233,7 +236,7 @@ BmmSetConsoleMode (
             //\r
             for (Index = 0; Index < MaxTextMode; Index++) {\r
               Status = SimpleTextOut->QueryMode (SimpleTextOut, Index, &CurrentColumn, &CurrentRow);\r
-              if (!EFI_ERROR(Status)) {\r
+              if (!EFI_ERROR (Status)) {\r
                 if ((CurrentColumn == NewColumns) && (CurrentRow == NewRows)) {\r
                   //\r
                   // Required text mode is supported, set it.\r
@@ -252,6 +255,7 @@ BmmSetConsoleMode (
                 }\r
               }\r
             }\r
+\r
             if (Index == MaxTextMode) {\r
               //\r
               // If required text mode is not supported, return error.\r
@@ -272,6 +276,7 @@ BmmSetConsoleMode (
           }\r
         }\r
       }\r
+\r
       FreePool (Info);\r
     }\r
   }\r
@@ -302,19 +307,21 @@ BmmSetConsoleMode (
   // Locate all the handles with GOP protocol and reconnect it.\r
   //\r
   Status = gBS->LocateHandleBuffer (\r
-                   ByProtocol,\r
-                   &gEfiSimpleTextOutProtocolGuid,\r
-                   NULL,\r
-                   &HandleCount,\r
-                   &HandleBuffer\r
-                   );\r
+                  ByProtocol,\r
+                  &gEfiSimpleTextOutProtocolGuid,\r
+                  NULL,\r
+                  &HandleCount,\r
+                  &HandleBuffer\r
+                  );\r
   if (!EFI_ERROR (Status)) {\r
     for (Index = 0; Index < HandleCount; Index++) {\r
       gBS->DisconnectController (HandleBuffer[Index], NULL, NULL);\r
     }\r
+\r
     for (Index = 0; Index < HandleCount; Index++) {\r
       gBS->ConnectController (HandleBuffer[Index], NULL, NULL, TRUE);\r
     }\r
+\r
     if (HandleBuffer != NULL) {\r
       FreePool (HandleBuffer);\r
     }\r
@@ -333,12 +340,12 @@ BmmSetConsoleMode (
 **/\r
 CHAR16 *\r
 UiDevicePathToStr (\r
-  IN EFI_DEVICE_PATH_PROTOCOL     *DevPath\r
+  IN EFI_DEVICE_PATH_PROTOCOL  *DevPath\r
   )\r
 {\r
-  EFI_STATUS                       Status;\r
-  CHAR16                           *ToText;\r
-  EFI_DEVICE_PATH_TO_TEXT_PROTOCOL *DevPathToText;\r
+  EFI_STATUS                        Status;\r
+  CHAR16                            *ToText;\r
+  EFI_DEVICE_PATH_TO_TEXT_PROTOCOL  *DevPathToText;\r
 \r
   if (DevPath == NULL) {\r
     return NULL;\r
@@ -347,7 +354,7 @@ UiDevicePathToStr (
   Status = gBS->LocateProtocol (\r
                   &gEfiDevicePathToTextProtocolGuid,\r
                   NULL,\r
-                  (VOID **) &DevPathToText\r
+                  (VOID **)&DevPathToText\r
                   );\r
   ASSERT_EFI_ERROR (Status);\r
   ToText = DevPathToText->ConvertDevicePathToText (\r
@@ -370,34 +377,34 @@ UiDevicePathToStr (
 **/\r
 CHAR16 *\r
 ExtractFileNameFromDevicePath (\r
-  IN   EFI_DEVICE_PATH_PROTOCOL *DevicePath\r
+  IN   EFI_DEVICE_PATH_PROTOCOL  *DevicePath\r
   )\r
 {\r
-  CHAR16          *String;\r
-  CHAR16          *MatchString;\r
-  CHAR16          *LastMatch;\r
-  CHAR16          *FileName;\r
-  UINTN           Length;\r
+  CHAR16  *String;\r
+  CHAR16  *MatchString;\r
+  CHAR16  *LastMatch;\r
+  CHAR16  *FileName;\r
+  UINTN   Length;\r
 \r
-  ASSERT(DevicePath != NULL);\r
+  ASSERT (DevicePath != NULL);\r
 \r
-  String = UiDevicePathToStr(DevicePath);\r
+  String      = UiDevicePathToStr (DevicePath);\r
   MatchString = String;\r
   LastMatch   = String;\r
   FileName    = NULL;\r
 \r
-  while(MatchString != NULL){\r
+  while (MatchString != NULL) {\r
     LastMatch   = MatchString + 1;\r
-    MatchString = StrStr(LastMatch,L"\\");\r
+    MatchString = StrStr (LastMatch, L"\\");\r
   }\r
 \r
-  Length = StrLen(LastMatch);\r
-  FileName = AllocateCopyPool ((Length + 1) * sizeof(CHAR16), LastMatch);\r
+  Length   = StrLen (LastMatch);\r
+  FileName = AllocateCopyPool ((Length + 1) * sizeof (CHAR16), LastMatch);\r
   if (FileName != NULL) {\r
     *(FileName + Length) = 0;\r
   }\r
 \r
-  FreePool(String);\r
+  FreePool (String);\r
 \r
   return FileName;\r
 }\r
@@ -413,11 +420,11 @@ ExtractFileNameFromDevicePath (
 **/\r
 CHAR16 *\r
 BmmExtractDevicePathFromHiiHandle (\r
-  IN      EFI_HII_HANDLE      Handle\r
+  IN      EFI_HII_HANDLE  Handle\r
   )\r
 {\r
-  EFI_STATUS                       Status;\r
-  EFI_HANDLE                       DriverHandle;\r
+  EFI_STATUS  Status;\r
+  EFI_HANDLE  DriverHandle;\r
 \r
   ASSERT (Handle != NULL);\r
 \r
@@ -433,8 +440,7 @@ BmmExtractDevicePathFromHiiHandle (
   //\r
   // Get device path string.\r
   //\r
-  return ConvertDevicePathToText(DevicePathFromHandle (DriverHandle), FALSE, FALSE);\r
-\r
+  return ConvertDevicePathToText (DevicePathFromHandle (DriverHandle), FALSE, FALSE);\r
 }\r
 \r
 /**\r
@@ -462,8 +468,8 @@ HiiToLower (
       Lower = TRUE;\r
     } else if (*String == L'&') {\r
       Lower = FALSE;\r
-    } else if (Lower && *String >= L'A' && *String <= L'F') {\r
-      *String = (CHAR16) (*String - L'A' + L'a');\r
+    } else if (Lower && (*String >= L'A') && (*String <= L'F')) {\r
+      *String = (CHAR16)(*String - L'A' + L'a');\r
     }\r
   }\r
 }\r
@@ -476,10 +482,10 @@ HiiToLower (
 \r
 **/\r
 EFI_STRING\r
-UpdateProgress(\r
+UpdateProgress (\r
   IN  UINTN       Offset,\r
   IN  EFI_STRING  Configuration\r
-)\r
+  )\r
 {\r
   UINTN       Length;\r
   EFI_STRING  StringPtr;\r
@@ -492,12 +498,12 @@ UpdateProgress(
   // &OFFSET=XXXX followed by a Null-terminator.\r
   // Length = StrLen (L"&OFFSET=") + 4 + 1\r
   //\r
-  Length    = StrLen (L"&OFFSET=") + 4 + 1;\r
+  Length = StrLen (L"&OFFSET=") + 4 + 1;\r
 \r
   StringPtr = AllocateZeroPool (Length * sizeof (CHAR16));\r
 \r
   if (StringPtr == NULL) {\r
-    return  NULL;\r
+    return NULL;\r
   }\r
 \r
   UnicodeSPrint (\r
@@ -530,31 +536,31 @@ UpdateProgress(
 **/\r
 VOID\r
 UpdateTerminalContent (\r
-  IN BMM_FAKE_NV_DATA       *BmmData\r
+  IN BMM_FAKE_NV_DATA  *BmmData\r
   )\r
 {\r
-  UINT16                          Index;\r
-  BM_TERMINAL_CONTEXT             *NewTerminalContext;\r
-  BM_MENU_ENTRY                   *NewMenuEntry;\r
+  UINT16               Index;\r
+  BM_TERMINAL_CONTEXT  *NewTerminalContext;\r
+  BM_MENU_ENTRY        *NewMenuEntry;\r
 \r
   for (Index = 0; Index < TerminalMenu.MenuNumber; Index++) {\r
     NewMenuEntry = BOpt_GetMenuEntry (&TerminalMenu, Index);\r
     ASSERT (NewMenuEntry != NULL);\r
-    NewTerminalContext = (BM_TERMINAL_CONTEXT *) NewMenuEntry->VariableContext;\r
+    NewTerminalContext                = (BM_TERMINAL_CONTEXT *)NewMenuEntry->VariableContext;\r
     NewTerminalContext->BaudRateIndex = BmmData->COMBaudRate[Index];\r
     ASSERT (BmmData->COMBaudRate[Index] < (ARRAY_SIZE (BaudRateList)));\r
     NewTerminalContext->BaudRate      = BaudRateList[BmmData->COMBaudRate[Index]].Value;\r
     NewTerminalContext->DataBitsIndex = BmmData->COMDataRate[Index];\r
     ASSERT (BmmData->COMDataRate[Index] < (ARRAY_SIZE (DataBitsList)));\r
-    NewTerminalContext->DataBits      = (UINT8) DataBitsList[BmmData->COMDataRate[Index]].Value;\r
+    NewTerminalContext->DataBits      = (UINT8)DataBitsList[BmmData->COMDataRate[Index]].Value;\r
     NewTerminalContext->StopBitsIndex = BmmData->COMStopBits[Index];\r
     ASSERT (BmmData->COMStopBits[Index] < (ARRAY_SIZE (StopBitsList)));\r
-    NewTerminalContext->StopBits      = (UINT8) StopBitsList[BmmData->COMStopBits[Index]].Value;\r
-    NewTerminalContext->ParityIndex   = BmmData->COMParity[Index];\r
+    NewTerminalContext->StopBits    = (UINT8)StopBitsList[BmmData->COMStopBits[Index]].Value;\r
+    NewTerminalContext->ParityIndex = BmmData->COMParity[Index];\r
     ASSERT (BmmData->COMParity[Index] < (ARRAY_SIZE (ParityList)));\r
-    NewTerminalContext->Parity        = (UINT8) ParityList[BmmData->COMParity[Index]].Value;\r
-    NewTerminalContext->TerminalType  = BmmData->COMTerminalType[Index];\r
-    NewTerminalContext->FlowControl   = BmmData->COMFlowControl[Index];\r
+    NewTerminalContext->Parity       = (UINT8)ParityList[BmmData->COMParity[Index]].Value;\r
+    NewTerminalContext->TerminalType = BmmData->COMTerminalType[Index];\r
+    NewTerminalContext->FlowControl  = BmmData->COMFlowControl[Index];\r
     ChangeTerminalDevicePath (\r
       NewTerminalContext->DevicePath,\r
       FALSE\r
@@ -570,55 +576,59 @@ UpdateTerminalContent (
 \r
 **/\r
 VOID\r
-UpdateConsoleContent(\r
-  IN CHAR16                 *ConsoleName,\r
-  IN BMM_FAKE_NV_DATA       *BmmData\r
+UpdateConsoleContent (\r
+  IN CHAR16            *ConsoleName,\r
+  IN BMM_FAKE_NV_DATA  *BmmData\r
   )\r
 {\r
-  UINT16                          Index;\r
-  BM_CONSOLE_CONTEXT              *NewConsoleContext;\r
-  BM_TERMINAL_CONTEXT             *NewTerminalContext;\r
-  BM_MENU_ENTRY                   *NewMenuEntry;\r
+  UINT16               Index;\r
+  BM_CONSOLE_CONTEXT   *NewConsoleContext;\r
+  BM_TERMINAL_CONTEXT  *NewTerminalContext;\r
+  BM_MENU_ENTRY        *NewMenuEntry;\r
 \r
   if (StrCmp (ConsoleName, L"ConIn") == 0) {\r
-    for (Index = 0; Index < ConsoleInpMenu.MenuNumber; Index++){\r
-      NewMenuEntry                = BOpt_GetMenuEntry(&ConsoleInpMenu, Index);\r
-      NewConsoleContext           = (BM_CONSOLE_CONTEXT *)NewMenuEntry->VariableContext;\r
+    for (Index = 0; Index < ConsoleInpMenu.MenuNumber; Index++) {\r
+      NewMenuEntry      = BOpt_GetMenuEntry (&ConsoleInpMenu, Index);\r
+      NewConsoleContext = (BM_CONSOLE_CONTEXT *)NewMenuEntry->VariableContext;\r
       ASSERT (Index < MAX_MENU_NUMBER);\r
       NewConsoleContext->IsActive = BmmData->ConsoleInCheck[Index];\r
     }\r
+\r
     for (Index = 0; Index < TerminalMenu.MenuNumber; Index++) {\r
-      NewMenuEntry                = BOpt_GetMenuEntry (&TerminalMenu, Index);\r
-      NewTerminalContext          = (BM_TERMINAL_CONTEXT *) NewMenuEntry->VariableContext;\r
+      NewMenuEntry       = BOpt_GetMenuEntry (&TerminalMenu, Index);\r
+      NewTerminalContext = (BM_TERMINAL_CONTEXT *)NewMenuEntry->VariableContext;\r
       ASSERT (Index + ConsoleInpMenu.MenuNumber < MAX_MENU_NUMBER);\r
       NewTerminalContext->IsConIn = BmmData->ConsoleInCheck[Index + ConsoleInpMenu.MenuNumber];\r
     }\r
   }\r
 \r
   if (StrCmp (ConsoleName, L"ConOut") == 0) {\r
-    for (Index = 0; Index < ConsoleOutMenu.MenuNumber; Index++){\r
-      NewMenuEntry                = BOpt_GetMenuEntry(&ConsoleOutMenu, Index);\r
-      NewConsoleContext           = (BM_CONSOLE_CONTEXT *)NewMenuEntry->VariableContext;\r
+    for (Index = 0; Index < ConsoleOutMenu.MenuNumber; Index++) {\r
+      NewMenuEntry      = BOpt_GetMenuEntry (&ConsoleOutMenu, Index);\r
+      NewConsoleContext = (BM_CONSOLE_CONTEXT *)NewMenuEntry->VariableContext;\r
       ASSERT (Index < MAX_MENU_NUMBER);\r
       NewConsoleContext->IsActive = BmmData->ConsoleOutCheck[Index];\r
     }\r
+\r
     for (Index = 0; Index < TerminalMenu.MenuNumber; Index++) {\r
-      NewMenuEntry                = BOpt_GetMenuEntry (&TerminalMenu, Index);\r
-      NewTerminalContext          = (BM_TERMINAL_CONTEXT *) NewMenuEntry->VariableContext;\r
+      NewMenuEntry       = BOpt_GetMenuEntry (&TerminalMenu, Index);\r
+      NewTerminalContext = (BM_TERMINAL_CONTEXT *)NewMenuEntry->VariableContext;\r
       ASSERT (Index + ConsoleOutMenu.MenuNumber < MAX_MENU_NUMBER);\r
       NewTerminalContext->IsConOut = BmmData->ConsoleOutCheck[Index + ConsoleOutMenu.MenuNumber];\r
     }\r
   }\r
+\r
   if (StrCmp (ConsoleName, L"ErrOut") == 0) {\r
-    for (Index = 0; Index < ConsoleErrMenu.MenuNumber; Index++){\r
-      NewMenuEntry                = BOpt_GetMenuEntry(&ConsoleErrMenu, Index);\r
-      NewConsoleContext           = (BM_CONSOLE_CONTEXT *)NewMenuEntry->VariableContext;\r
+    for (Index = 0; Index < ConsoleErrMenu.MenuNumber; Index++) {\r
+      NewMenuEntry      = BOpt_GetMenuEntry (&ConsoleErrMenu, Index);\r
+      NewConsoleContext = (BM_CONSOLE_CONTEXT *)NewMenuEntry->VariableContext;\r
       ASSERT (Index < MAX_MENU_NUMBER);\r
       NewConsoleContext->IsActive = BmmData->ConsoleErrCheck[Index];\r
     }\r
+\r
     for (Index = 0; Index < TerminalMenu.MenuNumber; Index++) {\r
-      NewMenuEntry                = BOpt_GetMenuEntry (&TerminalMenu, Index);\r
-      NewTerminalContext          = (BM_TERMINAL_CONTEXT *) NewMenuEntry->VariableContext;\r
+      NewMenuEntry       = BOpt_GetMenuEntry (&TerminalMenu, Index);\r
+      NewTerminalContext = (BM_TERMINAL_CONTEXT *)NewMenuEntry->VariableContext;\r
       ASSERT (Index + ConsoleErrMenu.MenuNumber < MAX_MENU_NUMBER);\r
       NewTerminalContext->IsStdErr = BmmData->ConsoleErrCheck[Index + ConsoleErrMenu.MenuNumber];\r
     }\r
@@ -649,21 +659,21 @@ UpdateConsoleContent(
 EFI_STATUS\r
 EFIAPI\r
 BootMaintExtractConfig (\r
-  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL   *This,\r
-  IN  CONST EFI_STRING                       Request,\r
-  OUT EFI_STRING                             *Progress,\r
-  OUT EFI_STRING                             *Results\r
+  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL  *This,\r
+  IN  CONST EFI_STRING                      Request,\r
+  OUT EFI_STRING                            *Progress,\r
+  OUT EFI_STRING                            *Results\r
   )\r
 {\r
   EFI_STATUS         Status;\r
   UINTN              BufferSize;\r
   BMM_CALLBACK_DATA  *Private;\r
-  EFI_STRING                       ConfigRequestHdr;\r
-  EFI_STRING                       ConfigRequest;\r
-  BOOLEAN                          AllocatedRequest;\r
-  UINTN                            Size;\r
+  EFI_STRING         ConfigRequestHdr;\r
+  EFI_STRING         ConfigRequest;\r
+  BOOLEAN            AllocatedRequest;\r
+  UINTN              Size;\r
 \r
-  if (Progress == NULL || Results == NULL) {\r
+  if ((Progress == NULL) || (Results == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -681,7 +691,7 @@ BootMaintExtractConfig (
   //\r
   // Convert buffer data to <ConfigResp> by helper function BlockToConfig()\r
   //\r
-  BufferSize = sizeof (BMM_FAKE_NV_DATA);\r
+  BufferSize    = sizeof (BMM_FAKE_NV_DATA);\r
   ConfigRequest = Request;\r
   if ((Request == NULL) || (StrStr (Request, L"OFFSET") == NULL)) {\r
     //\r
@@ -690,8 +700,8 @@ BootMaintExtractConfig (
     // followed by "&OFFSET=0&WIDTH=WWWWWWWWWWWWWWWW" followed by a Null-terminator\r
     //\r
     ConfigRequestHdr = HiiConstructConfigHdr (&mBootMaintGuid, mBootMaintStorageName, Private->BmmDriverHandle);\r
-    Size = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16);\r
-    ConfigRequest = AllocateZeroPool (Size);\r
+    Size             = (StrLen (ConfigRequestHdr) + 32 + 1) * sizeof (CHAR16);\r
+    ConfigRequest    = AllocateZeroPool (Size);\r
     ASSERT (ConfigRequest != NULL);\r
     AllocatedRequest = TRUE;\r
     UnicodeSPrint (ConfigRequest, Size, L"%s&OFFSET=0&WIDTH=%016LX", ConfigRequestHdr, (UINT64)BufferSize);\r
@@ -701,7 +711,7 @@ BootMaintExtractConfig (
   Status = gHiiConfigRouting->BlockToConfig (\r
                                 gHiiConfigRouting,\r
                                 ConfigRequest,\r
-                                (UINT8 *) &Private->BmmFakeNvData,\r
+                                (UINT8 *)&Private->BmmFakeNvData,\r
                                 BufferSize,\r
                                 Results,\r
                                 Progress\r
@@ -713,6 +723,7 @@ BootMaintExtractConfig (
     FreePool (ConfigRequest);\r
     ConfigRequest = NULL;\r
   }\r
+\r
   //\r
   // Set Progress string to the original request string.\r
   //\r
@@ -761,26 +772,27 @@ BootMaintExtractConfig (
 EFI_STATUS\r
 EFIAPI\r
 BootMaintRouteConfig (\r
-  IN CONST EFI_HII_CONFIG_ACCESS_PROTOCOL *This,\r
-  IN CONST EFI_STRING                     Configuration,\r
-  OUT EFI_STRING                          *Progress\r
+  IN CONST EFI_HII_CONFIG_ACCESS_PROTOCOL  *This,\r
+  IN CONST EFI_STRING                      Configuration,\r
+  OUT EFI_STRING                           *Progress\r
   )\r
 {\r
-  EFI_STATUS                      Status;\r
-  UINTN                           BufferSize;\r
-  EFI_HII_CONFIG_ROUTING_PROTOCOL *ConfigRouting;\r
-  BMM_FAKE_NV_DATA                *NewBmmData;\r
-  BMM_FAKE_NV_DATA                *OldBmmData;\r
-  BM_MENU_ENTRY                   *NewMenuEntry;\r
-  BM_LOAD_CONTEXT                 *NewLoadContext;\r
-  UINT16                          Index;\r
-  BOOLEAN                         TerminalAttChange;\r
-  BMM_CALLBACK_DATA               *Private;\r
-  UINTN                           Offset;\r
+  EFI_STATUS                       Status;\r
+  UINTN                            BufferSize;\r
+  EFI_HII_CONFIG_ROUTING_PROTOCOL  *ConfigRouting;\r
+  BMM_FAKE_NV_DATA                 *NewBmmData;\r
+  BMM_FAKE_NV_DATA                 *OldBmmData;\r
+  BM_MENU_ENTRY                    *NewMenuEntry;\r
+  BM_LOAD_CONTEXT                  *NewLoadContext;\r
+  UINT16                           Index;\r
+  BOOLEAN                          TerminalAttChange;\r
+  BMM_CALLBACK_DATA                *Private;\r
+  UINTN                            Offset;\r
 \r
   if (Progress == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
+\r
   *Progress = Configuration;\r
 \r
   if (Configuration == NULL) {\r
@@ -818,7 +830,7 @@ BootMaintRouteConfig (
   Status = ConfigRouting->ConfigToBlock (\r
                             ConfigRouting,\r
                             Configuration,\r
-                            (UINT8 *) NewBmmData,\r
+                            (UINT8 *)NewBmmData,\r
                             &BufferSize,\r
                             Progress\r
                             );\r
@@ -845,11 +857,12 @@ BootMaintRouteConfig (
   if (CompareMem (NewBmmData->BootOptionDel, OldBmmData->BootOptionDel, sizeof (NewBmmData->BootOptionDel)) != 0) {\r
     for (Index = 0;\r
          ((Index < BootOptionMenu.MenuNumber) && (Index < (sizeof (NewBmmData->BootOptionDel) / sizeof (NewBmmData->BootOptionDel[0]))));\r
-         Index ++) {\r
-      NewMenuEntry            = BOpt_GetMenuEntry (&BootOptionMenu, Index);\r
-      NewLoadContext          = (BM_LOAD_CONTEXT *) NewMenuEntry->VariableContext;\r
-      NewLoadContext->Deleted = NewBmmData->BootOptionDel[Index];\r
-      NewBmmData->BootOptionDel[Index] = FALSE;\r
+         Index++)\r
+    {\r
+      NewMenuEntry                         = BOpt_GetMenuEntry (&BootOptionMenu, Index);\r
+      NewLoadContext                       = (BM_LOAD_CONTEXT *)NewMenuEntry->VariableContext;\r
+      NewLoadContext->Deleted              = NewBmmData->BootOptionDel[Index];\r
+      NewBmmData->BootOptionDel[Index]     = FALSE;\r
       NewBmmData->BootOptionDelMark[Index] = FALSE;\r
     }\r
 \r
@@ -868,18 +881,19 @@ BootMaintRouteConfig (
     }\r
   }\r
 \r
-  if (CompareMem (&NewBmmData->BootTimeOut, &OldBmmData->BootTimeOut, sizeof (NewBmmData->BootTimeOut)) != 0){\r
-    Status = gRT->SetVariable(\r
+  if (CompareMem (&NewBmmData->BootTimeOut, &OldBmmData->BootTimeOut, sizeof (NewBmmData->BootTimeOut)) != 0) {\r
+    Status = gRT->SetVariable (\r
                     L"Timeout",\r
                     &gEfiGlobalVariableGuid,\r
                     EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,\r
-                    sizeof(UINT16),\r
+                    sizeof (UINT16),\r
                     &(NewBmmData->BootTimeOut)\r
                     );\r
     if (EFI_ERROR (Status)) {\r
       Offset = OFFSET_OF (BMM_FAKE_NV_DATA, BootTimeOut);\r
       goto Exit;\r
     }\r
+\r
     Private->BmmOldFakeNVData.BootTimeOut = NewBmmData->BootTimeOut;\r
   }\r
 \r
@@ -889,13 +903,15 @@ BootMaintRouteConfig (
   if (CompareMem (NewBmmData->DriverOptionDel, OldBmmData->DriverOptionDel, sizeof (NewBmmData->DriverOptionDel)) != 0) {\r
     for (Index = 0;\r
          ((Index < DriverOptionMenu.MenuNumber) && (Index < (sizeof (NewBmmData->DriverOptionDel) / sizeof (NewBmmData->DriverOptionDel[0]))));\r
-         Index++) {\r
-      NewMenuEntry            = BOpt_GetMenuEntry (&DriverOptionMenu, Index);\r
-      NewLoadContext          = (BM_LOAD_CONTEXT *) NewMenuEntry->VariableContext;\r
-      NewLoadContext->Deleted = NewBmmData->DriverOptionDel[Index];\r
-      NewBmmData->DriverOptionDel[Index] = FALSE;\r
+         Index++)\r
+    {\r
+      NewMenuEntry                           = BOpt_GetMenuEntry (&DriverOptionMenu, Index);\r
+      NewLoadContext                         = (BM_LOAD_CONTEXT *)NewMenuEntry->VariableContext;\r
+      NewLoadContext->Deleted                = NewBmmData->DriverOptionDel[Index];\r
+      NewBmmData->DriverOptionDel[Index]     = FALSE;\r
       NewBmmData->DriverOptionDelMark[Index] = FALSE;\r
     }\r
+\r
     Status = Var_DelDriverOption ();\r
     if (EFI_ERROR (Status)) {\r
       Offset = OFFSET_OF (BMM_FAKE_NV_DATA, DriverOptionDel);\r
@@ -911,8 +927,8 @@ BootMaintRouteConfig (
     }\r
   }\r
 \r
-  if (CompareMem (&NewBmmData->ConsoleOutMode, &OldBmmData->ConsoleOutMode, sizeof (NewBmmData->ConsoleOutMode)) != 0){\r
-    Status = Var_UpdateConMode(Private);\r
+  if (CompareMem (&NewBmmData->ConsoleOutMode, &OldBmmData->ConsoleOutMode, sizeof (NewBmmData->ConsoleOutMode)) != 0) {\r
+    Status = Var_UpdateConMode (Private);\r
     if (EFI_ERROR (Status)) {\r
       Offset = OFFSET_OF (BMM_FAKE_NV_DATA, ConsoleOutMode);\r
       goto Exit;\r
@@ -921,21 +937,22 @@ BootMaintRouteConfig (
 \r
   TerminalAttChange = FALSE;\r
   for (Index = 0; Index < TerminalMenu.MenuNumber; Index++) {\r
-\r
     //\r
     // only need update modified items\r
     //\r
-    if (CompareMem (&NewBmmData->COMBaudRate[Index], &OldBmmData->COMBaudRate[Index], sizeof (NewBmmData->COMBaudRate[Index])) == 0 &&\r
-         CompareMem (&NewBmmData->COMDataRate[Index], &OldBmmData->COMDataRate[Index], sizeof (NewBmmData->COMDataRate[Index])) == 0 &&\r
-         CompareMem (&NewBmmData->COMStopBits[Index], &OldBmmData->COMStopBits[Index], sizeof (NewBmmData->COMStopBits[Index])) == 0 &&\r
-         CompareMem (&NewBmmData->COMParity[Index], &OldBmmData->COMParity[Index], sizeof (NewBmmData->COMParity[Index])) == 0 &&\r
-         CompareMem (&NewBmmData->COMTerminalType[Index], &OldBmmData->COMTerminalType[Index], sizeof (NewBmmData->COMTerminalType[Index])) == 0 &&\r
-         CompareMem (&NewBmmData->COMFlowControl[Index], &OldBmmData->COMFlowControl[Index], sizeof (NewBmmData->COMFlowControl[Index])) == 0) {\r
+    if ((CompareMem (&NewBmmData->COMBaudRate[Index], &OldBmmData->COMBaudRate[Index], sizeof (NewBmmData->COMBaudRate[Index])) == 0) &&\r
+        (CompareMem (&NewBmmData->COMDataRate[Index], &OldBmmData->COMDataRate[Index], sizeof (NewBmmData->COMDataRate[Index])) == 0) &&\r
+        (CompareMem (&NewBmmData->COMStopBits[Index], &OldBmmData->COMStopBits[Index], sizeof (NewBmmData->COMStopBits[Index])) == 0) &&\r
+        (CompareMem (&NewBmmData->COMParity[Index], &OldBmmData->COMParity[Index], sizeof (NewBmmData->COMParity[Index])) == 0) &&\r
+        (CompareMem (&NewBmmData->COMTerminalType[Index], &OldBmmData->COMTerminalType[Index], sizeof (NewBmmData->COMTerminalType[Index])) == 0) &&\r
+        (CompareMem (&NewBmmData->COMFlowControl[Index], &OldBmmData->COMFlowControl[Index], sizeof (NewBmmData->COMFlowControl[Index])) == 0))\r
+    {\r
       continue;\r
     }\r
 \r
     TerminalAttChange = TRUE;\r
   }\r
+\r
   if (TerminalAttChange) {\r
     if (CompareMem (&NewBmmData->COMBaudRate[Index], &OldBmmData->COMBaudRate[Index], sizeof (NewBmmData->COMBaudRate[Index])) != 0) {\r
       Offset = OFFSET_OF (BMM_FAKE_NV_DATA, COMBaudRate);\r
@@ -950,49 +967,54 @@ BootMaintRouteConfig (
     } else if (CompareMem (&NewBmmData->COMFlowControl[Index], &OldBmmData->COMFlowControl[Index], sizeof (NewBmmData->COMFlowControl[Index])) != 0) {\r
       Offset = OFFSET_OF (BMM_FAKE_NV_DATA, COMFlowControl);\r
     }\r
+\r
     Status = Var_UpdateConsoleInpOption ();\r
     if (EFI_ERROR (Status)) {\r
       goto Exit;\r
     }\r
+\r
     Status = Var_UpdateConsoleOutOption ();\r
     if (EFI_ERROR (Status)) {\r
       goto Exit;\r
     }\r
+\r
     Status = Var_UpdateErrorOutOption ();\r
     if (EFI_ERROR (Status)) {\r
       goto Exit;\r
     }\r
   }\r
+\r
   //\r
   // Check data which located in Console Options Menu and save the settings if need\r
   //\r
-  if (CompareMem (NewBmmData->ConsoleInCheck, OldBmmData->ConsoleInCheck, sizeof (NewBmmData->ConsoleInCheck)) != 0){\r
-    Status = Var_UpdateConsoleInpOption();\r
+  if (CompareMem (NewBmmData->ConsoleInCheck, OldBmmData->ConsoleInCheck, sizeof (NewBmmData->ConsoleInCheck)) != 0) {\r
+    Status = Var_UpdateConsoleInpOption ();\r
     if (EFI_ERROR (Status)) {\r
       Offset = OFFSET_OF (BMM_FAKE_NV_DATA, ConsoleInCheck);\r
       goto Exit;\r
     }\r
   }\r
 \r
-  if (CompareMem (NewBmmData->ConsoleOutCheck, OldBmmData->ConsoleOutCheck, sizeof (NewBmmData->ConsoleOutCheck)) != 0){\r
-    Status = Var_UpdateConsoleOutOption();\r
+  if (CompareMem (NewBmmData->ConsoleOutCheck, OldBmmData->ConsoleOutCheck, sizeof (NewBmmData->ConsoleOutCheck)) != 0) {\r
+    Status = Var_UpdateConsoleOutOption ();\r
     if (EFI_ERROR (Status)) {\r
       Offset = OFFSET_OF (BMM_FAKE_NV_DATA, ConsoleOutCheck);\r
       goto Exit;\r
     }\r
   }\r
 \r
-  if (CompareMem (NewBmmData->ConsoleErrCheck, OldBmmData->ConsoleErrCheck, sizeof (NewBmmData->ConsoleErrCheck)) != 0){\r
-    Status = Var_UpdateErrorOutOption();\r
+  if (CompareMem (NewBmmData->ConsoleErrCheck, OldBmmData->ConsoleErrCheck, sizeof (NewBmmData->ConsoleErrCheck)) != 0) {\r
+    Status = Var_UpdateErrorOutOption ();\r
     if (EFI_ERROR (Status)) {\r
       Offset = OFFSET_OF (BMM_FAKE_NV_DATA, ConsoleErrCheck);\r
       goto Exit;\r
     }\r
   }\r
 \r
-  if (CompareMem (NewBmmData->BootDescriptionData, OldBmmData->BootDescriptionData, sizeof (NewBmmData->BootDescriptionData)) != 0 ||\r
-       CompareMem (NewBmmData->BootOptionalData, OldBmmData->BootOptionalData, sizeof (NewBmmData->BootOptionalData)) != 0) {\r
-    Status = Var_UpdateBootOption (Private);\r
+  if ((CompareMem (NewBmmData->BootDescriptionData, OldBmmData->BootDescriptionData, sizeof (NewBmmData->BootDescriptionData)) != 0) ||\r
+      (CompareMem (NewBmmData->BootOptionalData, OldBmmData->BootOptionalData, sizeof (NewBmmData->BootOptionalData)) != 0))\r
+  {\r
+    Status                        = Var_UpdateBootOption (Private);\r
     NewBmmData->BootOptionChanged = FALSE;\r
     if (EFI_ERROR (Status)) {\r
       if (CompareMem (NewBmmData->BootDescriptionData, OldBmmData->BootDescriptionData, sizeof (NewBmmData->BootDescriptionData)) != 0) {\r
@@ -1000,20 +1022,23 @@ BootMaintRouteConfig (
       } else {\r
         Offset = OFFSET_OF (BMM_FAKE_NV_DATA, BootOptionalData);\r
       }\r
+\r
       goto Exit;\r
     }\r
+\r
     BOpt_GetBootOptions (Private);\r
   }\r
 \r
-  if (CompareMem (NewBmmData->DriverDescriptionData, OldBmmData->DriverDescriptionData, sizeof (NewBmmData->DriverDescriptionData)) != 0 ||\r
-       CompareMem (NewBmmData->DriverOptionalData, OldBmmData->DriverOptionalData, sizeof (NewBmmData->DriverOptionalData)) != 0) {\r
+  if ((CompareMem (NewBmmData->DriverDescriptionData, OldBmmData->DriverDescriptionData, sizeof (NewBmmData->DriverDescriptionData)) != 0) ||\r
+      (CompareMem (NewBmmData->DriverOptionalData, OldBmmData->DriverOptionalData, sizeof (NewBmmData->DriverOptionalData)) != 0))\r
+  {\r
     Status = Var_UpdateDriverOption (\r
-              Private,\r
-              Private->BmmHiiHandle,\r
-              NewBmmData->DriverDescriptionData,\r
-              NewBmmData->DriverOptionalData,\r
-              NewBmmData->ForceReconnect\r
-              );\r
+               Private,\r
+               Private->BmmHiiHandle,\r
+               NewBmmData->DriverDescriptionData,\r
+               NewBmmData->DriverOptionalData,\r
+               NewBmmData->ForceReconnect\r
+               );\r
     NewBmmData->DriverOptionChanged = FALSE;\r
     NewBmmData->ForceReconnect      = TRUE;\r
     if (EFI_ERROR (Status)) {\r
@@ -1022,6 +1047,7 @@ BootMaintRouteConfig (
       } else {\r
         Offset = OFFSET_OF (BMM_FAKE_NV_DATA, DriverOptionalData);\r
       }\r
+\r
       goto Exit;\r
     }\r
 \r
@@ -1068,29 +1094,29 @@ Exit:
 EFI_STATUS\r
 EFIAPI\r
 BootMaintCallback (\r
-  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL         *This,\r
-  IN        EFI_BROWSER_ACTION                     Action,\r
-  IN        EFI_QUESTION_ID                        QuestionId,\r
-  IN        UINT8                                  Type,\r
-  IN        EFI_IFR_TYPE_VALUE                     *Value,\r
-  OUT       EFI_BROWSER_ACTION_REQUEST             *ActionRequest\r
+  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL  *This,\r
+  IN        EFI_BROWSER_ACTION              Action,\r
+  IN        EFI_QUESTION_ID                 QuestionId,\r
+  IN        UINT8                           Type,\r
+  IN        EFI_IFR_TYPE_VALUE              *Value,\r
+  OUT       EFI_BROWSER_ACTION_REQUEST      *ActionRequest\r
   )\r
 {\r
-  BMM_CALLBACK_DATA *Private;\r
-  BM_MENU_ENTRY     *NewMenuEntry;\r
-  BMM_FAKE_NV_DATA  *CurrentFakeNVMap;\r
-  BMM_FAKE_NV_DATA  *OldFakeNVMap;\r
-  UINTN             Index;\r
-  EFI_DEVICE_PATH_PROTOCOL File;\r
-\r
-  if (Action != EFI_BROWSER_ACTION_CHANGING && Action != EFI_BROWSER_ACTION_CHANGED && Action != EFI_BROWSER_ACTION_FORM_OPEN) {\r
+  BMM_CALLBACK_DATA         *Private;\r
+  BM_MENU_ENTRY             *NewMenuEntry;\r
+  BMM_FAKE_NV_DATA          *CurrentFakeNVMap;\r
+  BMM_FAKE_NV_DATA          *OldFakeNVMap;\r
+  UINTN                     Index;\r
+  EFI_DEVICE_PATH_PROTOCOL  *File;\r
+\r
+  if ((Action != EFI_BROWSER_ACTION_CHANGING) && (Action != EFI_BROWSER_ACTION_CHANGED) && (Action != EFI_BROWSER_ACTION_FORM_OPEN)) {\r
     //\r
     // Do nothing for other UEFI Action. Only do call back when data is changed or the form is open.\r
     //\r
     return EFI_UNSUPPORTED;\r
   }\r
 \r
-  Private        = BMM_CALLBACK_DATA_FROM_THIS (This);\r
+  Private = BMM_CALLBACK_DATA_FROM_THIS (This);\r
 \r
   if (Action == EFI_BROWSER_ACTION_FORM_OPEN) {\r
     if (QuestionId == KEY_VALUE_TRIGGER_FORM_OPEN_ACTION) {\r
@@ -1111,12 +1137,13 @@ BootMaintCallback (
       }\r
     }\r
   }\r
+\r
   //\r
   // Retrieve uncommitted data from Form Browser\r
   //\r
   CurrentFakeNVMap = &Private->BmmFakeNvData;\r
   OldFakeNVMap     = &Private->BmmOldFakeNVData;\r
-  HiiGetBrowserData (&mBootMaintGuid, mBootMaintStorageName, sizeof (BMM_FAKE_NV_DATA), (UINT8 *) CurrentFakeNVMap);\r
+  HiiGetBrowserData (&mBootMaintGuid, mBootMaintStorageName, sizeof (BMM_FAKE_NV_DATA), (UINT8 *)CurrentFakeNVMap);\r
 \r
   if (Action == EFI_BROWSER_ACTION_CHANGING) {\r
     if (Value == NULL) {\r
@@ -1128,78 +1155,78 @@ BootMaintCallback (
     if (QuestionId < FILE_OPTION_OFFSET) {\r
       if (QuestionId < CONFIG_OPTION_OFFSET) {\r
         switch (QuestionId) {\r
-        case FORM_BOOT_ADD_ID:\r
-          // Leave BMM and enter FileExplorer.\r
-          ChooseFile (NULL, L".efi", CreateBootOptionFromFile, &File);\r
-          break;\r
+          case FORM_BOOT_ADD_ID:\r
+            // Leave BMM and enter FileExplorer.\r
+            ChooseFile (NULL, L".efi", CreateBootOptionFromFile, &File);\r
+            break;\r
 \r
-        case FORM_DRV_ADD_FILE_ID:\r
-          // Leave BMM and enter FileExplorer.\r
-          ChooseFile (NULL, L".efi", CreateDriverOptionFromFile, &File);\r
-          break;\r
+          case FORM_DRV_ADD_FILE_ID:\r
+            // Leave BMM and enter FileExplorer.\r
+            ChooseFile (NULL, L".efi", CreateDriverOptionFromFile, &File);\r
+            break;\r
 \r
-        case FORM_DRV_ADD_HANDLE_ID:\r
-          CleanUpPage (FORM_DRV_ADD_HANDLE_ID, Private);\r
-          UpdateDrvAddHandlePage (Private);\r
-          break;\r
+          case FORM_DRV_ADD_HANDLE_ID:\r
+            CleanUpPage (FORM_DRV_ADD_HANDLE_ID, Private);\r
+            UpdateDrvAddHandlePage (Private);\r
+            break;\r
 \r
-        case FORM_BOOT_DEL_ID:\r
-          CleanUpPage (FORM_BOOT_DEL_ID, Private);\r
-          UpdateBootDelPage (Private);\r
-          break;\r
+          case FORM_BOOT_DEL_ID:\r
+            CleanUpPage (FORM_BOOT_DEL_ID, Private);\r
+            UpdateBootDelPage (Private);\r
+            break;\r
 \r
-        case FORM_BOOT_CHG_ID:\r
-        case FORM_DRV_CHG_ID:\r
-          UpdatePageBody (QuestionId, Private);\r
-          break;\r
+          case FORM_BOOT_CHG_ID:\r
+          case FORM_DRV_CHG_ID:\r
+            UpdatePageBody (QuestionId, Private);\r
+            break;\r
 \r
-        case FORM_DRV_DEL_ID:\r
-          CleanUpPage (FORM_DRV_DEL_ID, Private);\r
-          UpdateDrvDelPage (Private);\r
-          break;\r
+          case FORM_DRV_DEL_ID:\r
+            CleanUpPage (FORM_DRV_DEL_ID, Private);\r
+            UpdateDrvDelPage (Private);\r
+            break;\r
 \r
-        case FORM_CON_IN_ID:\r
-        case FORM_CON_OUT_ID:\r
-        case FORM_CON_ERR_ID:\r
-          UpdatePageBody (QuestionId, Private);\r
-          break;\r
+          case FORM_CON_IN_ID:\r
+          case FORM_CON_OUT_ID:\r
+          case FORM_CON_ERR_ID:\r
+            UpdatePageBody (QuestionId, Private);\r
+            break;\r
 \r
-        case FORM_CON_MODE_ID:\r
-          CleanUpPage (FORM_CON_MODE_ID, Private);\r
-          UpdateConModePage (Private);\r
-          break;\r
+          case FORM_CON_MODE_ID:\r
+            CleanUpPage (FORM_CON_MODE_ID, Private);\r
+            UpdateConModePage (Private);\r
+            break;\r
 \r
-        case FORM_CON_COM_ID:\r
-          CleanUpPage (FORM_CON_COM_ID, Private);\r
-          UpdateConCOMPage (Private);\r
-          break;\r
+          case FORM_CON_COM_ID:\r
+            CleanUpPage (FORM_CON_COM_ID, Private);\r
+            UpdateConCOMPage (Private);\r
+            break;\r
 \r
-        default:\r
-          break;\r
+          default:\r
+            break;\r
         }\r
       } else if ((QuestionId >= TERMINAL_OPTION_OFFSET) && (QuestionId < CONSOLE_OPTION_OFFSET)) {\r
-        Index                  = (UINT16) (QuestionId - TERMINAL_OPTION_OFFSET);\r
-        Private->CurrentTerminal  = Index;\r
+        Index                    = (UINT16)(QuestionId - TERMINAL_OPTION_OFFSET);\r
+        Private->CurrentTerminal = Index;\r
 \r
         CleanUpPage (FORM_CON_COM_SETUP_ID, Private);\r
         UpdateTerminalPage (Private);\r
-\r
       } else if (QuestionId >= HANDLE_OPTION_OFFSET) {\r
-        Index                  = (UINT16) (QuestionId - HANDLE_OPTION_OFFSET);\r
+        Index = (UINT16)(QuestionId - HANDLE_OPTION_OFFSET);\r
 \r
-        NewMenuEntry            = BOpt_GetMenuEntry (&DriverMenu, Index);\r
+        NewMenuEntry = BOpt_GetMenuEntry (&DriverMenu, Index);\r
         ASSERT (NewMenuEntry != NULL);\r
-        Private->HandleContext  = (BM_HANDLE_CONTEXT *) NewMenuEntry->VariableContext;\r
+        Private->HandleContext = (BM_HANDLE_CONTEXT *)NewMenuEntry->VariableContext;\r
 \r
         CleanUpPage (FORM_DRV_ADD_HANDLE_DESC_ID, Private);\r
 \r
-        Private->MenuEntry                  = NewMenuEntry;\r
-        Private->LoadContext->FilePathList  = Private->HandleContext->DevicePath;\r
+        Private->MenuEntry                 = NewMenuEntry;\r
+        Private->LoadContext->FilePathList = Private->HandleContext->DevicePath;\r
 \r
         UpdateDriverAddHandleDescPage (Private);\r
       }\r
     }\r
-    if (QuestionId == KEY_VALUE_BOOT_FROM_FILE){\r
+\r
+    if (QuestionId == KEY_VALUE_BOOT_FROM_FILE) {\r
       // Leave BMM and enter FileExplorer.\r
       ChooseFile (NULL, L".efi", BootFromFile, &File);\r
     }\r
@@ -1211,11 +1238,11 @@ BootMaintCallback (
     if (QuestionId == KEY_VALUE_SAVE_AND_EXIT_BOOT) {\r
       CleanUselessBeforeSubmit (Private);\r
       CurrentFakeNVMap->BootOptionChanged = FALSE;\r
-      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_SUBMIT_EXIT;\r
+      *ActionRequest                      = EFI_BROWSER_ACTION_REQUEST_FORM_SUBMIT_EXIT;\r
     } else if (QuestionId == KEY_VALUE_SAVE_AND_EXIT_DRIVER) {\r
       CleanUselessBeforeSubmit (Private);\r
       CurrentFakeNVMap->DriverOptionChanged = FALSE;\r
-      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_SUBMIT_EXIT;\r
+      *ActionRequest                        = EFI_BROWSER_ACTION_REQUEST_FORM_SUBMIT_EXIT;\r
     } else if (QuestionId == KEY_VALUE_NO_SAVE_AND_EXIT_DRIVER) {\r
       //\r
       // Discard changes and exit formset\r
@@ -1226,7 +1253,7 @@ BootMaintCallback (
       ZeroMem (OldFakeNVMap->DriverDescriptionData, sizeof (OldFakeNVMap->DriverDescriptionData));\r
       CurrentFakeNVMap->DriverOptionChanged = FALSE;\r
       CurrentFakeNVMap->ForceReconnect      = TRUE;\r
-      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_DISCARD_EXIT;\r
+      *ActionRequest                        = EFI_BROWSER_ACTION_REQUEST_FORM_DISCARD_EXIT;\r
     } else if (QuestionId == KEY_VALUE_NO_SAVE_AND_EXIT_BOOT) {\r
       //\r
       // Discard changes and exit formset\r
@@ -1236,15 +1263,15 @@ BootMaintCallback (
       ZeroMem (OldFakeNVMap->BootOptionalData, sizeof (OldFakeNVMap->BootOptionalData));\r
       ZeroMem (OldFakeNVMap->BootDescriptionData, sizeof (OldFakeNVMap->BootDescriptionData));\r
       CurrentFakeNVMap->BootOptionChanged = FALSE;\r
-      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_DISCARD_EXIT;\r
-    } else if (QuestionId == KEY_VALUE_BOOT_DESCRIPTION || QuestionId == KEY_VALUE_BOOT_OPTION) {\r
+      *ActionRequest                      = EFI_BROWSER_ACTION_REQUEST_FORM_DISCARD_EXIT;\r
+    } else if ((QuestionId == KEY_VALUE_BOOT_DESCRIPTION) || (QuestionId == KEY_VALUE_BOOT_OPTION)) {\r
       CurrentFakeNVMap->BootOptionChanged = TRUE;\r
-    } else if (QuestionId == KEY_VALUE_DRIVER_DESCRIPTION || QuestionId == KEY_VALUE_DRIVER_OPTION) {\r
+    } else if ((QuestionId == KEY_VALUE_DRIVER_DESCRIPTION) || (QuestionId == KEY_VALUE_DRIVER_OPTION)) {\r
       CurrentFakeNVMap->DriverOptionChanged = TRUE;\r
     }\r
 \r
     if ((QuestionId >= BOOT_OPTION_DEL_QUESTION_ID) && (QuestionId < BOOT_OPTION_DEL_QUESTION_ID + MAX_MENU_NUMBER)) {\r
-      if (Value->b){\r
+      if (Value->b) {\r
         //\r
         // Means user try to delete this boot option but not press F10 or "Commit Changes and Exit" menu.\r
         //\r
@@ -1256,44 +1283,47 @@ BootMaintCallback (
         CurrentFakeNVMap->BootOptionDelMark[QuestionId - BOOT_OPTION_DEL_QUESTION_ID] = FALSE;\r
       }\r
     } else if ((QuestionId >= DRIVER_OPTION_DEL_QUESTION_ID) && (QuestionId < DRIVER_OPTION_DEL_QUESTION_ID + MAX_MENU_NUMBER)) {\r
-      if (Value->b){\r
+      if (Value->b) {\r
         CurrentFakeNVMap->DriverOptionDelMark[QuestionId - DRIVER_OPTION_DEL_QUESTION_ID] = TRUE;\r
       } else {\r
         CurrentFakeNVMap->DriverOptionDelMark[QuestionId - DRIVER_OPTION_DEL_QUESTION_ID] = FALSE;\r
       }\r
     } else {\r
       switch (QuestionId) {\r
-      case KEY_VALUE_SAVE_AND_EXIT:\r
-      case KEY_VALUE_NO_SAVE_AND_EXIT:\r
-        if (QuestionId == KEY_VALUE_SAVE_AND_EXIT) {\r
-          CleanUselessBeforeSubmit (Private);\r
-          *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_SUBMIT_EXIT;\r
-        } else if (QuestionId == KEY_VALUE_NO_SAVE_AND_EXIT) {\r
-          DiscardChangeHandler (Private, CurrentFakeNVMap);\r
-          *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_DISCARD_EXIT;\r
-        }\r
+        case KEY_VALUE_SAVE_AND_EXIT:\r
+        case KEY_VALUE_NO_SAVE_AND_EXIT:\r
+          if (QuestionId == KEY_VALUE_SAVE_AND_EXIT) {\r
+            CleanUselessBeforeSubmit (Private);\r
+            *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_SUBMIT_EXIT;\r
+          } else if (QuestionId == KEY_VALUE_NO_SAVE_AND_EXIT) {\r
+            DiscardChangeHandler (Private, CurrentFakeNVMap);\r
+            *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_DISCARD_EXIT;\r
+          }\r
 \r
-        break;\r
+          break;\r
 \r
-      case FORM_RESET:\r
-        gRT->ResetSystem (EfiResetCold, EFI_SUCCESS, 0, NULL);\r
-        return EFI_UNSUPPORTED;\r
+        case FORM_RESET:\r
+          gRT->ResetSystem (EfiResetCold, EFI_SUCCESS, 0, NULL);\r
+          return EFI_UNSUPPORTED;\r
 \r
-      default:\r
-        break;\r
+        default:\r
+          break;\r
       }\r
     }\r
+\r
     //\r
     // Update the content in Terminal menu and Console menu here.\r
     //\r
-    if (QuestionId == COM_BAUD_RATE_QUESTION_ID + Private->CurrentTerminal || QuestionId == COM_DATA_RATE_QUESTION_ID + Private->CurrentTerminal ||\r
-      QuestionId == COM_PARITY_QUESTION_ID + Private->CurrentTerminal || QuestionId == COM_STOP_BITS_QUESTION_ID + Private->CurrentTerminal ||\r
-      QuestionId == COM_TERMINAL_QUESTION_ID + Private->CurrentTerminal || QuestionId == COM_FLOWCONTROL_QUESTION_ID + Private->CurrentTerminal\r
-    ) {\r
-      UpdateTerminalContent(CurrentFakeNVMap);\r
+    if ((QuestionId == COM_BAUD_RATE_QUESTION_ID + Private->CurrentTerminal) || (QuestionId == COM_DATA_RATE_QUESTION_ID + Private->CurrentTerminal) ||\r
+        (QuestionId == COM_PARITY_QUESTION_ID + Private->CurrentTerminal) || (QuestionId == COM_STOP_BITS_QUESTION_ID + Private->CurrentTerminal) ||\r
+        (QuestionId == COM_TERMINAL_QUESTION_ID + Private->CurrentTerminal) || (QuestionId == COM_FLOWCONTROL_QUESTION_ID + Private->CurrentTerminal)\r
+        )\r
+    {\r
+      UpdateTerminalContent (CurrentFakeNVMap);\r
     }\r
+\r
     if ((QuestionId >= CON_IN_DEVICE_QUESTION_ID) && (QuestionId < CON_IN_DEVICE_QUESTION_ID + MAX_MENU_NUMBER)) {\r
-      UpdateConsoleContent (L"ConIn",CurrentFakeNVMap);\r
+      UpdateConsoleContent (L"ConIn", CurrentFakeNVMap);\r
     } else if ((QuestionId >= CON_OUT_DEVICE_QUESTION_ID) && (QuestionId < CON_OUT_DEVICE_QUESTION_ID + MAX_MENU_NUMBER)) {\r
       UpdateConsoleContent (L"ConOut", CurrentFakeNVMap);\r
     } else if ((QuestionId >= CON_ERR_DEVICE_QUESTION_ID) && (QuestionId < CON_ERR_DEVICE_QUESTION_ID + MAX_MENU_NUMBER)) {\r
@@ -1304,7 +1334,7 @@ BootMaintCallback (
   //\r
   // Pass changed uncommitted data back to Form Browser\r
   //\r
-  HiiSetBrowserData (&mBootMaintGuid, mBootMaintStorageName, sizeof (BMM_FAKE_NV_DATA), (UINT8 *) CurrentFakeNVMap, NULL);\r
+  HiiSetBrowserData (&mBootMaintGuid, mBootMaintStorageName, sizeof (BMM_FAKE_NV_DATA), (UINT8 *)CurrentFakeNVMap, NULL);\r
 \r
   return EFI_SUCCESS;\r
 }\r
@@ -1319,52 +1349,54 @@ BootMaintCallback (
 **/\r
 VOID\r
 DiscardChangeHandler (\r
-  IN  BMM_CALLBACK_DATA               *Private,\r
-  IN  BMM_FAKE_NV_DATA                *CurrentFakeNVMap\r
+  IN  BMM_CALLBACK_DATA  *Private,\r
+  IN  BMM_FAKE_NV_DATA   *CurrentFakeNVMap\r
   )\r
 {\r
   UINT16  Index;\r
 \r
   switch (Private->BmmPreviousPageId) {\r
-  case FORM_BOOT_CHG_ID:\r
-    CopyMem (CurrentFakeNVMap->BootOptionOrder, Private->BmmOldFakeNVData.BootOptionOrder, sizeof (CurrentFakeNVMap->BootOptionOrder));\r
-    break;\r
+    case FORM_BOOT_CHG_ID:\r
+      CopyMem (CurrentFakeNVMap->BootOptionOrder, Private->BmmOldFakeNVData.BootOptionOrder, sizeof (CurrentFakeNVMap->BootOptionOrder));\r
+      break;\r
 \r
-  case FORM_DRV_CHG_ID:\r
-    CopyMem (CurrentFakeNVMap->DriverOptionOrder, Private->BmmOldFakeNVData.DriverOptionOrder, sizeof (CurrentFakeNVMap->DriverOptionOrder));\r
-    break;\r
+    case FORM_DRV_CHG_ID:\r
+      CopyMem (CurrentFakeNVMap->DriverOptionOrder, Private->BmmOldFakeNVData.DriverOptionOrder, sizeof (CurrentFakeNVMap->DriverOptionOrder));\r
+      break;\r
 \r
-  case FORM_BOOT_DEL_ID:\r
-    ASSERT (BootOptionMenu.MenuNumber <= (sizeof (CurrentFakeNVMap->BootOptionDel) / sizeof (CurrentFakeNVMap->BootOptionDel[0])));\r
-    for (Index = 0; Index < BootOptionMenu.MenuNumber; Index++) {\r
-      CurrentFakeNVMap->BootOptionDel[Index] = FALSE;\r
-    }\r
-    break;\r
+    case FORM_BOOT_DEL_ID:\r
+      ASSERT (BootOptionMenu.MenuNumber <= (sizeof (CurrentFakeNVMap->BootOptionDel) / sizeof (CurrentFakeNVMap->BootOptionDel[0])));\r
+      for (Index = 0; Index < BootOptionMenu.MenuNumber; Index++) {\r
+        CurrentFakeNVMap->BootOptionDel[Index] = FALSE;\r
+      }\r
 \r
-  case FORM_DRV_DEL_ID:\r
-    ASSERT (DriverOptionMenu.MenuNumber <= (sizeof (CurrentFakeNVMap->DriverOptionDel) / sizeof (CurrentFakeNVMap->DriverOptionDel[0])));\r
-    for (Index = 0; Index < DriverOptionMenu.MenuNumber; Index++) {\r
-      CurrentFakeNVMap->DriverOptionDel[Index] = FALSE;\r
-    }\r
-    break;\r
+      break;\r
 \r
-  case FORM_BOOT_NEXT_ID:\r
-    CurrentFakeNVMap->BootNext = Private->BmmOldFakeNVData.BootNext;\r
-    break;\r
+    case FORM_DRV_DEL_ID:\r
+      ASSERT (DriverOptionMenu.MenuNumber <= (sizeof (CurrentFakeNVMap->DriverOptionDel) / sizeof (CurrentFakeNVMap->DriverOptionDel[0])));\r
+      for (Index = 0; Index < DriverOptionMenu.MenuNumber; Index++) {\r
+        CurrentFakeNVMap->DriverOptionDel[Index] = FALSE;\r
+      }\r
 \r
-  case FORM_TIME_OUT_ID:\r
-    CurrentFakeNVMap->BootTimeOut = Private->BmmOldFakeNVData.BootTimeOut;\r
-    break;\r
+      break;\r
 \r
-  case FORM_DRV_ADD_HANDLE_DESC_ID:\r
-  case FORM_DRV_ADD_FILE_ID:\r
-  case FORM_DRV_ADD_HANDLE_ID:\r
-    CurrentFakeNVMap->DriverAddHandleDesc[0]          = 0x0000;\r
-    CurrentFakeNVMap->DriverAddHandleOptionalData[0]  = 0x0000;\r
-    break;\r
+    case FORM_BOOT_NEXT_ID:\r
+      CurrentFakeNVMap->BootNext = Private->BmmOldFakeNVData.BootNext;\r
+      break;\r
+\r
+    case FORM_TIME_OUT_ID:\r
+      CurrentFakeNVMap->BootTimeOut = Private->BmmOldFakeNVData.BootTimeOut;\r
+      break;\r
 \r
-  default:\r
-    break;\r
+    case FORM_DRV_ADD_HANDLE_DESC_ID:\r
+    case FORM_DRV_ADD_FILE_ID:\r
+    case FORM_DRV_ADD_HANDLE_ID:\r
+      CurrentFakeNVMap->DriverAddHandleDesc[0]         = 0x0000;\r
+      CurrentFakeNVMap->DriverAddHandleOptionalData[0] = 0x0000;\r
+      break;\r
+\r
+    default:\r
+      break;\r
   }\r
 }\r
 \r
@@ -1376,22 +1408,24 @@ DiscardChangeHandler (
 **/\r
 VOID\r
 CleanUselessBeforeSubmit (\r
-  IN  BMM_CALLBACK_DATA               *Private\r
+  IN  BMM_CALLBACK_DATA  *Private\r
   )\r
 {\r
   UINT16  Index;\r
+\r
   if (Private->BmmPreviousPageId != FORM_BOOT_DEL_ID) {\r
     for (Index = 0; Index < BootOptionMenu.MenuNumber; Index++) {\r
       if (Private->BmmFakeNvData.BootOptionDel[Index] && !Private->BmmFakeNvData.BootOptionDelMark[Index]) {\r
-        Private->BmmFakeNvData.BootOptionDel[Index] = FALSE;\r
+        Private->BmmFakeNvData.BootOptionDel[Index]    = FALSE;\r
         Private->BmmOldFakeNVData.BootOptionDel[Index] = FALSE;\r
       }\r
     }\r
   }\r
+\r
   if (Private->BmmPreviousPageId != FORM_DRV_DEL_ID) {\r
     for (Index = 0; Index < DriverOptionMenu.MenuNumber; Index++) {\r
       if (Private->BmmFakeNvData.DriverOptionDel[Index] && !Private->BmmFakeNvData.DriverOptionDelMark[Index]) {\r
-        Private->BmmFakeNvData.DriverOptionDel[Index] = FALSE;\r
+        Private->BmmFakeNvData.DriverOptionDel[Index]    = FALSE;\r
         Private->BmmOldFakeNVData.DriverOptionDel[Index] = FALSE;\r
       }\r
     }\r
@@ -1408,10 +1442,10 @@ CustomizeMenus (
   VOID\r
   )\r
 {\r
-  VOID                        *StartOpCodeHandle;\r
-  VOID                        *EndOpCodeHandle;\r
-  EFI_IFR_GUID_LABEL          *StartGuidLabel;\r
-  EFI_IFR_GUID_LABEL          *EndGuidLabel;\r
+  VOID                *StartOpCodeHandle;\r
+  VOID                *EndOpCodeHandle;\r
+  EFI_IFR_GUID_LABEL  *StartGuidLabel;\r
+  EFI_IFR_GUID_LABEL  *EndGuidLabel;\r
 \r
   //\r
   // Allocate space for creation of UpdateData Buffer\r
@@ -1424,18 +1458,18 @@ CustomizeMenus (
   //\r
   // Create Hii Extend Label OpCode as the start opcode\r
   //\r
-  StartGuidLabel = (EFI_IFR_GUID_LABEL *) HiiCreateGuidOpCode (StartOpCodeHandle, &gEfiIfrTianoGuid, NULL, sizeof (EFI_IFR_GUID_LABEL));\r
+  StartGuidLabel               = (EFI_IFR_GUID_LABEL *)HiiCreateGuidOpCode (StartOpCodeHandle, &gEfiIfrTianoGuid, NULL, sizeof (EFI_IFR_GUID_LABEL));\r
   StartGuidLabel->ExtendOpCode = EFI_IFR_EXTEND_OP_LABEL;\r
   StartGuidLabel->Number       = LABEL_FORM_MAIN_START;\r
   //\r
   // Create Hii Extend Label OpCode as the end opcode\r
   //\r
-  EndGuidLabel = (EFI_IFR_GUID_LABEL *) HiiCreateGuidOpCode (EndOpCodeHandle, &gEfiIfrTianoGuid, NULL, sizeof (EFI_IFR_GUID_LABEL));\r
+  EndGuidLabel               = (EFI_IFR_GUID_LABEL *)HiiCreateGuidOpCode (EndOpCodeHandle, &gEfiIfrTianoGuid, NULL, sizeof (EFI_IFR_GUID_LABEL));\r
   EndGuidLabel->ExtendOpCode = EFI_IFR_EXTEND_OP_LABEL;\r
   EndGuidLabel->Number       = LABEL_FORM_MAIN_END;\r
 \r
   //\r
-  //Updata Front Page form\r
+  // Updata Front Page form\r
   //\r
   UiCustomizeBMMPage (\r
     mBmmCallbackInfo->BmmHiiHandle,\r
@@ -1463,12 +1497,12 @@ CustomizeMenus (
 **/\r
 VOID\r
 InitializeBmmConfig (\r
-  IN  BMM_CALLBACK_DATA    *CallbackData\r
+  IN  BMM_CALLBACK_DATA  *CallbackData\r
   )\r
 {\r
-  BM_MENU_ENTRY   *NewMenuEntry;\r
-  BM_LOAD_CONTEXT *NewLoadContext;\r
-  UINT16          Index;\r
+  BM_MENU_ENTRY    *NewMenuEntry;\r
+  BM_LOAD_CONTEXT  *NewLoadContext;\r
+  UINT16           Index;\r
 \r
   ASSERT (CallbackData != NULL);\r
 \r
@@ -1477,8 +1511,8 @@ InitializeBmmConfig (
   //\r
   CallbackData->BmmFakeNvData.BootNext = NONE_BOOTNEXT_VALUE;\r
   for (Index = 0; Index < BootOptionMenu.MenuNumber; Index++) {\r
-    NewMenuEntry    = BOpt_GetMenuEntry (&BootOptionMenu, Index);\r
-    NewLoadContext  = (BM_LOAD_CONTEXT *) NewMenuEntry->VariableContext;\r
+    NewMenuEntry   = BOpt_GetMenuEntry (&BootOptionMenu, Index);\r
+    NewLoadContext = (BM_LOAD_CONTEXT *)NewMenuEntry->VariableContext;\r
 \r
     if (NewLoadContext->IsBootNext) {\r
       CallbackData->BmmFakeNvData.BootNext = Index;\r
@@ -1523,7 +1557,7 @@ InitializeBmmConfig (
 **/\r
 VOID\r
 InitAllMenu (\r
-  IN  BMM_CALLBACK_DATA    *CallbackData\r
+  IN  BMM_CALLBACK_DATA  *CallbackData\r
   )\r
 {\r
   InitializeListHead (&BootOptionMenu.Head);\r
@@ -1549,9 +1583,10 @@ FreeAllMenu (
   VOID\r
   )\r
 {\r
-  if (!mAllMenuInit){\r
+  if (!mAllMenuInit) {\r
     return;\r
   }\r
+\r
   BOpt_FreeMenu (&BootOptionMenu);\r
   BOpt_FreeMenu (&DriverOptionMenu);\r
   BOpt_FreeMenu (&DriverMenu);\r
@@ -1568,11 +1603,11 @@ BmmInitialBootModeInfo (
   VOID\r
   )\r
 {\r
-  EFI_STATUS                         Status;\r
-  EFI_GRAPHICS_OUTPUT_PROTOCOL       *GraphicsOutput;\r
-  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL    *SimpleTextOut;\r
-  UINTN                              BootTextColumn;\r
-  UINTN                              BootTextRow;\r
+  EFI_STATUS                       Status;\r
+  EFI_GRAPHICS_OUTPUT_PROTOCOL     *GraphicsOutput;\r
+  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL  *SimpleTextOut;\r
+  UINTN                            BootTextColumn;\r
+  UINTN                            BootTextRow;\r
 \r
   if (mBmmModeInitialized) {\r
     return;\r
@@ -1585,7 +1620,7 @@ BmmInitialBootModeInfo (
   Status = gBS->HandleProtocol (\r
                   gST->ConsoleOutHandle,\r
                   &gEfiGraphicsOutputProtocolGuid,\r
-                  (VOID**)&GraphicsOutput\r
+                  (VOID **)&GraphicsOutput\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     GraphicsOutput = NULL;\r
@@ -1594,7 +1629,7 @@ BmmInitialBootModeInfo (
   Status = gBS->HandleProtocol (\r
                   gST->ConsoleOutHandle,\r
                   &gEfiSimpleTextOutProtocolGuid,\r
-                  (VOID**)&SimpleTextOut\r
+                  (VOID **)&SimpleTextOut\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     SimpleTextOut = NULL;\r
@@ -1627,7 +1662,7 @@ BmmInitialBootModeInfo (
   mBmmSetupTextModeColumn       = PcdGet32 (PcdSetupConOutColumn);\r
   mBmmSetupTextModeRow          = PcdGet32 (PcdSetupConOutRow);\r
 \r
-  mBmmModeInitialized           = TRUE;\r
+  mBmmModeInitialized = TRUE;\r
 }\r
 \r
 /**\r
@@ -1644,13 +1679,13 @@ BmmInitialBootModeInfo (
 EFI_STATUS\r
 EFIAPI\r
 BootMaintenanceManagerUiLibConstructor (\r
-  IN EFI_HANDLE                            ImageHandle,\r
-  IN EFI_SYSTEM_TABLE                      *SystemTable\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 \r
 {\r
-  EFI_STATUS               Status;\r
-  UINT8                    *Ptr;\r
+  EFI_STATUS  Status;\r
+  UINT8       *Ptr;\r
 \r
   Status = EFI_SUCCESS;\r
 \r
@@ -1671,18 +1706,18 @@ BootMaintenanceManagerUiLibConstructor (
   // Post our Boot Maint VFR binary to the HII database.\r
   //\r
   mBmmCallbackInfo->BmmHiiHandle = HiiAddPackages (\r
-                                    &mBootMaintGuid,\r
-                                    mBmmCallbackInfo->BmmDriverHandle,\r
-                                    BootMaintenanceManagerBin,\r
-                                    BootMaintenanceManagerUiLibStrings,\r
-                                    NULL\r
-                                    );\r
+                                     &mBootMaintGuid,\r
+                                     mBmmCallbackInfo->BmmDriverHandle,\r
+                                     BootMaintenanceManagerBin,\r
+                                     BootMaintenanceManagerUiLibStrings,\r
+                                     NULL\r
+                                     );\r
   ASSERT (mBmmCallbackInfo->BmmHiiHandle != NULL);\r
 \r
   //\r
   // Locate Formbrowser2 protocol\r
   //\r
-  Status = gBS->LocateProtocol (&gEfiFormBrowser2ProtocolGuid, NULL, (VOID **) &mBmmCallbackInfo->FormBrowser2);\r
+  Status = gBS->LocateProtocol (&gEfiFormBrowser2ProtocolGuid, NULL, (VOID **)&mBmmCallbackInfo->FormBrowser2);\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   //\r
@@ -1694,29 +1729,29 @@ BootMaintenanceManagerUiLibConstructor (
   //\r
   // Initialize Bmm callback data.\r
   //\r
-  mBmmCallbackInfo->LoadContext = (BM_LOAD_CONTEXT *) Ptr;\r
-  Ptr += sizeof (BM_LOAD_CONTEXT);\r
+  mBmmCallbackInfo->LoadContext = (BM_LOAD_CONTEXT *)Ptr;\r
+  Ptr                          += sizeof (BM_LOAD_CONTEXT);\r
 \r
-  mBmmCallbackInfo->FileContext = (BM_FILE_CONTEXT *) Ptr;\r
-  Ptr += sizeof (BM_FILE_CONTEXT);\r
+  mBmmCallbackInfo->FileContext = (BM_FILE_CONTEXT *)Ptr;\r
+  Ptr                          += sizeof (BM_FILE_CONTEXT);\r
 \r
-  mBmmCallbackInfo->HandleContext = (BM_HANDLE_CONTEXT *) Ptr;\r
-  Ptr += sizeof (BM_HANDLE_CONTEXT);\r
+  mBmmCallbackInfo->HandleContext = (BM_HANDLE_CONTEXT *)Ptr;\r
+  Ptr                            += sizeof (BM_HANDLE_CONTEXT);\r
 \r
-  mBmmCallbackInfo->MenuEntry     = (BM_MENU_ENTRY *) Ptr;\r
+  mBmmCallbackInfo->MenuEntry = (BM_MENU_ENTRY *)Ptr;\r
 \r
-  mBmmCallbackInfo->BmmPreviousPageId  = FORM_MAIN_ID;\r
-  mBmmCallbackInfo->BmmCurrentPageId   = FORM_MAIN_ID;\r
+  mBmmCallbackInfo->BmmPreviousPageId = FORM_MAIN_ID;\r
+  mBmmCallbackInfo->BmmCurrentPageId  = FORM_MAIN_ID;\r
 \r
   InitAllMenu (mBmmCallbackInfo);\r
 \r
-  CreateUpdateData();\r
+  CreateUpdateData ();\r
   //\r
   // Update boot maintenance manager page\r
   //\r
-  InitializeBmmConfig(mBmmCallbackInfo);\r
+  InitializeBmmConfig (mBmmCallbackInfo);\r
 \r
-  BmmInitialBootModeInfo();\r
+  BmmInitialBootModeInfo ();\r
 \r
   return EFI_SUCCESS;\r
 }\r
@@ -1733,8 +1768,8 @@ BootMaintenanceManagerUiLibConstructor (
 EFI_STATUS\r
 EFIAPI\r
 BootMaintenanceManagerUiLibDestructor (\r
-  IN EFI_HANDLE                            ImageHandle,\r
-  IN EFI_SYSTEM_TABLE                      *SystemTable\r
+  IN EFI_HANDLE        ImageHandle,\r
+  IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 \r
 {\r
@@ -1767,4 +1802,3 @@ BootMaintenanceManagerUiLibDestructor (
 \r
   return EFI_SUCCESS;\r
 }\r
-\r