]> git.proxmox.com Git - mirror_edk2.git/blobdiff - OvmfPkg/Csm/LegacyBootMaintUiLib/LegacyBootMaintUi.c
OvmfPkg: Apply uncrustify changes
[mirror_edk2.git] / OvmfPkg / Csm / LegacyBootMaintUiLib / LegacyBootMaintUi.c
index 31e211a7b90492581acc31f5c0226d59b77b5b84..6b4fa933f26d07edbdc968bfef2077c83a041c9b 100644 (file)
@@ -7,67 +7,63 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 \r
 **/\r
 \r
-\r
 #include "LegacyBootMaintUi.h"\r
 \r
 LEGACY_BOOT_OPTION_CALLBACK_DATA  *mLegacyBootOptionPrivate = NULL;\r
-EFI_GUID  mLegacyBootOptionGuid     = LEGACY_BOOT_OPTION_FORMSET_GUID;\r
-CHAR16    mLegacyBootStorageName[]  = L"LegacyBootData";\r
-BBS_TYPE  mBbsType[] = {BBS_FLOPPY, BBS_HARDDISK, BBS_CDROM, BBS_EMBED_NETWORK, BBS_BEV_DEVICE, BBS_UNKNOWN};\r
-BOOLEAN   mFirstEnterLegacyForm = FALSE;\r
-\r
+EFI_GUID                          mLegacyBootOptionGuid     = LEGACY_BOOT_OPTION_FORMSET_GUID;\r
+CHAR16                            mLegacyBootStorageName[]  = L"LegacyBootData";\r
+BBS_TYPE                          mBbsType[]                = { BBS_FLOPPY, BBS_HARDDISK, BBS_CDROM, BBS_EMBED_NETWORK, BBS_BEV_DEVICE, BBS_UNKNOWN };\r
+BOOLEAN                           mFirstEnterLegacyForm     = FALSE;\r
 \r
 ///\r
 /// Legacy FD Info from LegacyBios.GetBbsInfo()\r
 ///\r
-LEGACY_MENU_OPTION      LegacyFDMenu = {\r
+LEGACY_MENU_OPTION  LegacyFDMenu = {\r
   LEGACY_MENU_OPTION_SIGNATURE,\r
-  {NULL},\r
+  { NULL },\r
   0\r
 };\r
 \r
 ///\r
 /// Legacy HD Info from LegacyBios.GetBbsInfo()\r
 ///\r
-LEGACY_MENU_OPTION      LegacyHDMenu = {\r
+LEGACY_MENU_OPTION  LegacyHDMenu = {\r
   LEGACY_MENU_OPTION_SIGNATURE,\r
-  {NULL},\r
+  { NULL },\r
   0\r
 };\r
 \r
 ///\r
 /// Legacy CD Info from LegacyBios.GetBbsInfo()\r
 ///\r
-LEGACY_MENU_OPTION      LegacyCDMenu = {\r
+LEGACY_MENU_OPTION  LegacyCDMenu = {\r
   LEGACY_MENU_OPTION_SIGNATURE,\r
-  {NULL},\r
+  { NULL },\r
   0\r
 };\r
 \r
 ///\r
 /// Legacy NET Info from LegacyBios.GetBbsInfo()\r
 ///\r
-LEGACY_MENU_OPTION      LegacyNETMenu = {\r
+LEGACY_MENU_OPTION  LegacyNETMenu = {\r
   LEGACY_MENU_OPTION_SIGNATURE,\r
-  {NULL},\r
+  { NULL },\r
   0\r
 };\r
 \r
 ///\r
 /// Legacy NET Info from LegacyBios.GetBbsInfo()\r
 ///\r
-LEGACY_MENU_OPTION      LegacyBEVMenu = {\r
+LEGACY_MENU_OPTION  LegacyBEVMenu = {\r
   LEGACY_MENU_OPTION_SIGNATURE,\r
-  {NULL},\r
+  { NULL },\r
   0\r
 };\r
 \r
-\r
 VOID                *mLegacyStartOpCodeHandle = NULL;\r
-VOID                *mLegacyEndOpCodeHandle = NULL;\r
-EFI_IFR_GUID_LABEL  *mLegacyStartLabel = NULL;\r
-EFI_IFR_GUID_LABEL  *mLegacyEndLabel = NULL;\r
-\r
+VOID                *mLegacyEndOpCodeHandle   = NULL;\r
+EFI_IFR_GUID_LABEL  *mLegacyStartLabel        = NULL;\r
+EFI_IFR_GUID_LABEL  *mLegacyEndLabel          = NULL;\r
 \r
 HII_VENDOR_DEVICE_PATH  mLegacyBootOptionHiiVendorDevicePath = {\r
   {\r
@@ -75,18 +71,19 @@ HII_VENDOR_DEVICE_PATH  mLegacyBootOptionHiiVendorDevicePath = {
       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
-    { 0x6bc75598, 0x89b4, 0x483d, { 0x91, 0x60, 0x7f, 0x46, 0x9a, 0x96, 0x35, 0x31 } }\r
+    { 0x6bc75598, 0x89b4, 0x483d, { 0x91, 0x60, 0x7f, 0x46, 0x9a, 0x96, 0x35, 0x31 }\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
@@ -101,7 +98,6 @@ GetLegacyOptions (
   VOID\r
   );\r
 \r
-\r
 /**\r
 \r
   Base on the L"LegacyDevOrder" variable to build the current order data.\r
@@ -131,28 +127,28 @@ GetLegacyOptionsOrder (
 **/\r
 EFI_STATUS\r
 OrderLegacyBootOption4SameType (\r
-  UINT16                   *DevOrder,\r
-  UINTN                    DevOrderCount,\r
-  UINT16                   **EnBootOption,\r
-  UINTN                    *EnBootOptionCount,\r
-  UINT16                   **DisBootOption,\r
-  UINTN                    *DisBootOptionCount\r
+  UINT16  *DevOrder,\r
+  UINTN   DevOrderCount,\r
+  UINT16  **EnBootOption,\r
+  UINTN   *EnBootOptionCount,\r
+  UINT16  **DisBootOption,\r
+  UINTN   *DisBootOptionCount\r
   )\r
 {\r
-  EFI_STATUS               Status;\r
-  UINT16                   *NewBootOption;\r
-  UINT16                   *BootOrder;\r
-  UINTN                    BootOrderSize;\r
-  UINTN                    Index;\r
-  UINTN                    StartPosition;\r
+  EFI_STATUS  Status;\r
+  UINT16      *NewBootOption;\r
+  UINT16      *BootOrder;\r
+  UINTN       BootOrderSize;\r
+  UINTN       Index;\r
+  UINTN       StartPosition;\r
 \r
-  EFI_BOOT_MANAGER_LOAD_OPTION    BootOption;\r
+  EFI_BOOT_MANAGER_LOAD_OPTION  BootOption;\r
 \r
-  CHAR16                           OptionName[sizeof ("Boot####")];\r
-  UINT16                   *BbsIndexArray;\r
-  UINT16                   *DeviceTypeArray;\r
+  CHAR16  OptionName[sizeof ("Boot####")];\r
+  UINT16  *BbsIndexArray;\r
+  UINT16  *DeviceTypeArray;\r
 \r
-  GetEfiGlobalVariable2 (L"BootOrder", (VOID **) &BootOrder, &BootOrderSize);\r
+  GetEfiGlobalVariable2 (L"BootOrder", (VOID **)&BootOrder, &BootOrderSize);\r
   ASSERT (BootOrder != NULL);\r
 \r
   BbsIndexArray       = AllocatePool (BootOrderSize);\r
@@ -170,24 +166,25 @@ OrderLegacyBootOption4SameType (
   ASSERT (*DisBootOption != NULL);\r
 \r
   for (Index = 0; Index < BootOrderSize / sizeof (UINT16); Index++) {\r
-\r
     UnicodeSPrint (OptionName, sizeof (OptionName), L"Boot%04x", BootOrder[Index]);\r
     Status = EfiBootManagerVariableToLoadOption (OptionName, &BootOption);\r
     ASSERT_EFI_ERROR (Status);\r
 \r
     if ((DevicePathType (BootOption.FilePath) == BBS_DEVICE_PATH) &&\r
-        (DevicePathSubType (BootOption.FilePath) == BBS_BBS_DP)) {\r
+        (DevicePathSubType (BootOption.FilePath) == BBS_BBS_DP))\r
+    {\r
       //\r
       // Legacy Boot Option\r
       //\r
       ASSERT (BootOption.OptionalDataSize == sizeof (LEGACY_BOOT_OPTION_BBS_DATA));\r
 \r
-      DeviceTypeArray[Index] = ((BBS_BBS_DEVICE_PATH *) BootOption.FilePath)->DeviceType;\r
-      BbsIndexArray  [Index] = ((LEGACY_BOOT_OPTION_BBS_DATA *) BootOption.OptionalData)->BbsIndex;\r
+      DeviceTypeArray[Index] = ((BBS_BBS_DEVICE_PATH *)BootOption.FilePath)->DeviceType;\r
+      BbsIndexArray[Index]   = ((LEGACY_BOOT_OPTION_BBS_DATA *)BootOption.OptionalData)->BbsIndex;\r
     } else {\r
       DeviceTypeArray[Index] = BBS_TYPE_UNKNOWN;\r
-      BbsIndexArray  [Index] = 0xFFFF;\r
+      BbsIndexArray[Index]   = 0xFFFF;\r
     }\r
+\r
     EfiBootManagerFreeLoadOption (&BootOption);\r
   }\r
 \r
@@ -201,7 +198,7 @@ OrderLegacyBootOption4SameType (
   while (DevOrderCount-- != 0) {\r
     for (Index = 0; Index < BootOrderSize / sizeof (UINT16); Index++) {\r
       if (BbsIndexArray[Index] == (DevOrder[DevOrderCount] & 0xFF)) {\r
-        StartPosition = MIN (StartPosition, Index);\r
+        StartPosition                = MIN (StartPosition, Index);\r
         NewBootOption[DevOrderCount] = BootOrder[Index];\r
 \r
         if ((DevOrder[DevOrderCount] & 0xFF00) == 0xFF00) {\r
@@ -211,6 +208,7 @@ OrderLegacyBootOption4SameType (
           (*EnBootOption)[*EnBootOptionCount] = BootOrder[Index];\r
           (*EnBootOptionCount)++;\r
         }\r
+\r
         break;\r
       }\r
     }\r
@@ -249,93 +247,92 @@ OrderLegacyBootOption4SameType (
 **/\r
 EFI_STATUS\r
 UpdateBBSOption (\r
-  IN LEGACY_BOOT_NV_DATA            *NVMapData\r
+  IN LEGACY_BOOT_NV_DATA  *NVMapData\r
   )\r
 {\r
-  UINTN                       Index;\r
-  UINTN                       Index2;\r
-  UINTN                       CurrentType;\r
-  VOID                        *BootOptionVar;\r
-  CHAR16                      VarName[100];\r
-  UINTN                       OptionSize;\r
-  EFI_STATUS                  Status;\r
-  UINT32                      *Attribute;\r
-  LEGACY_MENU_OPTION          *OptionMenu;\r
-  UINT16                      *LegacyDev;\r
-  UINT16                      *InitialLegacyDev;\r
-  UINT8                       *VarData;\r
-  UINTN                       VarSize;\r
-  LEGACY_DEV_ORDER_ENTRY      *DevOrder;\r
-  UINT8                       *OriginalPtr;\r
-  UINT8                       *DisMap;\r
-  UINTN                       Pos;\r
-  UINTN                       Bit;\r
-  UINT16                      *NewOrder;\r
-  UINT16                      Tmp;\r
-  UINT16                      *EnBootOption;\r
-  UINTN                       EnBootOptionCount;\r
-  UINT16                      *DisBootOption;\r
-  UINTN                       DisBootOptionCount;\r
-  UINTN                       BufferSize;\r
-\r
-\r
-  DisMap              = NULL;\r
-  NewOrder            = NULL;\r
-  CurrentType         = 0;\r
-  EnBootOption        = NULL;\r
-  DisBootOption       = NULL;\r
-\r
-\r
-  DisMap  = mLegacyBootOptionPrivate->MaintainMapData->DisableMap;\r
-  Status  = EFI_SUCCESS;\r
+  UINTN                   Index;\r
+  UINTN                   Index2;\r
+  UINTN                   CurrentType;\r
+  VOID                    *BootOptionVar;\r
+  CHAR16                  VarName[100];\r
+  UINTN                   OptionSize;\r
+  EFI_STATUS              Status;\r
+  UINT32                  *Attribute;\r
+  LEGACY_MENU_OPTION      *OptionMenu;\r
+  UINT16                  *LegacyDev;\r
+  UINT16                  *InitialLegacyDev;\r
+  UINT8                   *VarData;\r
+  UINTN                   VarSize;\r
+  LEGACY_DEV_ORDER_ENTRY  *DevOrder;\r
+  UINT8                   *OriginalPtr;\r
+  UINT8                   *DisMap;\r
+  UINTN                   Pos;\r
+  UINTN                   Bit;\r
+  UINT16                  *NewOrder;\r
+  UINT16                  Tmp;\r
+  UINT16                  *EnBootOption;\r
+  UINTN                   EnBootOptionCount;\r
+  UINT16                  *DisBootOption;\r
+  UINTN                   DisBootOptionCount;\r
+  UINTN                   BufferSize;\r
+\r
+  DisMap        = NULL;\r
+  NewOrder      = NULL;\r
+  CurrentType   = 0;\r
+  EnBootOption  = NULL;\r
+  DisBootOption = NULL;\r
+\r
+  DisMap = mLegacyBootOptionPrivate->MaintainMapData->DisableMap;\r
+  Status = EFI_SUCCESS;\r
 \r
   //\r
   // Update the Variable "LegacyDevOrder"\r
   //\r
-  GetVariable2 (VAR_LEGACY_DEV_ORDER, &gEfiLegacyDevOrderVariableGuid, (VOID **) &VarData, &VarSize);\r
+  GetVariable2 (VAR_LEGACY_DEV_ORDER, &gEfiLegacyDevOrderVariableGuid, (VOID **)&VarData, &VarSize);\r
   if (VarData == NULL) {\r
     return EFI_NOT_FOUND;\r
   }\r
+\r
   OriginalPtr = VarData;\r
 \r
   while (mBbsType[CurrentType] != BBS_UNKNOWN) {\r
     switch (mBbsType[CurrentType]) {\r
-    case BBS_FLOPPY:\r
-      OptionMenu            = (LEGACY_MENU_OPTION *) &LegacyFDMenu;\r
-      LegacyDev             = NVMapData->LegacyFD;\r
-      InitialLegacyDev     = mLegacyBootOptionPrivate->MaintainMapData->InitialNvData.LegacyFD;\r
-      BufferSize            = sizeof (NVMapData->LegacyFD);\r
-      break;\r
+      case BBS_FLOPPY:\r
+        OptionMenu       = (LEGACY_MENU_OPTION *)&LegacyFDMenu;\r
+        LegacyDev        = NVMapData->LegacyFD;\r
+        InitialLegacyDev = mLegacyBootOptionPrivate->MaintainMapData->InitialNvData.LegacyFD;\r
+        BufferSize       = sizeof (NVMapData->LegacyFD);\r
+        break;\r
 \r
-    case BBS_HARDDISK:\r
-      OptionMenu            = (LEGACY_MENU_OPTION *) &LegacyHDMenu;\r
-      LegacyDev             = NVMapData->LegacyHD;\r
-      InitialLegacyDev     = mLegacyBootOptionPrivate->MaintainMapData->InitialNvData.LegacyHD;\r
+      case BBS_HARDDISK:\r
+        OptionMenu       = (LEGACY_MENU_OPTION *)&LegacyHDMenu;\r
+        LegacyDev        = NVMapData->LegacyHD;\r
+        InitialLegacyDev = mLegacyBootOptionPrivate->MaintainMapData->InitialNvData.LegacyHD;\r
 \r
-      BufferSize            = sizeof (NVMapData->LegacyHD);\r
-      break;\r
+        BufferSize = sizeof (NVMapData->LegacyHD);\r
+        break;\r
 \r
-    case BBS_CDROM:\r
-      OptionMenu            = (LEGACY_MENU_OPTION *) &LegacyCDMenu;\r
-      LegacyDev             = NVMapData->LegacyCD;\r
-      InitialLegacyDev     = mLegacyBootOptionPrivate->MaintainMapData->InitialNvData.LegacyCD;\r
-      BufferSize            = sizeof (NVMapData->LegacyCD);\r
-      break;\r
+      case BBS_CDROM:\r
+        OptionMenu       = (LEGACY_MENU_OPTION *)&LegacyCDMenu;\r
+        LegacyDev        = NVMapData->LegacyCD;\r
+        InitialLegacyDev = mLegacyBootOptionPrivate->MaintainMapData->InitialNvData.LegacyCD;\r
+        BufferSize       = sizeof (NVMapData->LegacyCD);\r
+        break;\r
 \r
-    case BBS_EMBED_NETWORK:\r
-      OptionMenu            = (LEGACY_MENU_OPTION *) &LegacyNETMenu;\r
-      LegacyDev             = NVMapData->LegacyNET;\r
-      InitialLegacyDev     = mLegacyBootOptionPrivate->MaintainMapData->InitialNvData.LegacyNET;\r
-      BufferSize            = sizeof (NVMapData->LegacyNET);\r
-      break;\r
+      case BBS_EMBED_NETWORK:\r
+        OptionMenu       = (LEGACY_MENU_OPTION *)&LegacyNETMenu;\r
+        LegacyDev        = NVMapData->LegacyNET;\r
+        InitialLegacyDev = mLegacyBootOptionPrivate->MaintainMapData->InitialNvData.LegacyNET;\r
+        BufferSize       = sizeof (NVMapData->LegacyNET);\r
+        break;\r
 \r
-    default:\r
-      ASSERT (mBbsType[CurrentType] == BBS_BEV_DEVICE);\r
-      OptionMenu            = (LEGACY_MENU_OPTION *) &LegacyBEVMenu;\r
-      LegacyDev             = NVMapData->LegacyBEV;\r
-      InitialLegacyDev     = mLegacyBootOptionPrivate->MaintainMapData->InitialNvData.LegacyBEV;\r
-      BufferSize            = sizeof (NVMapData->LegacyBEV);\r
-      break;\r
+      default:\r
+        ASSERT (mBbsType[CurrentType] == BBS_BEV_DEVICE);\r
+        OptionMenu       = (LEGACY_MENU_OPTION *)&LegacyBEVMenu;\r
+        LegacyDev        = NVMapData->LegacyBEV;\r
+        InitialLegacyDev = mLegacyBootOptionPrivate->MaintainMapData->InitialNvData.LegacyBEV;\r
+        BufferSize       = sizeof (NVMapData->LegacyBEV);\r
+        break;\r
     }\r
 \r
     //\r
@@ -346,14 +343,14 @@ UpdateBBSOption (
       continue;\r
     }\r
 \r
-    DevOrder    = (LEGACY_DEV_ORDER_ENTRY *) OriginalPtr;\r
+    DevOrder = (LEGACY_DEV_ORDER_ENTRY *)OriginalPtr;\r
     while (VarData < OriginalPtr + VarSize) {\r
       if (DevOrder->BbsType == mBbsType[CurrentType]) {\r
         break;\r
       }\r
 \r
       VarData += sizeof (BBS_TYPE) + DevOrder->Length;\r
-      DevOrder = (LEGACY_DEV_ORDER_ENTRY *) VarData;\r
+      DevOrder = (LEGACY_DEV_ORDER_ENTRY *)VarData;\r
     }\r
 \r
     if (VarData >= OriginalPtr + VarSize) {\r
@@ -382,11 +379,11 @@ UpdateBBSOption (
     // so we use DisMap to set en/dis state of each item in NewOrder array\r
     //\r
     for (Index2 = 0; Index2 < OptionMenu->MenuNumber; Index2++) {\r
-      Tmp = (UINT16) (DevOrder->Data[Index2] & 0xFF);\r
+      Tmp = (UINT16)(DevOrder->Data[Index2] & 0xFF);\r
       Pos = Tmp / 8;\r
       Bit = 7 - (Tmp % 8);\r
       if ((DisMap[Pos] & (1 << Bit)) != 0) {\r
-        NewOrder[Index] = (UINT16) (0xFF00 | Tmp);\r
+        NewOrder[Index] = (UINT16)(0xFF00 | Tmp);\r
         Index++;\r
       }\r
     }\r
@@ -406,25 +403,25 @@ UpdateBBSOption (
     ASSERT (OptionMenu->MenuNumber == DevOrder->Length / sizeof (UINT16) - 1);\r
 \r
     Status = OrderLegacyBootOption4SameType (\r
-      DevOrder->Data,\r
-      DevOrder->Length / sizeof (UINT16) - 1,\r
-      &EnBootOption,\r
-      &EnBootOptionCount,\r
-      &DisBootOption,\r
-      &DisBootOptionCount\r
-      );\r
-     if (EFI_ERROR(Status)) {\r
-       goto Fail;\r
-     }\r
+               DevOrder->Data,\r
+               DevOrder->Length / sizeof (UINT16) - 1,\r
+               &EnBootOption,\r
+               &EnBootOptionCount,\r
+               &DisBootOption,\r
+               &DisBootOptionCount\r
+               );\r
+    if (EFI_ERROR (Status)) {\r
+      goto Fail;\r
+    }\r
 \r
     //\r
     // 2. Deactivate the DisBootOption and activate the EnBootOption\r
     //\r
     for (Index = 0; Index < DisBootOptionCount; Index++) {\r
       UnicodeSPrint (VarName, sizeof (VarName), L"Boot%04x", DisBootOption[Index]);\r
-      GetEfiGlobalVariable2 (VarName, (VOID **) &BootOptionVar, &OptionSize);\r
+      GetEfiGlobalVariable2 (VarName, (VOID **)&BootOptionVar, &OptionSize);\r
       if (BootOptionVar != NULL) {\r
-        Attribute   = (UINT32 *) BootOptionVar;\r
+        Attribute   = (UINT32 *)BootOptionVar;\r
         *Attribute &= ~LOAD_OPTION_ACTIVE;\r
 \r
         Status = gRT->SetVariable (\r
@@ -441,9 +438,9 @@ UpdateBBSOption (
 \r
     for (Index = 0; Index < EnBootOptionCount; Index++) {\r
       UnicodeSPrint (VarName, sizeof (VarName), L"Boot%04x", EnBootOption[Index]);\r
-      GetEfiGlobalVariable2 (VarName, (VOID **) &BootOptionVar, &OptionSize);\r
+      GetEfiGlobalVariable2 (VarName, (VOID **)&BootOptionVar, &OptionSize);\r
       if (BootOptionVar != NULL) {\r
-        Attribute   = (UINT32 *) BootOptionVar;\r
+        Attribute   = (UINT32 *)BootOptionVar;\r
         *Attribute |= LOAD_OPTION_ACTIVE;\r
 \r
         Status = gRT->SetVariable (\r
@@ -458,7 +455,6 @@ UpdateBBSOption (
       }\r
     }\r
 \r
-\r
     FreePool (EnBootOption);\r
     FreePool (DisBootOption);\r
 \r
@@ -511,15 +507,16 @@ Fail:
 EFI_STATUS\r
 EFIAPI\r
 LegacyBootOptionExtractConfig (\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
-  if (Progress == NULL || Results == NULL) {\r
+  if ((Progress == NULL) || (Results == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
+\r
   *Progress = Request;\r
   return EFI_NOT_FOUND;\r
 }\r
@@ -543,18 +540,17 @@ LegacyBootOptionExtractConfig (
 EFI_STATUS\r
 EFIAPI\r
 LegacyBootOptionRouteConfig (\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
-  EFI_HII_CONFIG_ROUTING_PROTOCOL *ConfigRouting;\r
-  LEGACY_BOOT_NV_DATA             *CurrentNVMapData;\r
-  UINTN                           BufferSize;\r
+  EFI_STATUS                       Status;\r
+  EFI_HII_CONFIG_ROUTING_PROTOCOL  *ConfigRouting;\r
+  LEGACY_BOOT_NV_DATA              *CurrentNVMapData;\r
+  UINTN                            BufferSize;\r
 \r
-\r
-  if (Configuration == NULL || Progress == NULL) {\r
+  if ((Configuration == NULL) || (Progress == NULL)) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -571,7 +567,7 @@ LegacyBootOptionRouteConfig (
   Status = gBS->LocateProtocol (\r
                   &gEfiHiiConfigRoutingProtocolGuid,\r
                   NULL,\r
-                  (VOID **) &ConfigRouting\r
+                  (VOID **)&ConfigRouting\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
@@ -581,13 +577,13 @@ LegacyBootOptionRouteConfig (
   // Convert <ConfigResp> to buffer data by helper function ConfigToBlock()\r
   //\r
   CurrentNVMapData = &mLegacyBootOptionPrivate->MaintainMapData->CurrentNvData;\r
-  Status = ConfigRouting->ConfigToBlock (\r
-                            ConfigRouting,\r
-                            Configuration,\r
-                            (UINT8 *) CurrentNVMapData,\r
-                            &BufferSize,\r
-                            Progress\r
-                            );\r
+  Status           = ConfigRouting->ConfigToBlock (\r
+                                      ConfigRouting,\r
+                                      Configuration,\r
+                                      (UINT8 *)CurrentNVMapData,\r
+                                      &BufferSize,\r
+                                      Progress\r
+                                      );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
   Status = UpdateBBSOption (CurrentNVMapData);\r
@@ -610,6 +606,7 @@ RefreshLegacyUpdateData (
   if (mLegacyStartOpCodeHandle != NULL) {\r
     HiiFreeOpCodeHandle (mLegacyStartOpCodeHandle);\r
   }\r
+\r
   if (mLegacyEndOpCodeHandle != NULL) {\r
     HiiFreeOpCodeHandle (mLegacyEndOpCodeHandle);\r
   }\r
@@ -618,17 +615,17 @@ RefreshLegacyUpdateData (
   // Create new OpCode Handle\r
   //\r
   mLegacyStartOpCodeHandle = HiiAllocateOpCodeHandle ();\r
-  mLegacyEndOpCodeHandle = HiiAllocateOpCodeHandle ();\r
+  mLegacyEndOpCodeHandle   = HiiAllocateOpCodeHandle ();\r
 \r
   //\r
   // Create Hii Extend Label OpCode as the start opcode\r
   //\r
-  mLegacyStartLabel = (EFI_IFR_GUID_LABEL *) HiiCreateGuidOpCode (\r
-                                         mLegacyStartOpCodeHandle,\r
-                                         &gEfiIfrTianoGuid,\r
-                                         NULL,\r
-                                         sizeof (EFI_IFR_GUID_LABEL)\r
-                                         );\r
+  mLegacyStartLabel = (EFI_IFR_GUID_LABEL *)HiiCreateGuidOpCode (\r
+                                              mLegacyStartOpCodeHandle,\r
+                                              &gEfiIfrTianoGuid,\r
+                                              NULL,\r
+                                              sizeof (EFI_IFR_GUID_LABEL)\r
+                                              );\r
   mLegacyStartLabel->ExtendOpCode = EFI_IFR_EXTEND_OP_LABEL;\r
 \r
   mLegacyStartLabel->Number = FORM_BOOT_LEGACY_DEVICE_ID;\r
@@ -636,16 +633,15 @@ RefreshLegacyUpdateData (
   //\r
   // Create Hii Extend Label OpCode as the start opcode\r
   //\r
-  mLegacyEndLabel = (EFI_IFR_GUID_LABEL *) HiiCreateGuidOpCode (\r
-                                         mLegacyEndOpCodeHandle,\r
-                                         &gEfiIfrTianoGuid,\r
-                                         NULL,\r
-                                         sizeof (EFI_IFR_GUID_LABEL)\r
-                                         );\r
+  mLegacyEndLabel = (EFI_IFR_GUID_LABEL *)HiiCreateGuidOpCode (\r
+                                            mLegacyEndOpCodeHandle,\r
+                                            &gEfiIfrTianoGuid,\r
+                                            NULL,\r
+                                            sizeof (EFI_IFR_GUID_LABEL)\r
+                                            );\r
   mLegacyEndLabel->ExtendOpCode = EFI_IFR_EXTEND_OP_LABEL;\r
 \r
   mLegacyEndLabel->Number = FORM_BOOT_LEGACY_LABEL_END;\r
-\r
 }\r
 \r
 /**\r
@@ -662,13 +658,13 @@ RefreshLegacyUpdateData (
 **/\r
 LEGACY_MENU_ENTRY *\r
 GetMenuEntry (\r
-  LEGACY_MENU_OPTION      *MenuOption,\r
-  UINTN                   MenuNumber\r
+  LEGACY_MENU_OPTION  *MenuOption,\r
+  UINTN               MenuNumber\r
   )\r
 {\r
-  LEGACY_MENU_ENTRY   *NewMenuEntry;\r
-  UINTN               Index;\r
-  LIST_ENTRY          *List;\r
+  LEGACY_MENU_ENTRY  *NewMenuEntry;\r
+  UINTN              Index;\r
+  LIST_ENTRY         *List;\r
 \r
   ASSERT (MenuNumber < MenuOption->MenuNumber);\r
 \r
@@ -691,12 +687,12 @@ GetMenuEntry (
 **/\r
 VOID\r
 CreateLegacyMenuStringToken (\r
-  IN EFI_HII_HANDLE                   HiiHandle,\r
-  IN LEGACY_MENU_OPTION               *MenuOption\r
+  IN EFI_HII_HANDLE      HiiHandle,\r
+  IN LEGACY_MENU_OPTION  *MenuOption\r
   )\r
 {\r
-  LEGACY_MENU_ENTRY *NewMenuEntry;\r
-  UINTN             Index;\r
+  LEGACY_MENU_ENTRY  *NewMenuEntry;\r
+  UINTN              Index;\r
 \r
   for (Index = 0; Index < MenuOption->MenuNumber; Index++) {\r
     NewMenuEntry = GetMenuEntry (MenuOption, Index);\r
@@ -731,22 +727,22 @@ CreateLegacyMenuStringToken (
 **/\r
 VOID\r
 UpdateLegacyDeviceOrderPage (\r
-  IN UINT16                           UpdatePageId\r
+  IN UINT16  UpdatePageId\r
   )\r
 {\r
-  LEGACY_MENU_OPTION          *OptionMenu;\r
-  LEGACY_MENU_ENTRY           *NewMenuEntry;\r
-  EFI_STRING_ID               StrRef;\r
-  EFI_STRING_ID               StrRefHelp;\r
-  UINT16                      *Default;\r
-  UINT16                      Index;\r
-  UINT16                      Key;\r
-  CHAR16                      String[100];\r
-  CHAR16                      *TypeStr;\r
-  CHAR16                      *TypeStrHelp;\r
-  CHAR16                      *FormTitle;\r
-  VOID                        *OptionsOpCodeHandle;\r
-  VOID                        *DefaultOpCodeHandle;\r
+  LEGACY_MENU_OPTION  *OptionMenu;\r
+  LEGACY_MENU_ENTRY   *NewMenuEntry;\r
+  EFI_STRING_ID       StrRef;\r
+  EFI_STRING_ID       StrRefHelp;\r
+  UINT16              *Default;\r
+  UINT16              Index;\r
+  UINT16              Key;\r
+  CHAR16              String[100];\r
+  CHAR16              *TypeStr;\r
+  CHAR16              *TypeStrHelp;\r
+  CHAR16              *FormTitle;\r
+  VOID                *OptionsOpCodeHandle;\r
+  VOID                *DefaultOpCodeHandle;\r
 \r
   Key         = 0;\r
   StrRef      = 0;\r
@@ -756,70 +752,69 @@ UpdateLegacyDeviceOrderPage (
   TypeStrHelp = NULL;\r
   Default     = NULL;\r
 \r
-  RefreshLegacyUpdateData();\r
+  RefreshLegacyUpdateData ();\r
 \r
   //\r
   // Create oneof option list\r
   //\r
   switch (UpdatePageId) {\r
-  case FORM_FLOPPY_BOOT_ID:\r
-    OptionMenu  = (LEGACY_MENU_OPTION *) &LegacyFDMenu;\r
-    Key         = (UINT16) LEGACY_FD_QUESTION_ID;\r
-    TypeStr     = STR_FLOPPY;\r
-    TypeStrHelp = STR_FLOPPY_HELP;\r
-    FormTitle   = STR_FLOPPY_TITLE;\r
-    Default     = mLegacyBootOptionPrivate->MaintainMapData->CurrentNvData.LegacyFD;\r
-    break;\r
-\r
-  case FORM_HARDDISK_BOOT_ID:\r
-    OptionMenu  = (LEGACY_MENU_OPTION *) &LegacyHDMenu;\r
-    Key         = (UINT16) LEGACY_HD_QUESTION_ID;\r
-    TypeStr     = STR_HARDDISK;\r
-    TypeStrHelp = STR_HARDDISK_HELP;\r
-    FormTitle   = STR_HARDDISK_TITLE;\r
-    Default     = mLegacyBootOptionPrivate->MaintainMapData->CurrentNvData.LegacyHD;\r
-    break;\r
-\r
-  case FORM_CDROM_BOOT_ID:\r
-    OptionMenu  = (LEGACY_MENU_OPTION *) &LegacyCDMenu;\r
-    Key         = (UINT16) LEGACY_CD_QUESTION_ID;\r
-    TypeStr     = STR_CDROM;\r
-    TypeStrHelp = STR_CDROM_HELP;\r
-    FormTitle   = STR_CDROM_TITLE;\r
-    Default     = mLegacyBootOptionPrivate->MaintainMapData->CurrentNvData.LegacyCD;\r
-    break;\r
-\r
-  case FORM_NET_BOOT_ID:\r
-    OptionMenu  = (LEGACY_MENU_OPTION *) &LegacyNETMenu;\r
-    Key         = (UINT16) LEGACY_NET_QUESTION_ID;\r
-    TypeStr     = STR_NET;\r
-    TypeStrHelp = STR_NET_HELP;\r
-    FormTitle   = STR_NET_TITLE;\r
-    Default     = mLegacyBootOptionPrivate->MaintainMapData->CurrentNvData.LegacyNET;\r
-    break;\r
-\r
-  case FORM_BEV_BOOT_ID:\r
-    OptionMenu  = (LEGACY_MENU_OPTION *) &LegacyBEVMenu;\r
-    Key         = (UINT16) LEGACY_BEV_QUESTION_ID;\r
-    TypeStr     = STR_BEV;\r
-    TypeStrHelp = STR_BEV_HELP;\r
-    FormTitle   = STR_BEV_TITLE;\r
-    Default     = mLegacyBootOptionPrivate->MaintainMapData->CurrentNvData.LegacyBEV;\r
-    break;\r
-\r
-  default:\r
-    DEBUG ((DEBUG_ERROR, "Invalid command ID for updating page!\n"));\r
-    return;\r
+    case FORM_FLOPPY_BOOT_ID:\r
+      OptionMenu  = (LEGACY_MENU_OPTION *)&LegacyFDMenu;\r
+      Key         = (UINT16)LEGACY_FD_QUESTION_ID;\r
+      TypeStr     = STR_FLOPPY;\r
+      TypeStrHelp = STR_FLOPPY_HELP;\r
+      FormTitle   = STR_FLOPPY_TITLE;\r
+      Default     = mLegacyBootOptionPrivate->MaintainMapData->CurrentNvData.LegacyFD;\r
+      break;\r
+\r
+    case FORM_HARDDISK_BOOT_ID:\r
+      OptionMenu  = (LEGACY_MENU_OPTION *)&LegacyHDMenu;\r
+      Key         = (UINT16)LEGACY_HD_QUESTION_ID;\r
+      TypeStr     = STR_HARDDISK;\r
+      TypeStrHelp = STR_HARDDISK_HELP;\r
+      FormTitle   = STR_HARDDISK_TITLE;\r
+      Default     = mLegacyBootOptionPrivate->MaintainMapData->CurrentNvData.LegacyHD;\r
+      break;\r
+\r
+    case FORM_CDROM_BOOT_ID:\r
+      OptionMenu  = (LEGACY_MENU_OPTION *)&LegacyCDMenu;\r
+      Key         = (UINT16)LEGACY_CD_QUESTION_ID;\r
+      TypeStr     = STR_CDROM;\r
+      TypeStrHelp = STR_CDROM_HELP;\r
+      FormTitle   = STR_CDROM_TITLE;\r
+      Default     = mLegacyBootOptionPrivate->MaintainMapData->CurrentNvData.LegacyCD;\r
+      break;\r
+\r
+    case FORM_NET_BOOT_ID:\r
+      OptionMenu  = (LEGACY_MENU_OPTION *)&LegacyNETMenu;\r
+      Key         = (UINT16)LEGACY_NET_QUESTION_ID;\r
+      TypeStr     = STR_NET;\r
+      TypeStrHelp = STR_NET_HELP;\r
+      FormTitle   = STR_NET_TITLE;\r
+      Default     = mLegacyBootOptionPrivate->MaintainMapData->CurrentNvData.LegacyNET;\r
+      break;\r
+\r
+    case FORM_BEV_BOOT_ID:\r
+      OptionMenu  = (LEGACY_MENU_OPTION *)&LegacyBEVMenu;\r
+      Key         = (UINT16)LEGACY_BEV_QUESTION_ID;\r
+      TypeStr     = STR_BEV;\r
+      TypeStrHelp = STR_BEV_HELP;\r
+      FormTitle   = STR_BEV_TITLE;\r
+      Default     = mLegacyBootOptionPrivate->MaintainMapData->CurrentNvData.LegacyBEV;\r
+      break;\r
+\r
+    default:\r
+      DEBUG ((DEBUG_ERROR, "Invalid command ID for updating page!\n"));\r
+      return;\r
   }\r
 \r
-  HiiSetString (mLegacyBootOptionPrivate->HiiHandle, STRING_TOKEN(STR_ORDER_CHANGE_PROMPT), FormTitle, NULL);\r
+  HiiSetString (mLegacyBootOptionPrivate->HiiHandle, STRING_TOKEN (STR_ORDER_CHANGE_PROMPT), FormTitle, NULL);\r
 \r
   CreateLegacyMenuStringToken (mLegacyBootOptionPrivate->HiiHandle, OptionMenu);\r
 \r
   OptionsOpCodeHandle = HiiAllocateOpCodeHandle ();\r
   ASSERT (OptionsOpCodeHandle != NULL);\r
 \r
-\r
   for (Index = 0; Index < OptionMenu->MenuNumber; Index++) {\r
     NewMenuEntry = GetMenuEntry (OptionMenu, Index);\r
     //\r
@@ -830,7 +825,7 @@ UpdateLegacyDeviceOrderPage (
       NewMenuEntry->DisplayStringToken,\r
       0,\r
       EFI_IFR_TYPE_NUM_SIZE_16,\r
-      ((LEGACY_DEVICE_CONTEXT *) NewMenuEntry->VariableContext)->BbsIndex\r
+      ((LEGACY_DEVICE_CONTEXT *)NewMenuEntry->VariableContext)->BbsIndex\r
       );\r
   }\r
 \r
@@ -870,15 +865,15 @@ UpdateLegacyDeviceOrderPage (
 \r
     HiiCreateOneOfOpCode (\r
       mLegacyStartOpCodeHandle,\r
-      (EFI_QUESTION_ID) (Key + Index),\r
+      (EFI_QUESTION_ID)(Key + Index),\r
       VARSTORE_ID_LEGACY_BOOT,\r
-      (UINT16) (Key + Index * 2 - CONFIG_OPTION_OFFSET),\r
+      (UINT16)(Key + Index * 2 - CONFIG_OPTION_OFFSET),\r
       StrRef,\r
       StrRefHelp,\r
       EFI_IFR_FLAG_CALLBACK,\r
       EFI_IFR_NUMERIC_SIZE_2,\r
       OptionsOpCodeHandle,\r
-      DefaultOpCodeHandle //NULL //\r
+      DefaultOpCodeHandle // NULL //\r
       );\r
 \r
     HiiFreeOpCodeHandle (DefaultOpCodeHandle);\r
@@ -895,7 +890,6 @@ UpdateLegacyDeviceOrderPage (
   HiiFreeOpCodeHandle (OptionsOpCodeHandle);\r
 }\r
 \r
-\r
 /**\r
   Adjust question value when one question value has been changed.\r
 \r
@@ -905,30 +899,30 @@ UpdateLegacyDeviceOrderPage (
 **/\r
 VOID\r
 AdjustOptionValue (\r
-  IN  UINT16                                 QuestionId,\r
-  IN  EFI_IFR_TYPE_VALUE                     *Value\r
+  IN  UINT16              QuestionId,\r
+  IN  EFI_IFR_TYPE_VALUE  *Value\r
   )\r
 {\r
-  UINTN                       Number;\r
-  UINT16                      *Default;\r
-  LEGACY_BOOT_NV_DATA         *CurrentNVMap;\r
-  UINT16                      *CurrentVal;\r
-  UINTN                       Index;\r
-  UINTN                       Index2;\r
-  UINTN                       Index3;\r
-  UINTN                       NewValuePos;\r
-  UINTN                       OldValue;\r
-  UINTN                       NewValue;\r
-  UINT8                       *DisMap;\r
-  UINTN                       Pos;\r
-  UINTN                       Bit;\r
-\r
-  Number = 0;\r
-  CurrentVal = 0;\r
-  Default = NULL;\r
-  NewValue = 0;\r
+  UINTN                Number;\r
+  UINT16               *Default;\r
+  LEGACY_BOOT_NV_DATA  *CurrentNVMap;\r
+  UINT16               *CurrentVal;\r
+  UINTN                Index;\r
+  UINTN                Index2;\r
+  UINTN                Index3;\r
+  UINTN                NewValuePos;\r
+  UINTN                OldValue;\r
+  UINTN                NewValue;\r
+  UINT8                *DisMap;\r
+  UINTN                Pos;\r
+  UINTN                Bit;\r
+\r
+  Number      = 0;\r
+  CurrentVal  = 0;\r
+  Default     = NULL;\r
+  NewValue    = 0;\r
   NewValuePos = 0;\r
-  OldValue = 0;\r
+  OldValue    = 0;\r
 \r
   //\r
   // Update Select FD/HD/CD/NET/BEV Order Form\r
@@ -936,29 +930,29 @@ AdjustOptionValue (
   ASSERT ((QuestionId >= LEGACY_FD_QUESTION_ID) && (QuestionId < LEGACY_BEV_QUESTION_ID + MAX_MENU_NUMBER));\r
 \r
   CurrentNVMap = &mLegacyBootOptionPrivate->MaintainMapData->CurrentNvData;\r
-  HiiGetBrowserData (&mLegacyBootOptionGuid, mLegacyBootStorageName, sizeof (LEGACY_BOOT_NV_DATA), (UINT8 *) CurrentNVMap);\r
-  DisMap  = mLegacyBootOptionPrivate->MaintainMapData->DisableMap;\r
-\r
-  if (QuestionId >= LEGACY_FD_QUESTION_ID && QuestionId < LEGACY_FD_QUESTION_ID + MAX_MENU_NUMBER) {\r
-    Number      = (UINT16) LegacyFDMenu.MenuNumber;\r
-    CurrentVal  = CurrentNVMap->LegacyFD;\r
-    Default     = mLegacyBootOptionPrivate->MaintainMapData->LastTimeNvData.LegacyFD;\r
-  } else if (QuestionId >= LEGACY_HD_QUESTION_ID && QuestionId < LEGACY_HD_QUESTION_ID + MAX_MENU_NUMBER) {\r
-    Number      = (UINT16) LegacyHDMenu.MenuNumber;\r
-    CurrentVal  = CurrentNVMap->LegacyHD;\r
-    Default     = mLegacyBootOptionPrivate->MaintainMapData->LastTimeNvData.LegacyHD;\r
-  } else if (QuestionId >= LEGACY_CD_QUESTION_ID && QuestionId < LEGACY_CD_QUESTION_ID + MAX_MENU_NUMBER) {\r
-    Number      = (UINT16) LegacyCDMenu.MenuNumber;\r
-    CurrentVal  = CurrentNVMap->LegacyCD;\r
-    Default     = mLegacyBootOptionPrivate->MaintainMapData->LastTimeNvData.LegacyCD;\r
-  } else if (QuestionId >= LEGACY_NET_QUESTION_ID && QuestionId < LEGACY_NET_QUESTION_ID + MAX_MENU_NUMBER) {\r
-    Number      = (UINT16) LegacyNETMenu.MenuNumber;\r
-    CurrentVal  = CurrentNVMap->LegacyNET;\r
-    Default     = mLegacyBootOptionPrivate->MaintainMapData->LastTimeNvData.LegacyNET;\r
-  } else if (QuestionId >= LEGACY_BEV_QUESTION_ID && QuestionId < LEGACY_BEV_QUESTION_ID + MAX_MENU_NUMBER) {\r
-    Number      = (UINT16) LegacyBEVMenu.MenuNumber;\r
-    CurrentVal  = CurrentNVMap->LegacyBEV;\r
-    Default     = mLegacyBootOptionPrivate->MaintainMapData->LastTimeNvData.LegacyBEV;\r
+  HiiGetBrowserData (&mLegacyBootOptionGuid, mLegacyBootStorageName, sizeof (LEGACY_BOOT_NV_DATA), (UINT8 *)CurrentNVMap);\r
+  DisMap = mLegacyBootOptionPrivate->MaintainMapData->DisableMap;\r
+\r
+  if ((QuestionId >= LEGACY_FD_QUESTION_ID) && (QuestionId < LEGACY_FD_QUESTION_ID + MAX_MENU_NUMBER)) {\r
+    Number     = (UINT16)LegacyFDMenu.MenuNumber;\r
+    CurrentVal = CurrentNVMap->LegacyFD;\r
+    Default    = mLegacyBootOptionPrivate->MaintainMapData->LastTimeNvData.LegacyFD;\r
+  } else if ((QuestionId >= LEGACY_HD_QUESTION_ID) && (QuestionId < LEGACY_HD_QUESTION_ID + MAX_MENU_NUMBER)) {\r
+    Number     = (UINT16)LegacyHDMenu.MenuNumber;\r
+    CurrentVal = CurrentNVMap->LegacyHD;\r
+    Default    = mLegacyBootOptionPrivate->MaintainMapData->LastTimeNvData.LegacyHD;\r
+  } else if ((QuestionId >= LEGACY_CD_QUESTION_ID) && (QuestionId < LEGACY_CD_QUESTION_ID + MAX_MENU_NUMBER)) {\r
+    Number     = (UINT16)LegacyCDMenu.MenuNumber;\r
+    CurrentVal = CurrentNVMap->LegacyCD;\r
+    Default    = mLegacyBootOptionPrivate->MaintainMapData->LastTimeNvData.LegacyCD;\r
+  } else if ((QuestionId >= LEGACY_NET_QUESTION_ID) && (QuestionId < LEGACY_NET_QUESTION_ID + MAX_MENU_NUMBER)) {\r
+    Number     = (UINT16)LegacyNETMenu.MenuNumber;\r
+    CurrentVal = CurrentNVMap->LegacyNET;\r
+    Default    = mLegacyBootOptionPrivate->MaintainMapData->LastTimeNvData.LegacyNET;\r
+  } else if ((QuestionId >= LEGACY_BEV_QUESTION_ID) && (QuestionId < LEGACY_BEV_QUESTION_ID + MAX_MENU_NUMBER)) {\r
+    Number     = (UINT16)LegacyBEVMenu.MenuNumber;\r
+    CurrentVal = CurrentNVMap->LegacyBEV;\r
+    Default    = mLegacyBootOptionPrivate->MaintainMapData->LastTimeNvData.LegacyBEV;\r
   }\r
 \r
   //\r
@@ -967,8 +961,8 @@ AdjustOptionValue (
   //\r
   for (Index = 0; Index < Number; Index++) {\r
     if (CurrentVal[Index] != Default[Index]) {\r
-      OldValue  = Default[Index];\r
-      NewValue  = CurrentVal[Index];\r
+      OldValue = Default[Index];\r
+      NewValue = CurrentVal[Index];\r
       break;\r
     }\r
   }\r
@@ -982,9 +976,9 @@ AdjustOptionValue (
       // This item will be disable\r
       // Just move the items behind this forward to overlap it\r
       //\r
-      Pos = OldValue / 8;\r
-      Bit = 7 - (OldValue % 8);\r
-      DisMap[Pos] = (UINT8) (DisMap[Pos] | (UINT8) (1 << Bit));\r
+      Pos         = OldValue / 8;\r
+      Bit         = 7 - (OldValue % 8);\r
+      DisMap[Pos] = (UINT8)(DisMap[Pos] | (UINT8)(1 << Bit));\r
       for (Index2 = Index; Index2 < Number - 1; Index2++) {\r
         CurrentVal[Index2] = CurrentVal[Index2 + 1];\r
       }\r
@@ -1025,27 +1019,28 @@ AdjustOptionValue (
         // If NewValue is not in OldlegacyDev array, we are changing to a disabled item\r
         // so we should modify DisMap to reflect the change\r
         //\r
-        Pos = NewValue / 8;\r
-        Bit = 7 - (NewValue % 8);\r
-        DisMap[Pos] = (UINT8) (DisMap[Pos] & (~ (UINT8) (1 << Bit)));\r
+        Pos         = NewValue / 8;\r
+        Bit         = 7 - (NewValue % 8);\r
+        DisMap[Pos] = (UINT8)(DisMap[Pos] & (~(UINT8)(1 << Bit)));\r
         if (0xFF != OldValue) {\r
           //\r
           // Because NewValue is a item that was disabled before\r
           // so after changing the OldValue should be disabled\r
           // actually we are doing a swap of enable-disable states of two items\r
           //\r
-          Pos = OldValue / 8;\r
-          Bit = 7 - (OldValue % 8);\r
-          DisMap[Pos] = (UINT8) (DisMap[Pos] | (UINT8) (1 << Bit));\r
+          Pos         = OldValue / 8;\r
+          Bit         = 7 - (OldValue % 8);\r
+          DisMap[Pos] = (UINT8)(DisMap[Pos] | (UINT8)(1 << Bit));\r
         }\r
       }\r
     }\r
+\r
     //\r
     // To prevent DISABLE appears in the middle of the list\r
     // we should perform a re-ordering\r
     //\r
     Index3 = Index;\r
-    Index = 0;\r
+    Index  = 0;\r
     while (Index < Number) {\r
       if (0xFF != CurrentVal[Index]) {\r
         Index++;\r
@@ -1063,8 +1058,8 @@ AdjustOptionValue (
       }\r
 \r
       if (Index2 < Number) {\r
-        CurrentVal[Index]   = CurrentVal[Index2];\r
-        CurrentVal[Index2]  = 0xFF;\r
+        CurrentVal[Index]  = CurrentVal[Index2];\r
+        CurrentVal[Index2] = 0xFF;\r
       }\r
 \r
       Index++;\r
@@ -1080,7 +1075,7 @@ AdjustOptionValue (
   //\r
   // Pass changed uncommitted data back to Form Browser\r
   //\r
-  HiiSetBrowserData (&mLegacyBootOptionGuid, mLegacyBootStorageName, sizeof (LEGACY_BOOT_NV_DATA), (UINT8 *) CurrentNVMap, NULL);\r
+  HiiSetBrowserData (&mLegacyBootOptionGuid, mLegacyBootStorageName, sizeof (LEGACY_BOOT_NV_DATA), (UINT8 *)CurrentNVMap, NULL);\r
 }\r
 \r
 /**\r
@@ -1104,15 +1099,15 @@ AdjustOptionValue (
 EFI_STATUS\r
 EFIAPI\r
 LegacyBootOptionCallback (\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
-  if (Action != EFI_BROWSER_ACTION_CHANGED && Action != EFI_BROWSER_ACTION_CHANGING && Action != EFI_BROWSER_ACTION_FORM_OPEN) {\r
+  if ((Action != EFI_BROWSER_ACTION_CHANGED) && (Action != EFI_BROWSER_ACTION_CHANGING) && (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
@@ -1140,16 +1135,16 @@ LegacyBootOptionCallback (
 \r
   if (Action == EFI_BROWSER_ACTION_CHANGING) {\r
     switch (QuestionId) {\r
-    case FORM_FLOPPY_BOOT_ID:\r
-    case FORM_HARDDISK_BOOT_ID:\r
-    case FORM_CDROM_BOOT_ID:\r
-    case FORM_NET_BOOT_ID:\r
-    case FORM_BEV_BOOT_ID:\r
-      UpdateLegacyDeviceOrderPage (QuestionId);\r
-      break;\r
+      case FORM_FLOPPY_BOOT_ID:\r
+      case FORM_HARDDISK_BOOT_ID:\r
+      case FORM_CDROM_BOOT_ID:\r
+      case FORM_NET_BOOT_ID:\r
+      case FORM_BEV_BOOT_ID:\r
+        UpdateLegacyDeviceOrderPage (QuestionId);\r
+        break;\r
 \r
-    default:\r
-      break;\r
+      default:\r
+        break;\r
     }\r
   } else if (Action == EFI_BROWSER_ACTION_CHANGED) {\r
     if ((Value == NULL) || (ActionRequest == NULL)) {\r
@@ -1157,13 +1152,13 @@ LegacyBootOptionCallback (
     }\r
 \r
     if ((QuestionId >= LEGACY_FD_QUESTION_ID) && (QuestionId < LEGACY_BEV_QUESTION_ID + MAX_MENU_NUMBER)) {\r
-      AdjustOptionValue(QuestionId, Value);\r
+      AdjustOptionValue (QuestionId, Value);\r
     }\r
   }\r
+\r
   return EFI_SUCCESS;\r
 }\r
 \r
-\r
 /**\r
   Create a menu entry by given menu type.\r
 \r
@@ -1178,7 +1173,7 @@ CreateMenuEntry (
   VOID\r
   )\r
 {\r
-  LEGACY_MENU_ENTRY *MenuEntry;\r
+  LEGACY_MENU_ENTRY  *MenuEntry;\r
 \r
   //\r
   // Create new menu entry\r
@@ -1194,7 +1189,7 @@ CreateMenuEntry (
     return NULL;\r
   }\r
 \r
-  MenuEntry->Signature        = LEGACY_MENU_ENTRY_SIGNATURE;\r
+  MenuEntry->Signature = LEGACY_MENU_ENTRY_SIGNATURE;\r
   return MenuEntry;\r
 }\r
 \r
@@ -1208,20 +1203,20 @@ GetLegacyOptionsOrder (
   VOID\r
   )\r
 {\r
-  UINTN                       VarSize;\r
-  UINT8                       *VarData;\r
-  UINT8                       *VarTmp;\r
-  LEGACY_DEV_ORDER_ENTRY      *DevOrder;\r
-  UINT16                      *LegacyDev;\r
-  UINTN                       Index;\r
-  LEGACY_MENU_OPTION          *OptionMenu;\r
-  UINT16                      VarDevOrder;\r
-  UINTN                       Pos;\r
-  UINTN                       Bit;\r
-  UINT8                       *DisMap;\r
-  UINTN                       TotalLength;\r
-\r
-  LegacyDev = NULL;\r
+  UINTN                   VarSize;\r
+  UINT8                   *VarData;\r
+  UINT8                   *VarTmp;\r
+  LEGACY_DEV_ORDER_ENTRY  *DevOrder;\r
+  UINT16                  *LegacyDev;\r
+  UINTN                   Index;\r
+  LEGACY_MENU_OPTION      *OptionMenu;\r
+  UINT16                  VarDevOrder;\r
+  UINTN                   Pos;\r
+  UINTN                   Bit;\r
+  UINT8                   *DisMap;\r
+  UINTN                   TotalLength;\r
+\r
+  LegacyDev  = NULL;\r
   OptionMenu = NULL;\r
 \r
   DisMap = ZeroMem (mLegacyBootOptionPrivate->MaintainMapData->DisableMap, sizeof (mLegacyBootOptionPrivate->MaintainMapData->DisableMap));\r
@@ -1229,42 +1224,42 @@ GetLegacyOptionsOrder (
   //\r
   // Get Device Order from variable\r
   //\r
-  GetVariable2 (VAR_LEGACY_DEV_ORDER, &gEfiLegacyDevOrderVariableGuid, (VOID **) &VarData, &VarSize);\r
+  GetVariable2 (VAR_LEGACY_DEV_ORDER, &gEfiLegacyDevOrderVariableGuid, (VOID **)&VarData, &VarSize);\r
   VarTmp = VarData;\r
   if (NULL != VarData) {\r
-    DevOrder    = (LEGACY_DEV_ORDER_ENTRY *) VarData;\r
+    DevOrder = (LEGACY_DEV_ORDER_ENTRY *)VarData;\r
     while (VarData < VarTmp + VarSize) {\r
       switch (DevOrder->BbsType) {\r
-      case BBS_FLOPPY:\r
-        LegacyDev = mLegacyBootOptionPrivate->MaintainMapData->InitialNvData.LegacyFD;\r
-        OptionMenu = &LegacyFDMenu;\r
-        break;\r
+        case BBS_FLOPPY:\r
+          LegacyDev  = mLegacyBootOptionPrivate->MaintainMapData->InitialNvData.LegacyFD;\r
+          OptionMenu = &LegacyFDMenu;\r
+          break;\r
 \r
-      case BBS_HARDDISK:\r
-        LegacyDev = mLegacyBootOptionPrivate->MaintainMapData->InitialNvData.LegacyHD;\r
-        OptionMenu = &LegacyHDMenu;\r
-        break;\r
+        case BBS_HARDDISK:\r
+          LegacyDev  = mLegacyBootOptionPrivate->MaintainMapData->InitialNvData.LegacyHD;\r
+          OptionMenu = &LegacyHDMenu;\r
+          break;\r
 \r
-      case BBS_CDROM:\r
-        LegacyDev = mLegacyBootOptionPrivate->MaintainMapData->InitialNvData.LegacyCD;\r
-        OptionMenu = &LegacyCDMenu;\r
-        break;\r
+        case BBS_CDROM:\r
+          LegacyDev  = mLegacyBootOptionPrivate->MaintainMapData->InitialNvData.LegacyCD;\r
+          OptionMenu = &LegacyCDMenu;\r
+          break;\r
 \r
-      case BBS_EMBED_NETWORK:\r
-        LegacyDev = mLegacyBootOptionPrivate->MaintainMapData->InitialNvData.LegacyNET;\r
-        OptionMenu = &LegacyNETMenu;\r
-        break;\r
+        case BBS_EMBED_NETWORK:\r
+          LegacyDev  = mLegacyBootOptionPrivate->MaintainMapData->InitialNvData.LegacyNET;\r
+          OptionMenu = &LegacyNETMenu;\r
+          break;\r
 \r
-      case BBS_BEV_DEVICE:\r
-        LegacyDev = mLegacyBootOptionPrivate->MaintainMapData->InitialNvData.LegacyBEV;\r
-        OptionMenu = &LegacyBEVMenu;\r
-        break;\r
+        case BBS_BEV_DEVICE:\r
+          LegacyDev  = mLegacyBootOptionPrivate->MaintainMapData->InitialNvData.LegacyBEV;\r
+          OptionMenu = &LegacyBEVMenu;\r
+          break;\r
 \r
-      case BBS_UNKNOWN:\r
-      default:\r
-        ASSERT (FALSE);\r
-        DEBUG ((DEBUG_ERROR, "Unsupported device type found!\n"));\r
-        break;\r
+        case BBS_UNKNOWN:\r
+        default:\r
+          ASSERT (FALSE);\r
+          DEBUG ((DEBUG_ERROR, "Unsupported device type found!\n"));\r
+          break;\r
       }\r
 \r
       //\r
@@ -1272,21 +1267,21 @@ GetLegacyOptionsOrder (
       //\r
       for (Index = 0; Index < OptionMenu->MenuNumber; Index++) {\r
         TotalLength = sizeof (BBS_TYPE) + sizeof (UINT16) + Index * sizeof (UINT16);\r
-        VarDevOrder = *(UINT16 *) ((UINT8 *) DevOrder + TotalLength);\r
+        VarDevOrder = *(UINT16 *)((UINT8 *)DevOrder + TotalLength);\r
 \r
         if (0xFF00 == (VarDevOrder & 0xFF00)) {\r
-          LegacyDev[Index]  = 0xFF;\r
-          Pos               = (VarDevOrder & 0xFF) / 8;\r
-          Bit               = 7 - ((VarDevOrder & 0xFF) % 8);\r
-          DisMap[Pos]       = (UINT8) (DisMap[Pos] | (UINT8) (1 << Bit));\r
+          LegacyDev[Index] = 0xFF;\r
+          Pos              = (VarDevOrder & 0xFF) / 8;\r
+          Bit              = 7 - ((VarDevOrder & 0xFF) % 8);\r
+          DisMap[Pos]      = (UINT8)(DisMap[Pos] | (UINT8)(1 << Bit));\r
         } else {\r
           LegacyDev[Index] = VarDevOrder & 0xFF;\r
         }\r
       }\r
 \r
-      VarData ++;\r
-      VarData += *(UINT16 *) VarData;\r
-      DevOrder = (LEGACY_DEV_ORDER_ENTRY *) VarData;\r
+      VarData++;\r
+      VarData += *(UINT16 *)VarData;\r
+      DevOrder = (LEGACY_DEV_ORDER_ENTRY *)VarData;\r
     }\r
   }\r
 \r
@@ -1324,11 +1319,11 @@ GetLegacyOptions (
   InitializeListHead (&LegacyNETMenu.Head);\r
   InitializeListHead (&LegacyBEVMenu.Head);\r
 \r
-  FDNum   = 0;\r
-  HDNum   = 0;\r
-  CDNum   = 0;\r
-  NETNum  = 0;\r
-  BEVNum  = 0;\r
+  FDNum  = 0;\r
+  HDNum  = 0;\r
+  CDNum  = 0;\r
+  NETNum = 0;\r
+  BEVNum = 0;\r
 \r
   EfiBootManagerConnectAll ();\r
 \r
@@ -1343,59 +1338,60 @@ GetLegacyOptions (
   for (Index = 0; Index < BootOptionCount; Index++) {\r
     if ((DevicePathType (BootOption[Index].FilePath) != BBS_DEVICE_PATH) ||\r
         (DevicePathSubType (BootOption[Index].FilePath) != BBS_BBS_DP)\r
-       ) {\r
+        )\r
+    {\r
       continue;\r
     }\r
+\r
     ASSERT (BootOption[Index].OptionalDataSize == sizeof (LEGACY_BOOT_OPTION_BBS_DATA));\r
     NewMenuEntry = CreateMenuEntry ();\r
     ASSERT (NewMenuEntry != NULL);\r
 \r
-    NewLegacyDevContext              = (LEGACY_DEVICE_CONTEXT *) NewMenuEntry->VariableContext;\r
-    NewLegacyDevContext->BbsIndex    = ((LEGACY_BOOT_OPTION_BBS_DATA *) BootOption[Index].OptionalData)->BbsIndex;\r
+    NewLegacyDevContext              = (LEGACY_DEVICE_CONTEXT *)NewMenuEntry->VariableContext;\r
+    NewLegacyDevContext->BbsIndex    = ((LEGACY_BOOT_OPTION_BBS_DATA *)BootOption[Index].OptionalData)->BbsIndex;\r
     NewLegacyDevContext->Description = AllocateCopyPool (StrSize (BootOption[Index].Description), BootOption[Index].Description);\r
     ASSERT (NewLegacyDevContext->Description != NULL);\r
 \r
     NewMenuEntry->DisplayString = NewLegacyDevContext->Description;\r
     NewMenuEntry->HelpString    = NULL;\r
 \r
-    switch (((BBS_BBS_DEVICE_PATH *) BootOption[Index].FilePath)->DeviceType) {\r
-    case BBS_TYPE_FLOPPY:\r
-      InsertTailList (&LegacyFDMenu.Head, &NewMenuEntry->Link);\r
-      FDNum++;\r
-      break;\r
+    switch (((BBS_BBS_DEVICE_PATH *)BootOption[Index].FilePath)->DeviceType) {\r
+      case BBS_TYPE_FLOPPY:\r
+        InsertTailList (&LegacyFDMenu.Head, &NewMenuEntry->Link);\r
+        FDNum++;\r
+        break;\r
 \r
-    case BBS_TYPE_HARDDRIVE:\r
-      InsertTailList (&LegacyHDMenu.Head, &NewMenuEntry->Link);\r
-      HDNum++;\r
-      break;\r
+      case BBS_TYPE_HARDDRIVE:\r
+        InsertTailList (&LegacyHDMenu.Head, &NewMenuEntry->Link);\r
+        HDNum++;\r
+        break;\r
 \r
-    case BBS_TYPE_CDROM:\r
-      InsertTailList (&LegacyCDMenu.Head, &NewMenuEntry->Link);\r
-      CDNum++;\r
-      break;\r
+      case BBS_TYPE_CDROM:\r
+        InsertTailList (&LegacyCDMenu.Head, &NewMenuEntry->Link);\r
+        CDNum++;\r
+        break;\r
 \r
-    case BBS_TYPE_EMBEDDED_NETWORK:\r
-      InsertTailList (&LegacyNETMenu.Head, &NewMenuEntry->Link);\r
-      NETNum++;\r
-      break;\r
+      case BBS_TYPE_EMBEDDED_NETWORK:\r
+        InsertTailList (&LegacyNETMenu.Head, &NewMenuEntry->Link);\r
+        NETNum++;\r
+        break;\r
 \r
-    case BBS_TYPE_BEV:\r
-      InsertTailList (&LegacyBEVMenu.Head, &NewMenuEntry->Link);\r
-      BEVNum++;\r
-      break;\r
+      case BBS_TYPE_BEV:\r
+        InsertTailList (&LegacyBEVMenu.Head, &NewMenuEntry->Link);\r
+        BEVNum++;\r
+        break;\r
     }\r
   }\r
 \r
   EfiBootManagerFreeLoadOptions (BootOption, BootOptionCount);\r
 \r
-  LegacyFDMenu.MenuNumber   = FDNum;\r
-  LegacyHDMenu.MenuNumber   = HDNum;\r
-  LegacyCDMenu.MenuNumber   = CDNum;\r
-  LegacyNETMenu.MenuNumber  = NETNum;\r
-  LegacyBEVMenu.MenuNumber  = BEVNum;\r
+  LegacyFDMenu.MenuNumber  = FDNum;\r
+  LegacyHDMenu.MenuNumber  = HDNum;\r
+  LegacyCDMenu.MenuNumber  = CDNum;\r
+  LegacyNETMenu.MenuNumber = NETNum;\r
+  LegacyBEVMenu.MenuNumber = BEVNum;\r
 }\r
 \r
-\r
 /**\r
 \r
   Install Boot Manager Menu driver.\r
@@ -1410,15 +1406,15 @@ GetLegacyOptions (
 EFI_STATUS\r
 EFIAPI\r
 LegacyBootMaintUiLibConstructor (\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
   EFI_STATUS                        Status;\r
   EFI_LEGACY_BIOS_PROTOCOL          *LegacyBios;\r
   LEGACY_BOOT_OPTION_CALLBACK_DATA  *LegacyBootOptionData;\r
 \r
-  Status = gBS->LocateProtocol (&gEfiLegacyBiosProtocolGuid, NULL, (VOID **) &LegacyBios);\r
+  Status = gBS->LocateProtocol (&gEfiLegacyBiosProtocolGuid, NULL, (VOID **)&LegacyBios);\r
   if (!EFI_ERROR (Status)) {\r
     //\r
     // Create LegacyBootOptionData structures for Driver Callback\r
@@ -1450,12 +1446,12 @@ LegacyBootMaintUiLibConstructor (
     // Publish our HII data\r
     //\r
     LegacyBootOptionData->HiiHandle = HiiAddPackages (\r
-                                      &mLegacyBootOptionGuid,\r
-                                      LegacyBootOptionData->DriverHandle,\r
-                                      LegacyBootMaintUiVfrBin,\r
-                                      LegacyBootMaintUiLibStrings,\r
-                                      NULL\r
-                                      );\r
+                                        &mLegacyBootOptionGuid,\r
+                                        LegacyBootOptionData->DriverHandle,\r
+                                        LegacyBootMaintUiVfrBin,\r
+                                        LegacyBootMaintUiLibStrings,\r
+                                        NULL\r
+                                        );\r
     ASSERT (LegacyBootOptionData->HiiHandle != NULL);\r
 \r
     mLegacyBootOptionPrivate = LegacyBootOptionData;\r
@@ -1481,9 +1477,9 @@ LegacyBootMaintUiLibDestructor (
   IN EFI_SYSTEM_TABLE  *SystemTable\r
   )\r
 {\r
-  EFI_STATUS    Status;\r
+  EFI_STATUS  Status;\r
 \r
-  if (mLegacyBootOptionPrivate != NULL && mLegacyBootOptionPrivate->DriverHandle != NULL) {\r
+  if ((mLegacyBootOptionPrivate != NULL) && (mLegacyBootOptionPrivate->DriverHandle != NULL)) {\r
     Status = gBS->UninstallMultipleProtocolInterfaces (\r
                     mLegacyBootOptionPrivate->DriverHandle,\r
                     &gEfiDevicePathProtocolGuid,\r
@@ -1502,4 +1498,3 @@ LegacyBootMaintUiLibDestructor (
 \r
   return EFI_SUCCESS;\r
 }\r
-\r