X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=IntelFrameworkModulePkg%2FUniversal%2FBdsDxe%2FBootMaint%2FBootOption.c;fp=IntelFrameworkModulePkg%2FUniversal%2FBdsDxe%2FBootMaint%2FBootOption.c;h=895f13f21435a7eddc080330e0499782d32576f1;hp=6233a1145a1a06fe0977d99cbea4e1f50b4076ab;hb=0a6f48249a601f88af124ae1ff6814b195b699c3;hpb=e38f26a2f7f62b69fec2d84e83bcc4b45ddefdc1

diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootOption.c b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootOption.c
index 6233a1145a..895f13f214 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootOption.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/BootMaint/BootOption.c
@@ -5,7 +5,7 @@
 
   Boot option manipulation
 
-Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -872,7 +872,7 @@ BOpt_GetBootOptions (
   EFI_DEVICE_PATH_PROTOCOL  *DevicePath;
   UINTN                     MenuCount;
   UINT8                     *Ptr;
-  
+
   MenuCount         = 0;
   BootOrderListSize = 0;
   BootNextSize      = 0;
@@ -893,7 +893,7 @@ BOpt_GetBootOptions (
   if (BootOrderList == NULL) {
     return EFI_NOT_FOUND;
   }
-  
+
   //
   // Get the BootNext from the Var
   //
@@ -1007,7 +1007,7 @@ BOpt_GetBootOptions (
 
     NewLoadContext->FilePathListLength = *(UINT16 *) LoadOptionPtr;
     LoadOptionPtr += sizeof (UINT16);
-    
+
     StringSize = StrSize((UINT16*)LoadOptionPtr);
 
     NewLoadContext->Description = AllocateCopyPool (StrSize((UINT16*)LoadOptionPtr), LoadOptionPtr);
@@ -1099,7 +1099,7 @@ BOpt_AppendFileName (
   Str   = AllocateZeroPool (MaxLen * sizeof (CHAR16));
   ASSERT (Str != NULL);
 
-  TmpStr = AllocateZeroPool (MaxLen * sizeof (CHAR16)); 
+  TmpStr = AllocateZeroPool (MaxLen * sizeof (CHAR16));
   ASSERT (TmpStr != NULL);
 
   StrCatS (Str, MaxLen, Str1);
@@ -1120,7 +1120,7 @@ BOpt_AppendFileName (
       //
 
       //
-      // Use TmpStr as a backup, as StrCpyS in BaseLib does not handle copy of two strings 
+      // Use TmpStr as a backup, as StrCpyS in BaseLib does not handle copy of two strings
       // that overlap.
       //
       StrCpyS (TmpStr, MaxLen, Ptr + 3);
@@ -1132,7 +1132,7 @@ BOpt_AppendFileName (
       //
 
       //
-      // Use TmpStr as a backup, as StrCpyS in BaseLib does not handle copy of two strings 
+      // Use TmpStr as a backup, as StrCpyS in BaseLib does not handle copy of two strings
       // that overlap.
       //
       StrCpyS (TmpStr, MaxLen, Ptr + 2);
@@ -1146,7 +1146,7 @@ BOpt_AppendFileName (
   }
 
   FreePool (TmpStr);
-  
+
   return Str;
 }
 
@@ -1497,7 +1497,7 @@ BOpt_GetDriverOptions (
   if (DriverOrderList == NULL) {
     return EFI_NOT_FOUND;
   }
-  
+
   for (Index = 0; Index < DriverOrderListSize / sizeof (UINT16); Index++) {
     UnicodeSPrint (
       DriverString,
@@ -1676,20 +1676,20 @@ GetLegacyDeviceOrder (
   UINTN                     Index;
   UINTN                     OptionIndex;
   UINT16                    PageIdList[5];
-  UINTN                     PageNum;  
+  UINTN                     PageNum;
   UINTN                     VarSize;
-  UINT8                     *VarData;     
-  UINT8                     *WorkingVarData; 
+  UINT8                     *VarData;
+  UINT8                     *WorkingVarData;
   LEGACY_DEV_ORDER_ENTRY    *DevOrder;
-  UINT16                    VarDevOrder;  
-  UINT8                     *DisMap;  
+  UINT16                    VarDevOrder;
+  UINT8                     *DisMap;
   BM_MENU_OPTION            *OptionMenu;
   BBS_TYPE                  BbsType;
   UINT8                     *LegacyOrder;
-  UINT8                     *OldData;  
+  UINT8                     *OldData;
   UINTN                     Pos;
   UINTN                     Bit;
-  
+
   ASSERT (CallbackData != NULL);
 
   PageIdList[0] = FORM_SET_FD_ORDER_ID;
@@ -1711,7 +1711,7 @@ GetLegacyDeviceOrder (
 
   for (Index = 0; Index < PageNum; Index++) {
     switch (PageIdList[Index]) {
-      
+
     case FORM_SET_FD_ORDER_ID:
       OptionMenu  = (BM_MENU_OPTION *) &LegacyFDMenu;
       BbsType     = BBS_FLOPPY;
@@ -1725,14 +1725,14 @@ GetLegacyDeviceOrder (
       LegacyOrder = CallbackData->BmmFakeNvData.LegacyHD;
       OldData     = CallbackData->BmmOldFakeNVData.LegacyHD;
       break;
-    
+
     case FORM_SET_CD_ORDER_ID:
       OptionMenu  = (BM_MENU_OPTION *) &LegacyCDMenu;
       BbsType     = BBS_CDROM;
       LegacyOrder = CallbackData->BmmFakeNvData.LegacyCD;
       OldData     = CallbackData->BmmOldFakeNVData.LegacyCD;
       break;
-    
+
     case FORM_SET_NET_ORDER_ID:
       OptionMenu  = (BM_MENU_OPTION *) &LegacyNETMenu;
       BbsType     = BBS_EMBED_NETWORK;
@@ -1748,7 +1748,7 @@ GetLegacyDeviceOrder (
       OldData     = CallbackData->BmmOldFakeNVData.LegacyBEV;
       break;
     }
-    
+
     if (NULL != VarData) {
       WorkingVarData = VarData;
       DevOrder    = (LEGACY_DEV_ORDER_ENTRY *) WorkingVarData;
@@ -1756,11 +1756,11 @@ GetLegacyDeviceOrder (
         if (DevOrder->BbsType == BbsType) {
           break;
         }
-    
+
         WorkingVarData  = (UINT8 *)((UINTN)WorkingVarData + sizeof (BBS_TYPE));
         WorkingVarData += *(UINT16 *) WorkingVarData;
         DevOrder = (LEGACY_DEV_ORDER_ENTRY *) WorkingVarData;
-      } 
+      }
       for (OptionIndex = 0; OptionIndex < OptionMenu->MenuNumber; OptionIndex++) {
         VarDevOrder = *(UINT16 *) ((UINTN) DevOrder + sizeof (BBS_TYPE) + sizeof (UINT16) + OptionIndex * sizeof (UINT16));
          if (0xFF00 == (VarDevOrder & 0xFF00)) {
@@ -1771,17 +1771,17 @@ GetLegacyDeviceOrder (
         } else {
           LegacyOrder[OptionIndex] = (UINT8) (VarDevOrder & 0xFF);
         }
-      } 
+      }
       CopyMem (OldData, LegacyOrder, 100);
     }
-  }  
+  }
 }
 
 /**
   Get driver option order from globalc DriverOptionMenu.
 
   @param CallbackData    The BMM context data.
-  
+
 **/
 VOID
 GetDriverOrder (