MdeModulePkg: Clean up source files

1. Do not use tab characters
2. No trailing white space in one line
3. All files must end with CRLF

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Star Zeng <star.zeng@intel.com>

11 files changed, 190 insertions, 190 deletions

diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BmLib.c b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BmLib.c
index 0ef9bf0934..a12cf77dd5 100644
--- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BmLib.c
+++ b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BmLib.c
@@ -1,7 +1,7 @@
 /** @file

 Utility routines used by boot maintenance modules.

 

-Copyright (c) 2004 - 2015, 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

@@ -70,7 +70,7 @@ EfiDevicePathInstanceCount (
 }

 

 /**

-  Get a string from the Data Hub record based on 

+  Get a string from the Data Hub record based on

   a device path.

 

   @param DevPath         The device Path.

diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenance.c b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenance.c
index fdcb56a9df..b4f4dff98d 100644
--- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenance.c
+++ b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenance.c
@@ -1,7 +1,7 @@
 /** @file

 The functions for Boot Maintainence Main menu.

 

-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

@@ -61,7 +61,7 @@ HII_VENDOR_DEVICE_PATH  mBmmHiiVendorDevicePath = {
   {

     END_DEVICE_PATH_TYPE,

     END_ENTIRE_DEVICE_PATH_SUBTYPE,

-    { 

+    {

       (UINT8) (END_DEVICE_PATH_LENGTH),

       (UINT8) ((END_DEVICE_PATH_LENGTH) >> 8)

     }

@@ -118,9 +118,9 @@ CustomizeMenus (
 

 /**

   This function will change video resolution and text mode

-  according to defined setup mode or defined boot mode  

+  according to defined setup mode or defined boot mode

 

-  @param  IsSetupMode   Indicate mode is changed to setup mode or boot mode. 

+  @param  IsSetupMode   Indicate mode is changed to setup mode or boot mode.

 

   @retval  EFI_SUCCESS  Mode is changed successfully.

   @retval  Others       Mode failed to be changed.

@@ -147,13 +147,13 @@ BmmSetConsoleMode (
   EFI_STATUS                            Status;

   UINTN                                 Index;

   UINTN                                 CurrentColumn;

-  UINTN                                 CurrentRow;  

+  UINTN                                 CurrentRow;

 

   MaxGopMode  = 0;

   MaxTextMode = 0;

 

   //

-  // Get current video resolution and text mode 

+  // Get current video resolution and text mode

   //

   Status = gBS->HandleProtocol (

                   gST->ConsoleOutHandle,

@@ -171,7 +171,7 @@ BmmSetConsoleMode (
                   );

   if (EFI_ERROR (Status)) {

     SimpleTextOut = NULL;

-  }  

+  }

 

   if ((GraphicsOutput == NULL) || (SimpleTextOut == NULL)) {

     return EFI_UNSUPPORTED;

@@ -192,12 +192,12 @@ BmmSetConsoleMode (
     NewHorizontalResolution = mBmmBootHorizontalResolution;

     NewVerticalResolution   = mBmmBootVerticalResolution;

     NewColumns              = mBmmBootTextModeColumn;

-    NewRows                 = mBmmBootTextModeRow;   

+    NewRows                 = mBmmBootTextModeRow;

   }

 

   if (GraphicsOutput != NULL) {

     MaxGopMode  = GraphicsOutput->Mode->MaxMode;

-  } 

+  }

 

   if (SimpleTextOut != NULL) {

     MaxTextMode = SimpleTextOut->Mode->MaxMode;

@@ -743,7 +743,7 @@ BootMaintExtractConfig (
 

   @param[in]  This                Points to the EFI_HII_CONFIG_ACCESS_PROTOCOL.

   @param[in]  Configuration       A null-terminated Unicode string in

-                                  <ConfigString> format.   

+                                  <ConfigString> format.

   @param[out] Progress            A pointer to a string filled in with the

                                   offset of the most recent '&' before the

                                   first failing name / value pair (or the

@@ -753,7 +753,7 @@ BootMaintExtractConfig (
                                   successful.

 

   @retval EFI_SUCCESS             The results have been distributed or are

-                                  awaiting distribution.  

+                                  awaiting distribution.

   @retval EFI_OUT_OF_RESOURCES    Not enough memory to store the

                                   parts of the results that must be

                                   stored awaiting possible future

@@ -802,15 +802,15 @@ BootMaintRouteConfig (
   }

 

   Status = gBS->LocateProtocol (

-                  &gEfiHiiConfigRoutingProtocolGuid, 

-                  NULL, 

+                  &gEfiHiiConfigRoutingProtocolGuid,

+                  NULL,

                   (VOID **)&ConfigRouting

                   );

   if (EFI_ERROR (Status)) {

     return Status;

   }

 

-  Private = BMM_CALLBACK_DATA_FROM_THIS (This);  

+  Private = BMM_CALLBACK_DATA_FROM_THIS (This);

   //

   // Get Buffer Storage data from EFI variable

   //

@@ -828,15 +828,15 @@ BootMaintRouteConfig (
                             &BufferSize,

                             Progress

                             );

-  ASSERT_EFI_ERROR (Status);    

+  ASSERT_EFI_ERROR (Status);

   //

-  // Compare new and old BMM configuration data and only do action for modified item to 

+  // Compare new and old BMM configuration data and only do action for modified item to

   // avoid setting unnecessary non-volatile variable

   //

 

   //

   // Check data which located in BMM main page and save the settings if need

-  //         

+  //

   if (CompareMem (&NewBmmData->BootNext, &OldBmmData->BootNext, sizeof (NewBmmData->BootNext)) != 0) {

     Status = Var_UpdateBootNext (Private);

     if (EFI_ERROR (Status)) {

@@ -847,10 +847,10 @@ BootMaintRouteConfig (
 

   //

   // Check data which located in Boot Options Menu and save the settings if need

-  //      

-  if (CompareMem (NewBmmData->BootOptionDel, OldBmmData->BootOptionDel, sizeof (NewBmmData->BootOptionDel)) != 0) {  

-    for (Index = 0; 

-         ((Index < BootOptionMenu.MenuNumber) && (Index < (sizeof (NewBmmData->BootOptionDel) / sizeof (NewBmmData->BootOptionDel[0])))); 

+  //

+  if (CompareMem (NewBmmData->BootOptionDel, OldBmmData->BootOptionDel, sizeof (NewBmmData->BootOptionDel)) != 0) {

+    for (Index = 0;

+         ((Index < BootOptionMenu.MenuNumber) && (Index < (sizeof (NewBmmData->BootOptionDel) / sizeof (NewBmmData->BootOptionDel[0]))));

          Index ++) {

       NewMenuEntry            = BOpt_GetMenuEntry (&BootOptionMenu, Index);

       NewLoadContext          = (BM_LOAD_CONTEXT *) NewMenuEntry->VariableContext;

@@ -891,10 +891,10 @@ BootMaintRouteConfig (
 

   //

   // Check data which located in Driver Options Menu and save the settings if need

-  //              

-  if (CompareMem (NewBmmData->DriverOptionDel, OldBmmData->DriverOptionDel, sizeof (NewBmmData->DriverOptionDel)) != 0) {       

-    for (Index = 0; 

-         ((Index < DriverOptionMenu.MenuNumber) && (Index < (sizeof (NewBmmData->DriverOptionDel) / sizeof (NewBmmData->DriverOptionDel[0])))); 

+  //

+  if (CompareMem (NewBmmData->DriverOptionDel, OldBmmData->DriverOptionDel, sizeof (NewBmmData->DriverOptionDel)) != 0) {

+    for (Index = 0;

+         ((Index < DriverOptionMenu.MenuNumber) && (Index < (sizeof (NewBmmData->DriverOptionDel) / sizeof (NewBmmData->DriverOptionDel[0]))));

          Index++) {

       NewMenuEntry            = BOpt_GetMenuEntry (&DriverOptionMenu, Index);

       NewLoadContext          = (BM_LOAD_CONTEXT *) NewMenuEntry->VariableContext;

@@ -909,7 +909,7 @@ BootMaintRouteConfig (
     }

   }

 

-  if (CompareMem (NewBmmData->DriverOptionOrder, OldBmmData->DriverOptionOrder, sizeof (NewBmmData->DriverOptionOrder)) != 0) {  

+  if (CompareMem (NewBmmData->DriverOptionOrder, OldBmmData->DriverOptionOrder, sizeof (NewBmmData->DriverOptionOrder)) != 0) {

     Status = Var_UpdateDriverOrder (Private);

     if (EFI_ERROR (Status)) {

       Offset = OFFSET_OF (BMM_FAKE_NV_DATA, DriverOptionOrder);

@@ -1128,14 +1128,14 @@ BootMaintCallback (
     if (Value == NULL) {

       return EFI_INVALID_PARAMETER;

     }

-    

+

     UpdatePageId (Private, QuestionId);

 

     if (QuestionId < FILE_OPTION_OFFSET) {

       if (QuestionId < CONFIG_OPTION_OFFSET) {

         switch (QuestionId) {

         case FORM_BOOT_ADD_ID:

-          // Leave BMM and enter FileExplorer. 

+          // Leave BMM and enter FileExplorer.

           ChooseFile (NULL, L".efi", CreateBootOptionFromFile, &File);

           break;

 

@@ -1213,7 +1213,7 @@ BootMaintCallback (
     if ((Value == NULL) || (ActionRequest == NULL)) {

       return EFI_INVALID_PARAMETER;

     }

-   

+

     if (QuestionId == KEY_VALUE_SAVE_AND_EXIT_BOOT) {

       CleanUselessBeforeSubmit (Private);

       CurrentFakeNVMap->BootOptionChanged = FALSE;

@@ -1247,7 +1247,7 @@ BootMaintCallback (
       CurrentFakeNVMap->BootOptionChanged = TRUE;

     } else if (QuestionId == KEY_VALUE_DRIVER_DESCRIPTION || QuestionId == KEY_VALUE_DRIVER_OPTION) {

       CurrentFakeNVMap->DriverOptionChanged = TRUE;

-    } 

+    }

 

     if ((QuestionId >= BOOT_OPTION_DEL_QUESTION_ID) && (QuestionId < BOOT_OPTION_DEL_QUESTION_ID + MAX_MENU_NUMBER)) {

       if (Value->b){

@@ -1718,7 +1718,7 @@ BootMaintenanceManagerUiLibConstructor (
 

   CreateUpdateData();

   //

-  // Update boot maintenance manager page 

+  // Update boot maintenance manager page

   //

   InitializeBmmConfig(mBmmCallbackInfo);

 

diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManager.h b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManager.h
index 99d1656b9e..e8288b53ad 100644
--- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManager.h
+++ b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManager.h
@@ -1,7 +1,7 @@
 /** @file

 Header file for boot maintenance module.

 

-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

@@ -333,7 +333,7 @@ typedef struct {
 } BM_MENU_ENTRY;

 

 typedef struct {

-  

+

   UINTN                          Signature;

 

   EFI_HII_HANDLE                 BmmHiiHandle;

@@ -355,7 +355,7 @@ typedef struct {
   //

   // BMM main formset callback data.

   //

-  

+

   EFI_FORM_ID                    BmmCurrentPageId;

   EFI_FORM_ID                    BmmPreviousPageId;

   BOOLEAN                        BmmAskSaveOrNot;

@@ -403,7 +403,7 @@ BOpt_GetBootOptions (
 

   @return EFI_SUCESS The functin completes successfully.

   @retval EFI_OUT_OF_RESOURCES Not enough memory to compete the operation.

-  

+

 

 **/

 EFI_STATUS

@@ -505,12 +505,12 @@ BOpt_GetMenuEntry (
   );

 

 /**

-  Get option number according to Boot#### and BootOrder variable. 

+  Get option number according to Boot#### and BootOrder variable.

   The value is saved as #### + 1.

 

   @param CallbackData    The BMM context data.

 **/

-VOID  

+VOID

 GetBootOrder (

   IN  BMM_CALLBACK_DATA    *CallbackData

   );

@@ -519,9 +519,9 @@ GetBootOrder (
   Get driver option order from globalc DriverOptionMenu.

 

   @param CallbackData    The BMM context data.

-  

+

 **/

-VOID  

+VOID

 GetDriverOrder (

   IN  BMM_CALLBACK_DATA    *CallbackData

   );

@@ -596,11 +596,11 @@ ChangeVariableDevicePath (
 

 /**

   Update the multi-instance device path of Terminal Device based on

-  the global TerminalMenu. If ChangeTernimal is TRUE, the terminal 

+  the global TerminalMenu. If ChangeTernimal is TRUE, the terminal

   device path in the Terminal Device in TerminalMenu is also updated.

 

   @param DevicePath      The multi-instance device path.

-  @param ChangeTerminal  TRUE, then device path in the Terminal Device 

+  @param ChangeTerminal  TRUE, then device path in the Terminal Device

                          in TerminalMenu is also updated; FALSE, no update.

 

   @return EFI_SUCCESS    The function completes successfully.

@@ -616,8 +616,8 @@ ChangeTerminalDevicePath (
 // Variable operation by menu selection

 //

 /**

-  This function create a currently loaded Boot Option from 

-  the BMM. It then appends this Boot Option to the end of 

+  This function create a currently loaded Boot Option from

+  the BMM. It then appends this Boot Option to the end of

   the "BootOrder" list. It also append this Boot Opotion to the end

   of BootOptionMenu.

 

@@ -635,9 +635,9 @@ Var_UpdateBootOption (
 /**

   Delete Boot Option that represent a Deleted state in BootOptionMenu.

 

-  @retval EFI_SUCCESS   If all boot load option EFI Variables corresponding to  

+  @retval EFI_SUCCESS   If all boot load option EFI Variables corresponding to

                         BM_LOAD_CONTEXT marked for deletion is deleted

-  @return Others        If failed to update the "BootOrder" variable after deletion. 

+  @return Others        If failed to update the "BootOrder" variable after deletion.

 

 **/

 EFI_STATUS

@@ -646,8 +646,8 @@ Var_DelBootOption (
   );

 

 /**

-  This function create a currently loaded Drive Option from 

-  the BMM. It then appends this Driver Option to the end of 

+  This function create a currently loaded Drive Option from

+  the BMM. It then appends this Driver Option to the end of

   the "DriverOrder" list. It append this Driver Opotion to the end

   of DriverOptionMenu.

 

@@ -719,11 +719,11 @@ Var_UpdateErrorOutOption (
 

 /**

   This function delete and build Out of Band console device.

-  

+

   @param   MenuIndex   Menu index which user select in the terminal menu list.

-  

+

   @retval EFI_SUCCESS    The function complete successfully.

-  @return The EFI variable can not be saved. See gRT->SetVariable for detail return information.  

+  @return The EFI variable can not be saved. See gRT->SetVariable for detail return information.

 **/

 EFI_STATUS

 Var_UpdateOutOfBandOption (

@@ -731,7 +731,7 @@ Var_UpdateOutOfBandOption (
   );

 

 /**

-  This function update the "BootNext" EFI Variable. If there is no "BootNex" specified in BMM, 

+  This function update the "BootNext" EFI Variable. If there is no "BootNex" specified in BMM,

   this EFI Variable is deleted.

   It also update the BMM context data specified the "BootNext" value.

 

@@ -747,7 +747,7 @@ Var_UpdateBootNext (
   );

 

 /**

-  This function update the "BootOrder" EFI Variable based on BMM Formset's NV map. It then refresh 

+  This function update the "BootOrder" EFI Variable based on BMM Formset's NV map. It then refresh

   BootOptionMenu with the new "BootOrder" list.

 

   @param CallbackData           The BMM context data.

@@ -816,7 +816,7 @@ RefreshUpdateData (
 

 /**

   Clean up the dynamic opcode at label and form specified by

-  both LabelId. 

+  both LabelId.

 

   @param LabelId         It is both the Form ID and Label ID for

                          opcode deletion.

@@ -937,7 +937,7 @@ UpdateOptionPage(
 

   @param VarName            A Null-terminated Unicode string that is

                             the name of the vendor's variable.

-                         

+

   @param VarGuid            A unique identifier for the vendor.

 

   @retval  EFI_SUCCESS           The variable was found and removed

@@ -969,7 +969,7 @@ EfiDevicePathInstanceCount (
   );

 

 /**

-  Get a string from the Data Hub record based on 

+  Get a string from the Data Hub record based on

   a device path.

 

   @param DevPath         The device Path.

@@ -1065,8 +1065,8 @@ InitBootMaintenance(
 

   @param CallbackData    The BMM context data.

 

-**/  

-VOID  

+**/

+VOID

 GetConsoleInCheck (

   IN  BMM_CALLBACK_DATA    *CallbackData

   );

@@ -1091,7 +1091,7 @@ GetConsoleOutCheck (
 

   @param CallbackData    The BMM context data.

 

-**/        

+**/

 VOID

 GetConsoleErrCheck (

   IN  BMM_CALLBACK_DATA    *CallbackData

@@ -1112,9 +1112,9 @@ GetTerminalAttribute (
 

 /**

   This function will change video resolution and text mode

-  according to defined setup mode or defined boot mode  

+  according to defined setup mode or defined boot mode

 

-  @param  IsSetupMode   Indicate mode is changed to setup mode or boot mode. 

+  @param  IsSetupMode   Indicate mode is changed to setup mode or boot mode.

 

   @retval  EFI_SUCCESS  Mode is changed successfully.

   @retval  Others             Mode failed to be changed.

@@ -1195,7 +1195,7 @@ BootMaintExtractConfig (
 

   @param[in]  This                Points to the EFI_HII_CONFIG_ACCESS_PROTOCOL.

   @param[in]  Configuration       A null-terminated Unicode string in

-                                  <ConfigString> format.   

+                                  <ConfigString> format.

   @param[out] Progress            A pointer to a string filled in with the

                                   offset of the most recent '&' before the

                                   first failing name / value pair (or the

@@ -1205,7 +1205,7 @@ BootMaintExtractConfig (
                                   successful.

 

   @retval EFI_SUCCESS             The results have been distributed or are

-                                  awaiting distribution.  

+                                  awaiting distribution.

   @retval EFI_OUT_OF_RESOURCES    Not enough memory to store the

                                   parts of the results that must be

                                   stored awaiting possible future

@@ -1262,7 +1262,7 @@ BootMaintCallback (
   @retval FALSE  Not exit caller function.

 

 **/

-BOOLEAN 

+BOOLEAN

 EFIAPI

 CreateBootOptionFromFile (

   IN EFI_DEVICE_PATH_PROTOCOL    *FilePath

@@ -1276,7 +1276,7 @@ CreateBootOptionFromFile (
   @retval TRUE   Exit caller function.

   @retval FALSE  Not exit caller function.

 **/

-BOOLEAN 

+BOOLEAN

 EFIAPI

 CreateDriverOptionFromFile (

   IN EFI_DEVICE_PATH_PROTOCOL    *FilePath

@@ -1289,9 +1289,9 @@ CreateDriverOptionFromFile (
 

   @retval TRUE   Exit caller function.

   @retval FALSE  Not exit caller function.

-  

+

 **/

-BOOLEAN 

+BOOLEAN

 EFIAPI

 BootFromFile (

   IN EFI_DEVICE_PATH_PROTOCOL    *FilePath

diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManager.vfr b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManager.vfr
index b0a636f566..a14074a17a 100644
--- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManager.vfr
+++ b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManager.vfr
@@ -1,15 +1,15 @@
 ///** @file

 //  Boot Maintenance Utility Formset

 //

-//  Copyright (c) 2004 - 2016, 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

 //  http://opensource.org/licenses/bsd-license.php

-//  

+//

 //  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

 //  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-//  

+//

 //**/

 

 #include "FormGuid.h"

@@ -38,10 +38,10 @@ formset
               flags = INTERACTIVE,

               key   = KEY_VALUE_TRIGGER_FORM_OPEN_ACTION;

        endif;

-         

+

     label LABEL_FORM_MAIN_START;

     //

-    // This is where we will dynamically add a Action type op-code to show 

+    // This is where we will dynamically add a Action type op-code to show

     // the platform information.

     //

     label LABEL_FORM_MAIN_END;

@@ -144,7 +144,7 @@ formset
          text   = STRING_TOKEN(STR_NO_SAVE_AND_EXIT),

          flags  = INTERACTIVE,

          key    = KEY_VALUE_NO_SAVE_AND_EXIT_BOOT;

-         

+

   endform;

 

   form formid = FORM_BOOT_DEL_ID,

@@ -181,7 +181,7 @@ formset
 

   form formid = FORM_DRV_ADD_FILE_ID,

        title = STRING_TOKEN(STR_FORM_DRV_ADD_DESC_TITLE);

-       

+

        label FORM_DRV_ADD_FILE_ID;

        label LABEL_END;

 

diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerStrings.uni b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerStrings.uni
index 20b2a7744a..87e31737ae 100644
--- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerStrings.uni
+++ b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerStrings.uni
@@ -1,15 +1,15 @@
 ///** @file

 //  String definitions for Boot Maintenance Utility.

 //

-//  Copyright (c) 2004 - 2015, 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

 //  http://opensource.org/licenses/bsd-license.php

-//  

+//

 //  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

 //  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-//  

+//

 //**/

 

 /=#

@@ -71,9 +71,9 @@
                                            #language fr-FR "UEFI Optimized Boot"

 #string STR_FORM_UEFI_OPTIMIZED_BOOT_HELP  #language en-US "Modify the UEFI Optimized Boot setting"

                                            #language fr-FR "Modify the UEFI Optimized Boot setting"

-#string UEFI_OPTIMIZED_BOOT_DESCRIPTION	   #language en-US "UEFI Optimized Boot"

+#string UEFI_OPTIMIZED_BOOT_DESCRIPTION     #language en-US "UEFI Optimized Boot"

                                            #language fr-FR "UEFI Optimized Boot"

-#string UEFI_OPTIMIZED_BOOT_HELP	       #language en-US "Check to enable UEFI Optimized Boot"

+#string UEFI_OPTIMIZED_BOOT_HELP         #language en-US "Check to enable UEFI Optimized Boot"

                                            #language fr-FR "Check to enable UEFI Optimized Boot"

 #string STR_FORM_CON_MAIN_TITLE        #language en-US  "Console Options"

                                        #language fr-FR  "Console Options"

diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf
index def923b977..aad9d7678e 100644
--- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf
+++ b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf
@@ -1,15 +1,15 @@
 ## @file

 #  Boot Maintenance Manager Library used by UiApp.

 #

-#  Copyright (c) 2011 - 2017, Intel Corporation. All rights reserved.<BR>

+#  Copyright (c) 2011 - 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 that accompanies this distribution.

 #  The full text of the license may be found at

 #  http://opensource.org/licenses/bsd-license.php.

-#  

+#

 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-#  

+#

 ##

 [Defines]

   INF_VERSION                    = 0x00010005

@@ -62,7 +62,7 @@
   UefiHiiServicesLib

   UefiBootManagerLib

   FileExplorerLib

-  

+

 [Guids]

   gEfiGlobalVariableGuid                        ## SOMETIMES_PRODUCES ## Variable:L"BootNext" (The number of next boot option)

                                                 ## SOMETIMES_PRODUCES ## Variable:L"BootXX" (Boot option variable)

@@ -82,7 +82,7 @@
   gEfiIfrTianoGuid                              ## SOMETIMES_CONSUMES ## GUID (Extended IFR Guid Opcode)

   gEfiIfrFrontPageGuid                          ## CONSUMES ## GUID

   gEfiIfrBootMaintenanceGuid                    ## CONSUMES ## GUID

- 

+

 [Protocols]

   gEfiSimpleFileSystemProtocolGuid              ## CONSUMES

   gEfiLoadFileProtocolGuid                      ## CONSUMES

diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootOption.c b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootOption.c
index 8680a51d78..a1a2e2a4e7 100644
--- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootOption.c
+++ b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootOption.c
@@ -5,7 +5,7 @@
 

   Boot option manipulation

 

-Copyright (c) 2004 - 2016, 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

@@ -309,8 +309,8 @@ BOpt_GetBootOptions (
   UINTN                         MenuCount;

   UINT8                         *Ptr;

   EFI_BOOT_MANAGER_LOAD_OPTION  *BootOption;

-  UINTN                         BootOptionCount;  

-  

+  UINTN                         BootOptionCount;

+

   MenuCount         = 0;

   BootOrderListSize = 0;

   BootNextSize      = 0;

@@ -327,7 +327,7 @@ BOpt_GetBootOptions (
   if (BootOrderList == NULL) {

     return EFI_NOT_FOUND;

   }

-  

+

   //

   // Get the BootNext from the Var

   //

@@ -346,7 +346,7 @@ BOpt_GetBootOptions (
     if (((BootOption[Index].Attributes & LOAD_OPTION_HIDDEN) != 0) || ((BootOption[Index].Attributes & LOAD_OPTION_ACTIVE) == 0)) {

       continue;

     }

-      

+

     UnicodeSPrint (BootString, sizeof (BootString), L"Boot%04x", BootOrderList[Index]);

     //

     //  Get all loadoptions from the VAR

@@ -415,13 +415,13 @@ BOpt_GetBootOptions (
 

     NewLoadContext->FilePathListLength = *(UINT16 *) LoadOptionPtr;

     LoadOptionPtr += sizeof (UINT16);

-    

+

     StringSize = StrSize((UINT16*)LoadOptionPtr);

 

     NewLoadContext->Description = AllocateZeroPool (StrSize((UINT16*)LoadOptionPtr));

     ASSERT (NewLoadContext->Description != NULL);

     StrCpyS (NewLoadContext->Description, StrSize((UINT16*)LoadOptionPtr) / sizeof (UINT16), (UINT16*)LoadOptionPtr);

-    

+

     ASSERT (NewLoadContext->Description != NULL);

     NewMenuEntry->DisplayString = NewLoadContext->Description;

     NewMenuEntry->DisplayStringToken = HiiSetString (CallbackData->BmmHiiHandle, 0, NewMenuEntry->DisplayString, NULL);

@@ -437,7 +437,7 @@ BOpt_GetBootOptions (
       );

 

     NewMenuEntry->HelpString = UiDevicePathToStr (NewLoadContext->FilePathList);

-    NewMenuEntry->HelpStringToken = HiiSetString (CallbackData->BmmHiiHandle, 0, NewMenuEntry->HelpString, NULL); 

+    NewMenuEntry->HelpStringToken = HiiSetString (CallbackData->BmmHiiHandle, 0, NewMenuEntry->HelpString, NULL);

 

     LoadOptionPtr += NewLoadContext->FilePathListLength;

 

@@ -703,7 +703,7 @@ BOpt_GetDriverOptions (
   if (DriverOrderList == NULL) {

     return EFI_NOT_FOUND;

   }

-  

+

   for (Index = 0; Index < DriverOrderListSize / sizeof (UINT16); Index++) {

     UnicodeSPrint (

       DriverString,

@@ -767,7 +767,7 @@ BOpt_GetDriverOptions (
       );

 

     NewMenuEntry->HelpString = UiDevicePathToStr (NewLoadContext->FilePathList);

-    NewMenuEntry->HelpStringToken = HiiSetString (CallbackData->BmmHiiHandle, 0, NewMenuEntry->HelpString, NULL); 

+    NewMenuEntry->HelpStringToken = HiiSetString (CallbackData->BmmHiiHandle, 0, NewMenuEntry->HelpString, NULL);

 

     LoadOptionPtr += NewLoadContext->FilePathListLength;

 

@@ -803,29 +803,29 @@ BOpt_GetDriverOptions (
 }

 

 /**

-  Get option number according to Boot#### and BootOrder variable. 

+  Get option number according to Boot#### and BootOrder variable.

   The value is saved as #### + 1.

 

   @param CallbackData    The BMM context data.

 **/

-VOID  

+VOID

 GetBootOrder (

   IN  BMM_CALLBACK_DATA    *CallbackData

   )

 {

   BMM_FAKE_NV_DATA          *BmmConfig;

   UINT16                    Index;

-  UINT16                    OptionOrderIndex; 

+  UINT16                    OptionOrderIndex;

   UINTN                     DeviceType;

   BM_MENU_ENTRY             *NewMenuEntry;

-  BM_LOAD_CONTEXT           *NewLoadContext;  

+  BM_LOAD_CONTEXT           *NewLoadContext;

 

   ASSERT (CallbackData != NULL);

-  

-  DeviceType = (UINTN) -1;   

-  BmmConfig  = &CallbackData->BmmFakeNvData;  

+

+  DeviceType = (UINTN) -1;

+  BmmConfig  = &CallbackData->BmmFakeNvData;

   ZeroMem (BmmConfig->BootOptionOrder, sizeof (BmmConfig->BootOptionOrder));

-  

+

   for (Index = 0, OptionOrderIndex = 0; ((Index < BootOptionMenu.MenuNumber) &&

        (OptionOrderIndex < (sizeof (BmmConfig->BootOptionOrder) / sizeof (BmmConfig->BootOptionOrder[0]))));

        Index++) {

@@ -844,34 +844,34 @@ GetBootOrder (
       }

     }

     BmmConfig->BootOptionOrder[OptionOrderIndex++] = (UINT32) (NewMenuEntry->OptionNumber + 1);

-  }  

+  }

 }

 

 /**

   Get driver option order from globalc DriverOptionMenu.

 

   @param CallbackData    The BMM context data.

-  

+

 **/

-VOID  

+VOID

 GetDriverOrder (

   IN  BMM_CALLBACK_DATA    *CallbackData

   )

 {

   BMM_FAKE_NV_DATA          *BmmConfig;

   UINT16                    Index;

-  UINT16                    OptionOrderIndex; 

+  UINT16                    OptionOrderIndex;

   UINTN                     DeviceType;

   BM_MENU_ENTRY             *NewMenuEntry;

-  BM_LOAD_CONTEXT           *NewLoadContext;  

+  BM_LOAD_CONTEXT           *NewLoadContext;

 

 

   ASSERT (CallbackData != NULL);

-  

-  DeviceType = (UINTN) -1;   

-  BmmConfig  = &CallbackData->BmmFakeNvData;  

+

+  DeviceType = (UINTN) -1;

+  BmmConfig  = &CallbackData->BmmFakeNvData;

   ZeroMem (BmmConfig->DriverOptionOrder, sizeof (BmmConfig->DriverOptionOrder));

-  

+

   for (Index = 0, OptionOrderIndex = 0; ((Index < DriverOptionMenu.MenuNumber) &&

        (OptionOrderIndex < (sizeof (BmmConfig->DriverOptionOrder) / sizeof (BmmConfig->DriverOptionOrder[0]))));

        Index++) {

@@ -890,8 +890,8 @@ GetDriverOrder (
       }

     }

     BmmConfig->DriverOptionOrder[OptionOrderIndex++] = (UINT32) (NewMenuEntry->OptionNumber + 1);

-  }  

-}  

+  }

+}

 

 /**

   Boot the file specified by the input file path info.

@@ -901,7 +901,7 @@ GetDriverOrder (
   @retval TRUE   Exit caller function.

   @retval FALSE  Not exit caller function.

 **/

-BOOLEAN 

+BOOLEAN

 EFIAPI

 BootFromFile (

   IN EFI_DEVICE_PATH_PROTOCOL    *FilePath

@@ -982,7 +982,7 @@ ReSendForm(
   @retval TRUE   Exit caller function.

   @retval FALSE  Not exit caller function.

 **/

-BOOLEAN 

+BOOLEAN

 EFIAPI

 CreateBootOptionFromFile (

   IN EFI_DEVICE_PATH_PROTOCOL    *FilePath

@@ -1000,7 +1000,7 @@ CreateBootOptionFromFile (
   @retval FALSE  Not exit caller function.

 

 **/

-BOOLEAN 

+BOOLEAN

 EFIAPI

 CreateDriverOptionFromFile (

   IN EFI_DEVICE_PATH_PROTOCOL    *FilePath

diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/ConsoleOption.c b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/ConsoleOption.c
index b25c7a651b..55f079efa9 100644
--- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/ConsoleOption.c
+++ b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/ConsoleOption.c
@@ -1,7 +1,7 @@
 /** @file

 handles console redirection from boot manager

 

-Copyright (c) 2004 - 2015, 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

@@ -100,11 +100,11 @@ UpdateComAttributeFromVariable (
 

 /**

   Update the multi-instance device path of Terminal Device based on

-  the global TerminalMenu. If ChangeTernimal is TRUE, the terminal 

+  the global TerminalMenu. If ChangeTernimal is TRUE, the terminal

   device path in the Terminal Device in TerminalMenu is also updated.

 

   @param DevicePath      The multi-instance device path.

-  @param ChangeTerminal  TRUE, then device path in the Terminal Device 

+  @param ChangeTerminal  TRUE, then device path in the Terminal Device

                          in TerminalMenu is also updated; FALSE, no update.

 

   @return EFI_SUCCESS    The function completes successfully.

@@ -732,7 +732,7 @@ UpdateComAttributeFromVariable (
                          and BM_CONSOLE_ERR_CONTEXT_SELECT.

 

   @retval EFI_UNSUPPORTED The type passed in is not in the 3 types defined.

-  @retval EFI_NOT_FOUND   If the EFI Variable defined in UEFI spec with name "ConOutDev", 

+  @retval EFI_NOT_FOUND   If the EFI Variable defined in UEFI spec with name "ConOutDev",

                           "ConInDev" or "ConErrDev" doesn't exists.

   @retval EFI_OUT_OF_RESOURCES Not enough resource to complete the operations.

   @retval EFI_SUCCESS          Function completes successfully.

@@ -1021,14 +1021,14 @@ GetConsoleOutMode (
 

   @param CallbackData    The BMM context data.

 

-**/  

-VOID  

+**/

+VOID

 GetConsoleInCheck (

   IN  BMM_CALLBACK_DATA    *CallbackData

   )

 {

   UINT16              Index;

-  BM_MENU_ENTRY       *NewMenuEntry; 

+  BM_MENU_ENTRY       *NewMenuEntry;

   UINT8               *ConInCheck;

   BM_CONSOLE_CONTEXT  *NewConsoleContext;

   BM_TERMINAL_CONTEXT *NewTerminalContext;

@@ -1037,9 +1037,9 @@ GetConsoleInCheck (
 

   ConInCheck = &CallbackData->BmmFakeNvData.ConsoleInCheck[0];

   for (Index = 0; ((Index < ConsoleInpMenu.MenuNumber) && \

-       (Index < MAX_MENU_NUMBER)) ; Index++) {  

+       (Index < MAX_MENU_NUMBER)) ; Index++) {

     NewMenuEntry      = BOpt_GetMenuEntry (&ConsoleInpMenu, Index);

-    NewConsoleContext = (BM_CONSOLE_CONTEXT *) NewMenuEntry->VariableContext;  

+    NewConsoleContext = (BM_CONSOLE_CONTEXT *) NewMenuEntry->VariableContext;

     ConInCheck[Index] = NewConsoleContext->IsActive;

   }

 

@@ -1058,14 +1058,14 @@ GetConsoleInCheck (
 

   @param CallbackData    The BMM context data.

 

-**/      

-VOID    

+**/

+VOID

 GetConsoleOutCheck (

   IN  BMM_CALLBACK_DATA    *CallbackData

   )

 {

   UINT16              Index;

-  BM_MENU_ENTRY       *NewMenuEntry; 

+  BM_MENU_ENTRY       *NewMenuEntry;

   UINT8               *ConOutCheck;

   BM_CONSOLE_CONTEXT  *NewConsoleContext;

   BM_TERMINAL_CONTEXT *NewTerminalContext;

@@ -1073,9 +1073,9 @@ GetConsoleOutCheck (
   ASSERT (CallbackData != NULL);

   ConOutCheck = &CallbackData->BmmFakeNvData.ConsoleOutCheck[0];

   for (Index = 0; ((Index < ConsoleOutMenu.MenuNumber) && \

-       (Index < MAX_MENU_NUMBER)) ; Index++) {  

+       (Index < MAX_MENU_NUMBER)) ; Index++) {

     NewMenuEntry      = BOpt_GetMenuEntry (&ConsoleOutMenu, Index);

-    NewConsoleContext = (BM_CONSOLE_CONTEXT *) NewMenuEntry->VariableContext;  

+    NewConsoleContext = (BM_CONSOLE_CONTEXT *) NewMenuEntry->VariableContext;

     ConOutCheck[Index] = NewConsoleContext->IsActive;

   }

 

@@ -1094,14 +1094,14 @@ GetConsoleOutCheck (
 

   @param CallbackData    The BMM context data.

 

-**/        

-VOID  

+**/

+VOID

 GetConsoleErrCheck (

   IN  BMM_CALLBACK_DATA    *CallbackData

   )

 {

   UINT16              Index;

-  BM_MENU_ENTRY       *NewMenuEntry; 

+  BM_MENU_ENTRY       *NewMenuEntry;

   UINT8               *ConErrCheck;

   BM_CONSOLE_CONTEXT  *NewConsoleContext;

   BM_TERMINAL_CONTEXT *NewTerminalContext;

@@ -1109,9 +1109,9 @@ GetConsoleErrCheck (
   ASSERT (CallbackData != NULL);

   ConErrCheck = &CallbackData->BmmFakeNvData.ConsoleErrCheck[0];

   for (Index = 0; ((Index < ConsoleErrMenu.MenuNumber) && \

-       (Index < MAX_MENU_NUMBER)) ; Index++) {  

+       (Index < MAX_MENU_NUMBER)) ; Index++) {

     NewMenuEntry      = BOpt_GetMenuEntry (&ConsoleErrMenu, Index);

-    NewConsoleContext = (BM_CONSOLE_CONTEXT *) NewMenuEntry->VariableContext;  

+    NewConsoleContext = (BM_CONSOLE_CONTEXT *) NewMenuEntry->VariableContext;

     ConErrCheck[Index] = NewConsoleContext->IsActive;

   }

 

@@ -1131,22 +1131,22 @@ GetConsoleErrCheck (
   @param CallbackData    The BMM context data.

 

 **/

-VOID  

+VOID

 GetTerminalAttribute (

   IN  BMM_CALLBACK_DATA    *CallbackData

   )

 {

   BMM_FAKE_NV_DATA     *CurrentFakeNVMap;

   BM_MENU_ENTRY        *NewMenuEntry;

-  BM_TERMINAL_CONTEXT  *NewTerminalContext;    

-  UINT16               TerminalIndex;  

+  BM_TERMINAL_CONTEXT  *NewTerminalContext;

+  UINT16               TerminalIndex;

   UINT8                AttributeIndex;

 

   ASSERT (CallbackData != NULL);

 

-  CurrentFakeNVMap = &CallbackData->BmmFakeNvData;     

+  CurrentFakeNVMap = &CallbackData->BmmFakeNvData;

   for (TerminalIndex = 0; ((TerminalIndex < TerminalMenu.MenuNumber) && \

-       (TerminalIndex < MAX_MENU_NUMBER)); TerminalIndex++) {  

+       (TerminalIndex < MAX_MENU_NUMBER)); TerminalIndex++) {

     NewMenuEntry        = BOpt_GetMenuEntry (&TerminalMenu, TerminalIndex);

     NewTerminalContext  = (BM_TERMINAL_CONTEXT *) NewMenuEntry->VariableContext;

     for (AttributeIndex = 0; AttributeIndex < sizeof (BaudRateList) / sizeof (BaudRateList [0]); AttributeIndex++) {

@@ -1160,7 +1160,7 @@ GetTerminalAttribute (
         NewTerminalContext->DataBitsIndex = AttributeIndex;

         break;

       }

-    }    

+    }

 

     for (AttributeIndex = 0; AttributeIndex < ARRAY_SIZE (ParityList); AttributeIndex++) {

       if (NewTerminalContext->Parity == (UINT64) (ParityList[AttributeIndex].Value)) {

@@ -1178,7 +1178,7 @@ GetTerminalAttribute (
     CurrentFakeNVMap->COMBaudRate[TerminalIndex]     = NewTerminalContext->BaudRateIndex;

     CurrentFakeNVMap->COMDataRate[TerminalIndex]     = NewTerminalContext->DataBitsIndex;

     CurrentFakeNVMap->COMStopBits[TerminalIndex]     = NewTerminalContext->StopBitsIndex;

-    CurrentFakeNVMap->COMParity[TerminalIndex]       = NewTerminalContext->ParityIndex; 

+    CurrentFakeNVMap->COMParity[TerminalIndex]       = NewTerminalContext->ParityIndex;

     CurrentFakeNVMap->COMTerminalType[TerminalIndex] = NewTerminalContext->TerminalType;

     CurrentFakeNVMap->COMFlowControl[TerminalIndex]  = NewTerminalContext->FlowControl;

   }

diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/FormGuid.h b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/FormGuid.h
index 299a149f60..186b2b7e23 100644
--- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/FormGuid.h
+++ b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/FormGuid.h
@@ -1,7 +1,7 @@
 /** @file

 Formset guids, form id and VarStore data structure for Boot Maintenance Manager.

 

-Copyright (c) 2004 - 2016, 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

@@ -148,7 +148,7 @@ typedef struct {
   // At most 100 input/output/errorout device for console storage

   //

   UINT8   ConsoleCheck[MAX_MENU_NUMBER];

-  

+

   //

   // At most 100 input/output/errorout device for console storage

   //

diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/UpdatePage.c b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/UpdatePage.c
index b3cc3c88dd..f598c46a5a 100644
--- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/UpdatePage.c
+++ b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/UpdatePage.c
@@ -1,7 +1,7 @@
 /** @file

 Dynamically update the pages.

 

-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

@@ -28,16 +28,16 @@ CreateUpdateData (
   //

   mStartOpCodeHandle = HiiAllocateOpCodeHandle ();

   ASSERT (mStartOpCodeHandle != NULL);

-  

+

   mEndOpCodeHandle = HiiAllocateOpCodeHandle ();

   ASSERT (mEndOpCodeHandle != NULL);

-  

+

   //

   // Create Hii Extend Label OpCode as the start opcode

   //

   mStartLabel = (EFI_IFR_GUID_LABEL *) HiiCreateGuidOpCode (mStartOpCodeHandle, &gEfiIfrTianoGuid, NULL, sizeof (EFI_IFR_GUID_LABEL));

   mStartLabel->ExtendOpCode = EFI_IFR_EXTEND_OP_LABEL;

-  

+

   //

   // Create Hii Extend Label OpCode as the end opcode

   //

@@ -57,7 +57,7 @@ RefreshUpdateData (
 {

   //

   // Free current updated date

-  //  

+  //

   if (mStartOpCodeHandle != NULL) {

     HiiFreeOpCodeHandle (mStartOpCodeHandle);

   }

@@ -78,7 +78,7 @@ RefreshUpdateData (
 /**

   Add a "Go back to main page" tag in front of the form when there are no

   "Apply changes" and "Discard changes" tags in the end of the form.

- 

+

   @param CallbackData    The BMM context data.

 

 **/

@@ -162,7 +162,7 @@ UpdatePageEnd (
 }

 

 /**

-  Clean up the dynamic opcode at label and form specified by both LabelId. 

+  Clean up the dynamic opcode at label and form specified by both LabelId.

 

   @param LabelId         It is both the Form ID and Label ID for opcode deletion.

   @param CallbackData    The BMM context data.

@@ -264,7 +264,7 @@ UpdateBootDelPage (
       CallbackData->BmmFakeNvData.BootOptionDel[Index] = FALSE;

       CallbackData->BmmOldFakeNVData.BootOptionDel[Index] = FALSE;

     }

-    

+

     HiiCreateCheckBoxOpCode (

       mStartOpCodeHandle,

       (EFI_QUESTION_ID) (BOOT_OPTION_DEL_QUESTION_ID + Index),

@@ -368,7 +368,7 @@ UpdateDrvDelPage (
 }

 

 /**

-  Prepare the page to allow user to add description for 

+  Prepare the page to allow user to add description for

   a Driver Option.

 

   @param CallbackData    The BMM context data.

@@ -582,8 +582,8 @@ UpdateOrderPage (
   OptionOrder = NULL;

   QuestionId = 0;

   VarOffset = 0;

-  switch (UpdatePageId) { 

-  

+  switch (UpdatePageId) {

+

   case FORM_BOOT_CHG_ID:

     //

     // If the BootOptionOrder in the BmmFakeNvData are same with the date in the BmmOldFakeNVData,

@@ -598,7 +598,7 @@ UpdateOrderPage (
     QuestionId = BOOT_OPTION_ORDER_QUESTION_ID;

     VarOffset = BOOT_OPTION_ORDER_VAR_OFFSET;

     break;

-    

+

   case FORM_DRV_CHG_ID:

     //

     // If the DriverOptionOrder in the BmmFakeNvData are same with the date in the BmmOldFakeNVData,

@@ -613,12 +613,12 @@ UpdateOrderPage (
     QuestionId = DRIVER_OPTION_ORDER_QUESTION_ID;

     VarOffset = DRIVER_OPTION_ORDER_VAR_OFFSET;

     break;

-  }  

-  ASSERT (OptionOrder != NULL);   

-  

+  }

+  ASSERT (OptionOrder != NULL);

+

   OptionsOpCodeHandle = HiiAllocateOpCodeHandle ();

   ASSERT (OptionsOpCodeHandle != NULL);

-  

+

   NewMenuEntry = NULL;

   for (OptionIndex = 0; (OptionOrder[OptionIndex] != 0 && OptionIndex < MAX_MENU_NUMBER); OptionIndex++) {

     BootOptionFound = FALSE;

@@ -639,21 +639,21 @@ UpdateOrderPage (
         );

     }

   }

-  

+

   if (OptionMenu->MenuNumber > 0) {

-    HiiCreateOrderedListOpCode (                   

-      mStartOpCodeHandle,                          // Container for dynamic created opcodes     

-      QuestionId,                                  // Question ID                               

-      VARSTORE_ID_BOOT_MAINT,                      // VarStore ID                               

-      VarOffset,                                   // Offset in Buffer Storage                  

-      STRING_TOKEN (STR_CHANGE_ORDER),             // Question prompt text                      

-      STRING_TOKEN (STR_CHANGE_ORDER),             // Question help text                        

-      0,                                           // Question flag                             

+    HiiCreateOrderedListOpCode (

+      mStartOpCodeHandle,                          // Container for dynamic created opcodes

+      QuestionId,                                  // Question ID

+      VARSTORE_ID_BOOT_MAINT,                      // VarStore ID

+      VarOffset,                                   // Offset in Buffer Storage

+      STRING_TOKEN (STR_CHANGE_ORDER),             // Question prompt text

+      STRING_TOKEN (STR_CHANGE_ORDER),             // Question help text

+      0,                                           // Question flag

       0,                                           // Ordered list flag, e.g. EFI_IFR_UNIQUE_SET

-      EFI_IFR_TYPE_NUM_SIZE_32,                    // Data type of Question value               

-      100,                                         // Maximum container                         

-      OptionsOpCodeHandle,                         // Option Opcode list                        

-      NULL                                         // Default Opcode is NULL                    

+      EFI_IFR_TYPE_NUM_SIZE_32,                    // Data type of Question value

+      100,                                         // Maximum container

+      OptionsOpCodeHandle,                         // Option Opcode list

+      NULL                                         // Default Opcode is NULL

       );

   }

 

@@ -730,7 +730,7 @@ UpdateConModePage (
     if (EFI_ERROR (Status)) {

       continue;

     }

-    

+

     //

     // Build mode string Column x Row

     //

@@ -848,7 +848,7 @@ UpdateTerminalPage (
     OptionsOpCodeHandle,

     NULL

     );

-  

+

   HiiFreeOpCodeHandle (OptionsOpCodeHandle);

   OptionsOpCodeHandle = HiiAllocateOpCodeHandle ();

   ASSERT (OptionsOpCodeHandle != NULL);

@@ -1013,7 +1013,7 @@ UpdateTerminalPage (
 

   UpdatePageEnd (CallbackData);

 }

- 

+

 /**

 Update add boot/driver option page.

 

diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/Variable.c b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/Variable.c
index c1c55b0fb2..f934546829 100644
--- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/Variable.c
+++ b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/Variable.c
@@ -1,7 +1,7 @@
 /** @file

 Variable operation that will be used by bootmaint

 

-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

@@ -17,10 +17,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 /**

   Delete Boot Option that represent a Deleted state in BootOptionMenu.

 

-  @retval EFI_SUCCESS   If all boot load option EFI Variables corresponding to  

+  @retval EFI_SUCCESS   If all boot load option EFI Variables corresponding to

                         BM_LOAD_CONTEXT marked for deletion is deleted.

   @retval EFI_NOT_FOUND If can not find the boot option want to be deleted.

-  @return Others        If failed to update the "BootOrder" variable after deletion. 

+  @return Others        If failed to update the "BootOrder" variable after deletion.

 

 **/

 EFI_STATUS

@@ -124,7 +124,7 @@ Var_DelDriverOption (
 

   This function clear the EFI variable defined by ConsoleName and

   gEfiGlobalVariableGuid. It then build the multi-instance device

-  path by appending the device path of the Console (In/Out/Err) instance 

+  path by appending the device path of the Console (In/Out/Err) instance

   in ConsoleMenu. Then it scan all corresponding console device by

   scanning Terminal (built from device supporting Serial I/O instances)

   devices in TerminalMenu. At last, it save a EFI variable specifed

@@ -188,7 +188,7 @@ Var_UpdateConsoleOption (
         ) {

       Vendor.Header.Type    = MESSAGING_DEVICE_PATH;

       Vendor.Header.SubType = MSG_VENDOR_DP;

-      

+

       ASSERT (NewTerminalContext->TerminalType < (ARRAY_SIZE (TerminalTypeGuid)));

       CopyMem (

         &Vendor.Guid,

@@ -261,7 +261,7 @@ Var_UpdateConsoleOutOption (
   console device.

 

   @retval EFI_SUCCESS    The function complete successfully.

-  @return The EFI variable can not be saved. See gRT->SetVariable for detail return information.  

+  @return The EFI variable can not be saved. See gRT->SetVariable for detail return information.

 **/

 EFI_STATUS

 Var_UpdateErrorOutOption (

@@ -272,8 +272,8 @@ Var_UpdateErrorOutOption (
 }

 

 /**

-  This function create a currently loaded Drive Option from 

-  the BMM. It then appends this Driver Option to the end of 

+  This function create a currently loaded Drive Option from

+  the BMM. It then appends this Driver Option to the end of

   the "DriverOrder" list. It append this Driver Opotion to the end

   of DriverOptionMenu.

 

@@ -401,8 +401,8 @@ Var_UpdateDriverOption (
 }

 

 /**

-  This function create a currently loaded Boot Option from 

-  the BMM. It then appends this Boot Option to the end of 

+  This function create a currently loaded Boot Option from

+  the BMM. It then appends this Boot Option to the end of

   the "BootOrder" list. It also append this Boot Opotion to the end

   of BootOptionMenu.

 

@@ -521,7 +521,7 @@ Var_UpdateBootOption (
 }

 

 /**

-  This function update the "BootNext" EFI Variable. If there is 

+  This function update the "BootNext" EFI Variable. If there is

   no "BootNext" specified in BMM, this EFI Variable is deleted.

   It also update the BMM context data specified the "BootNext"

   vaule.

@@ -529,7 +529,7 @@ Var_UpdateBootOption (
   @param CallbackData    The BMM context data.

 

   @retval EFI_SUCCESS    The function complete successfully.

-  @return                The EFI variable can be saved. See gRT->SetVariable 

+  @return                The EFI variable can be saved. See gRT->SetVariable

                          for detail return information.

 

 **/

@@ -633,7 +633,7 @@ Var_UpdateBootOrder (
                   BootOrder

                   );

   FreePool (BootOrder);

-  

+

   BOpt_FreeMenu (&BootOptionMenu);

   BOpt_GetBootOptions (CallbackData);