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>

8 files changed, 145 insertions, 145 deletions

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
index af31615a61..36ed734e38 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
+++ b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
@@ -2,7 +2,7 @@
 This is an example of how a driver might export data to the HII protocol to be

 later utilized by the Setup Protocol

 

-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

@@ -127,12 +127,12 @@ NotificationFunction(
   )

 {

   gBS->SignalEvent (mEvent);

-  

+

   return EFI_SUCCESS;

 }

 

 /**

-  Function to start monitoring for CTRL-C using SimpleTextInputEx. 

+  Function to start monitoring for CTRL-C using SimpleTextInputEx.

 

   @retval EFI_SUCCESS           The feature is enabled.

   @retval EFI_OUT_OF_RESOURCES  There is not enough mnemory available.

@@ -175,7 +175,7 @@ InternalStartMonitor(
     if (EFI_ERROR (Status)) {

       break;

     }

-    

+

     KeyData.KeyState.KeyShiftState  = EFI_SHIFT_STATE_VALID|EFI_RIGHT_CONTROL_PRESSED;

     Status = SimpleEx->RegisterKeyNotify(

       SimpleEx,

@@ -191,7 +191,7 @@ InternalStartMonitor(
 }

 

 /**

-  Function to stop monitoring for CTRL-C using SimpleTextInputEx.  

+  Function to stop monitoring for CTRL-C using SimpleTextInputEx.

 

   @retval EFI_SUCCESS           The feature is enabled.

   @retval EFI_OUT_OF_RESOURCES  There is not enough mnemory available.

@@ -205,7 +205,7 @@ InternalStopMonitor(
   EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL *SimpleEx;

   EFI_STATUS                        Status;

   EFI_HANDLE                        *Handles;

-  EFI_KEY_DATA                      KeyData;  

+  EFI_KEY_DATA                      KeyData;

   UINTN                             HandleCount;

   UINTN                             HandleIndex;

   EFI_HANDLE                        NotifyHandle;

@@ -344,7 +344,7 @@ GetValueOfNumber (
     Status = EFI_OUT_OF_RESOURCES;

     goto Exit;

   }

-  

+

   Length = *Len;

   ZeroMem (TemStr, sizeof (TemStr));

   for (Index = 0; Index < Length; Index ++) {

@@ -369,7 +369,7 @@ Exit:
 }

 

 /**

-  Create altcfg string. 

+  Create altcfg string.

 

   @param  Result               The request result string.

   @param  ConfigHdr            The request head info. <ConfigHdr> format.

@@ -379,7 +379,7 @@ Exit:
 

   @retval  The string with altcfg info append at the end.

 **/

-EFI_STRING 

+EFI_STRING

 CreateAltCfgString (

   IN     EFI_STRING     Result,

   IN     EFI_STRING     ConfigHdr,

@@ -404,60 +404,60 @@ CreateAltCfgString (
   TmpStr = StringPtr;

   if (Result != NULL) {

     StrCpyS (StringPtr, NewLen / sizeof (CHAR16), Result);

-    StringPtr += StrLen (Result);  

+    StringPtr += StrLen (Result);

     FreePool (Result);

   }

-  

+

   UnicodeSPrint (

-  StringPtr, 

-  (1 + StrLen (ConfigHdr) + 8 + 4 + 1) * sizeof (CHAR16), 

-  L"&%s&ALTCFG=%04x", 

-  ConfigHdr, 

+  StringPtr,

+  (1 + StrLen (ConfigHdr) + 8 + 4 + 1) * sizeof (CHAR16),

+  L"&%s&ALTCFG=%04x",

+  ConfigHdr,

   EFI_HII_DEFAULT_CLASS_STANDARD

   );

   StringPtr += StrLen (StringPtr);

 

   UnicodeSPrint (

-    StringPtr, 

+    StringPtr,

     (8 + 4 + 7 + 4 + 7 + 4 + 1) * sizeof (CHAR16),

-    L"&OFFSET=%04x&WIDTH=%04x&VALUE=%04x", 

-    Offset, 

+    L"&OFFSET=%04x&WIDTH=%04x&VALUE=%04x",

+    Offset,

     Width,

     DEFAULT_CLASS_STANDARD_VALUE

     );

-  StringPtr += StrLen (StringPtr);  

+  StringPtr += StrLen (StringPtr);

 

   UnicodeSPrint (

-  StringPtr, 

-  (1 + StrLen (ConfigHdr) + 8 + 4 + 1) * sizeof (CHAR16), 

-  L"&%s&ALTCFG=%04x", 

-  ConfigHdr, 

+  StringPtr,

+  (1 + StrLen (ConfigHdr) + 8 + 4 + 1) * sizeof (CHAR16),

+  L"&%s&ALTCFG=%04x",

+  ConfigHdr,

   EFI_HII_DEFAULT_CLASS_MANUFACTURING

   );

   StringPtr += StrLen (StringPtr);

 

   UnicodeSPrint (

-    StringPtr, 

+    StringPtr,

     (8 + 4 + 7 + 4 + 7 + 4 + 1) * sizeof (CHAR16),

-    L"&OFFSET=%04x&WIDTH=%04x&VALUE=%04x", 

-    Offset, 

+    L"&OFFSET=%04x&WIDTH=%04x&VALUE=%04x",

+    Offset,

     Width,

     DEFAULT_CLASS_MANUFACTURING_VALUE

     );

-  StringPtr += StrLen (StringPtr); 

+  StringPtr += StrLen (StringPtr);

 

   return TmpStr;

 }

 

 /**

-  Check whether need to add the altcfg string. if need to add, add the altcfg 

+  Check whether need to add the altcfg string. if need to add, add the altcfg

   string.

 

   @param  RequestResult              The request result string.

   @param  ConfigRequestHdr           The request head info. <ConfigHdr> format.

 

 **/

-VOID 

+VOID

 AppendAltCfgString (

   IN OUT EFI_STRING                       *RequestResult,

   IN     EFI_STRING                       ConfigRequestHdr

@@ -791,7 +791,7 @@ ExtractConfig (
         Value += StrnLenS (Value, (BufferSize - ((UINTN)Value - (UINTN)*Results)) / sizeof (CHAR16));

       }

     }

-    

+

     Status = EFI_SUCCESS;

   } else {

     //

@@ -1209,7 +1209,7 @@ DriverCallback (
       }

     }

     break;

-    

+

   case EFI_BROWSER_ACTION_RETRIEVE:

     {

       switch (QuestionId ) {

@@ -1255,7 +1255,7 @@ DriverCallback (
           EFI_IFR_FLAG_CALLBACK,            // Question flag

           0                                 // Action String ID

         );

-      

+

         HiiUpdateForm (

           PrivateData->HiiHandle[0],        // HII handle

           &gDriverSampleFormSetGuid,        // Formset GUID

@@ -1336,7 +1336,7 @@ DriverCallback (
         break;

 

       default:

-        Status = EFI_UNSUPPORTED;      

+        Status = EFI_UNSUPPORTED;

       break;

       }

     }

@@ -1537,14 +1537,14 @@ DriverCallback (
         //

         *ActionRequest = EFI_BROWSER_ACTION_REQUEST_EXIT;

         break;

-      

+

       case 0x1238:

         //

         // User press "Save now", request Browser to save the uncommitted data.

         //

         *ActionRequest = EFI_BROWSER_ACTION_REQUEST_SUBMIT;

         break;

-      

+

       case 0x1241:

       case 0x1246:

         //

@@ -1552,21 +1552,21 @@ DriverCallback (
         //

         *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_SUBMIT_EXIT;

         break;

-      

+

       case 0x1242:

         //

         // User press "Discard current form now", request Browser to discard the uncommitted data.

         //

         *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_DISCARD;

         break;

-      

+

       case 0x1243:

         //

         // User press "Submit current form now", request Browser to save the uncommitted data.

         //

         *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_APPLY;

         break;

-      

+

       case 0x1244:

       case 0x1245:

         //

@@ -1606,7 +1606,7 @@ DriverCallback (
         //

         // 2. If system support this keyword, just try to change value.

         //

-        

+

         //

         // Change value from '0' to '1' or from '1' to '0'

         //

@@ -2114,7 +2114,7 @@ DriverSampleInit (
   FreePool (ConfigRequestHdr);

 

   Status = gBS->CreateEventEx (

-        EVT_NOTIFY_SIGNAL, 

+        EVT_NOTIFY_SIGNAL,

         TPL_NOTIFY,

         EfiEventEmptyFunction,

         NULL,

@@ -2125,7 +2125,7 @@ DriverSampleInit (
 

   //

   // Example of how to use BrowserEx protocol to register HotKey.

-  // 

+  //

   Status = gBS->LocateProtocol (&gEdkiiFormBrowserExProtocolGuid, NULL, (VOID **) &FormBrowserEx);

   if (!EFI_ERROR (Status)) {

     //

@@ -2136,7 +2136,7 @@ DriverSampleInit (
     FormBrowserEx->RegisterHotKey (&HotKey, 0, 0, NULL);

     HotKey.ScanCode    = SCAN_F10;

     FormBrowserEx->RegisterHotKey (&HotKey, 0, 0, NULL);

-    

+

     //

     // Register the default HotKey F9 and F10 again.

     //

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.uni b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.uni
index 91ee7136a8..5f8d99bd56 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.uni
+++ b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.uni
@@ -4,13 +4,13 @@
 // This driver shows how HII protocol, VFR and UNI files are used to create a HII

 // driver which can be dipslayed and configured by a UEFI HII Form Browser.

 //

-// Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>

+// Copyright (c) 2007 - 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.

 //

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf b/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf
index bfd7484518..f856efebc7 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf
+++ b/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf
@@ -1,16 +1,16 @@
 ## @file

-# This is a sample HII driver. 

+# This is a sample HII driver.

 #

-# This driver shows how HII protocol, VFR and UNI files are used to create a HII 

+# This driver shows how HII protocol, VFR and UNI files are used to create a HII

 # driver which can be dipslayed and configured by a UEFI HII Form Browser.

 #

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

+# Copyright (c) 2007 - 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.

 #

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleExtra.uni b/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleExtra.uni
index 1f34d2d6c2..644c221294 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleExtra.uni
+++ b/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleExtra.uni
@@ -1,7 +1,7 @@
 // /** @file

 // DriverSample Localized Strings and Content

 //

-// Copyright (c) 2013 - 2014, Intel Corporation. All rights reserved.<BR>

+// Copyright (c) 2013 - 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

@@ -13,8 +13,8 @@
 //

 // **/

 

-#string STR_PROPERTIES_MODULE_NAME 

-#language en-US 

+#string STR_PROPERTIES_MODULE_NAME

+#language en-US

 "HII Sample DXE Driver"

 

 

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/Inventory.vfr b/MdeModulePkg/Universal/DriverSampleDxe/Inventory.vfr
index daa2577383..bcdc8e8583 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/Inventory.vfr
+++ b/MdeModulePkg/Universal/DriverSampleDxe/Inventory.vfr
@@ -2,7 +2,7 @@
 //

 //    Sample Inventory Data

 //

-//  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

@@ -23,82 +23,82 @@ formset
   form formid = 1,

        title  = STRING_TOKEN(STR_INV_FORM1_TITLE);  // note formid is a variable (for readability) (UINT16) - also added Form to the line to signify the Op-Code

 

-  	text

+    text

       help   = STRING_TOKEN(STR_INV_VERSION_HELP),

       text   = STRING_TOKEN(STR_INV_VERSION_TEXT),

-	    text   = STRING_TOKEN(STR_INV_EMPTY_STRING),

+      text   = STRING_TOKEN(STR_INV_EMPTY_STRING),

       flags  = 0,

       key    = 0;

 

-  	text

+    text

       help   = STRING_TOKEN(STR_INV_EMPTY_STRING),

       text   = STRING_TOKEN(STR_INV_VERSION_TEXT2),

-	    text   = STRING_TOKEN(STR_INV_EMPTY_STRING),

+      text   = STRING_TOKEN(STR_INV_EMPTY_STRING),

       flags  = 0,

       key    = 0;

 

-  	text

+    text

       help   = STRING_TOKEN(STR_INV_EMPTY_STRING),

       text   = STRING_TOKEN(STR_INV_VERSION_TEXT3),

-	    text   = STRING_TOKEN(STR_INV_EMPTY_STRING),

+      text   = STRING_TOKEN(STR_INV_EMPTY_STRING),

       flags  = 0,

       key    = 0;

 

-  	text

+    text

       help   = STRING_TOKEN(STR_INV_EMPTY_STRING),

       text   = STRING_TOKEN(STR_INV_VERSION_TEXT4),

-	    text   = STRING_TOKEN(STR_INV_EMPTY_STRING),

+      text   = STRING_TOKEN(STR_INV_EMPTY_STRING),

       flags  = 0,

       key    = 0;

 

     subtitle text = STRING_TOKEN(STR_INV_EMPTY_STRING);

 

-  	text

+    text

       help   = STRING_TOKEN(STR_INV_EMPTY_STRING),

       text   = STRING_TOKEN(STR_INV_VERSION_TEXT5),

-	    text   = STRING_TOKEN(STR_INV_EMPTY_STRING),

+      text   = STRING_TOKEN(STR_INV_EMPTY_STRING),

       flags  = 0,

       key    = 0;

 

-  	text

+    text

       help   = STRING_TOKEN(STR_INV_EMPTY_STRING),

       text   = STRING_TOKEN(STR_INV_VERSION_TEXT6),

-	    text   = STRING_TOKEN(STR_INV_EMPTY_STRING),

+      text   = STRING_TOKEN(STR_INV_EMPTY_STRING),

       flags  = 0,

       key    = 0;

 

-  	text

+    text

       help   = STRING_TOKEN(STR_INV_EMPTY_STRING),

       text   = STRING_TOKEN(STR_INV_VERSION_TEXT7),

-	    text   = STRING_TOKEN(STR_INV_EMPTY_STRING),

+      text   = STRING_TOKEN(STR_INV_EMPTY_STRING),

       flags  = 0,

       key    = 0;

 

-  	text

+    text

       help   = STRING_TOKEN(STR_INV_EMPTY_STRING),

       text   = STRING_TOKEN(STR_INV_VERSION_TEXT8),

-	    text   = STRING_TOKEN(STR_INV_EMPTY_STRING),

+      text   = STRING_TOKEN(STR_INV_EMPTY_STRING),

       flags  = 0,

       key    = 0;

 

-  	text

+    text

       help   = STRING_TOKEN(STR_INV_EMPTY_STRING),

       text   = STRING_TOKEN(STR_INV_VERSION_TEXT9),

-	    text   = STRING_TOKEN(STR_INV_EMPTY_STRING),

+      text   = STRING_TOKEN(STR_INV_EMPTY_STRING),

       flags  = 0,

       key    = 0;

 

-  	text

+    text

       help   = STRING_TOKEN(STR_INV_EMPTY_STRING),

       text   = STRING_TOKEN(STR_INV_VERSION_TEXT10),

-	    text   = STRING_TOKEN(STR_INV_EMPTY_STRING),

+      text   = STRING_TOKEN(STR_INV_EMPTY_STRING),

       flags  = 0,

       key    = 0;

 

-  	text

+    text

       help   = STRING_TOKEN(STR_INV_EMPTY_STRING),

       text   = STRING_TOKEN(STR_INV_VERSION_TEXT11),

-	    text   = STRING_TOKEN(STR_INV_EMPTY_STRING),

+      text   = STRING_TOKEN(STR_INV_EMPTY_STRING),

       flags  = 0,

       key    = 0;

 

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/InventoryStrings.uni b/MdeModulePkg/Universal/DriverSampleDxe/InventoryStrings.uni
index 01afcd5cae..9336b4a946 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/InventoryStrings.uni
+++ b/MdeModulePkg/Universal/DriverSampleDxe/InventoryStrings.uni
@@ -1,24 +1,24 @@
 // *++

 //

-// Copyright (c) 2007, 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.             

-// 

+// Copyright (c) 2007 - 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.

+//

 // Module Name:

 //

 //   InventoryStrings.uni

-// 

+//

 // Abstract:

-// 

+//

 //   String definitions for Inventory file.

-// 

+//

 // Revision History:

-// 

+//

 // --*/

 

 

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr b/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
index 9d99dcf205..d005e7feed 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
+++ b/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
@@ -54,16 +54,16 @@ formset
   title     = STRING_TOKEN(STR_FORM_SET_TITLE),

   help      = STRING_TOKEN(STR_FORM_SET_TITLE_HELP),

   classguid = EFI_HII_PLATFORM_SETUP_FORMSET_GUID,

-  

+

   //

-  // Notes: VfrCompiler will insert a Standard Default Storage declaration 

+  // Notes: VfrCompiler will insert a Standard Default Storage declaration

   // after the formset declaration.    >00000040: 5C 06 00 00 00 00.

   // So we don't need to declare the Standard Default.

   // Please check the vfr.lst file for details.

   // To enable list file for VFR, add "-l" to VfrCompile <Command> in [Build.Visual-Form-Representation-File] as follows:

   //          VfrCompile -l --no-pre-processing --output-directory ${d_path} $(OUTPUT_DIR)(+)${s_dir}(+)${s_base}.iii

   //

-  

+

    //

   // Define a Buffer Storage (EFI_IFR_VARSTORE)

   //

@@ -76,7 +76,7 @@ formset
   // Define a EFI variable Storage (EFI_IFR_VARSTORE_EFI)

   //

   efivarstore MY_EFI_VARSTORE_DATA,

-    attribute = EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_NON_VOLATILE,  // EFI variable attribures  

+    attribute = EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_NON_VOLATILE,  // EFI variable attribures

     name  = MyEfiVar,

     guid  = DRIVER_SAMPLE_FORMSET_GUID;

 

@@ -415,7 +415,7 @@ formset
               step    = 1,

               default = 18, defaultstore = MyStandardDefault,     // This is standard default value

               default = 19, defaultstore = MyManufactureDefault,  // This is manufacture default value

-        

+

       endnumeric;

     endif;

 

@@ -423,7 +423,7 @@ formset
             questionid = 0x1239,

             prompt  = STRING_TOKEN(STR_DEFAULT_VALUE_FROM_ACCESS_PROMPT),

             help    = STRING_TOKEN(STR_DEFAULT_VALUE_FROM_ACCESS_HELP),

-            flags   = DISPLAY_UINT_HEX | INTERACTIVE, 

+            flags   = DISPLAY_UINT_HEX | INTERACTIVE,

             minimum = 0,

             maximum = 255,

             step    = 1,

@@ -434,7 +434,7 @@ formset
             questionid = 0x1240,

             prompt  = STRING_TOKEN(STR_DEFAULT_VALUE_FROM_CALLBACK_PROMPT),

             help    = STRING_TOKEN(STR_DEFAULT_VALUE_FROM_CALLBACK_HELP),

-            flags   = DISPLAY_UINT_HEX | INTERACTIVE, 

+            flags   = DISPLAY_UINT_HEX | INTERACTIVE,

             minimum = 0,

             maximum = 255,

             step    = 1,

@@ -451,13 +451,13 @@ formset
         option text = STRING_TOKEN(STR_ONE_OF_TEXT2), value = 2, flags = 0;

         option text = STRING_TOKEN(STR_ONE_OF_TEXT3), value = 3, flags = 0;

     endlist;

-        

+

     resetbutton

       defaultstore = MyStandardDefault,

       prompt   = STRING_TOKEN(STR_STANDARD_DEFAULT_PROMPT),

       help     = STRING_TOKEN(STR_STANDARD_DEFAULT_HELP),

     endresetbutton;

-    

+

     resetbutton

       defaultstore = MyManufactureDefault,

       prompt   = STRING_TOKEN(STR_MANUFACTURE_DEFAULT_PROMPT),

@@ -504,24 +504,24 @@ formset
     goto 5,

       prompt = STRING_TOKEN(STR_GOTO_FORM5), //FifthSetupPage  // this too has no end-op and basically it's a jump to a form ONLY

       help   = STRING_TOKEN(STR_GOTO_FORM5_HELP);

-      

+

     goto 6,

       prompt = STRING_TOKEN(STR_GOTO_FORM6), //SixthSetupPage  // this too has no end-op and basically it's a jump to a form ONLY

       help   = STRING_TOKEN(STR_GOTO_HELP);

 

-    goto 

+    goto

       formsetguid = DRIVER_SAMPLE_INVENTORY_GUID,

       formid  = 0x1,

       question = 0x1,

       prompt  = STRING_TOKEN(STR_GOTO_ANOTHER_FORMSET),

       help    = STRING_TOKEN(STR_GOTO_ANOTHER_FORMSET_HELP);

 

-    guidop 

+    guidop

       guid = DRIVER_SAMPLE_FORMSET_GUID,

       datatype = MY_EFI_VARSTORE_DATA,

-        data.Field8  = 0x21, 

+        data.Field8  = 0x21,

         data.Field16 = 0x2121,

-        data.OrderedList[0] = 0x21,        

+        data.OrderedList[0] = 0x21,

     endguidop;

 

      goto 7,

@@ -587,16 +587,16 @@ formset
         help    = STRING_TOKEN(STR_TIME_HELP),

         flags   = STORAGE_TIME,

       endtime;

-      

-      time 

-            name    = MyTime, 

-            varid   = MyIfrNVData.Time, 

-            prompt  = STRING_TOKEN(STR_TIME_PROMPT), 

-            help    = STRING_TOKEN(STR_TIME_PROMPT), 

+

+      time

+            name    = MyTime,

+            varid   = MyIfrNVData.Time,

+            prompt  = STRING_TOKEN(STR_TIME_PROMPT),

+            help    = STRING_TOKEN(STR_TIME_PROMPT),

             flags   = STORAGE_NORMAL | SECOND_SUPPRESS,

-            default = 15:33:33, 

+            default = 15:33:33,

       endtime;

-      

+

       checkbox varid   = MyIfrNVData.ChooseToActivateNuclearWeaponry,

               prompt   = STRING_TOKEN(STR_CHECK_BOX_PROMPT),

               help     = STRING_TOKEN(STR_CHECK_BOX_HELP),

@@ -616,7 +616,7 @@ formset
         prompt = STRING_TOKEN(STR_GOTO_FORM1), //MainSetupPage  // this too has no end-op and basically it's a jump to a form ONLY

         help   = STRING_TOKEN(STR_GOTO_HELP);

 

-    goto 

+    goto

       varid   = MyIfrNVData.RefData,

       prompt  = STRING_TOKEN(STR_GOTO_DYNAMIC3),

       help    = STRING_TOKEN(STR_GOTO_DYNAMIC3_HELP),

@@ -625,15 +625,15 @@ formset
       //

       // Set the defult value, format is QuestionId; FormId; FormsetGuid; Device Path String Token

       //

-      default = 0;0;ZERO_GUID;STRING_TOKEN(STR_NULL_STRING),  

+      default = 0;0;ZERO_GUID;STRING_TOKEN(STR_NULL_STRING),

     ;                                                         // goto opcode end flag.

 

-    goto 

+    goto

       prompt  = STRING_TOKEN(STR_GOTO_DYNAMIC4),

       help    = STRING_TOKEN(STR_GOTO_DYNAMIC4_HELP),

       flags   = INTERACTIVE,

       key     = 0x1249;

-      

+

     endform;

   endif;

 

@@ -662,7 +662,7 @@ formset
     endnumeric;

 

     grayoutif  match2 (stringref(STRING_TOKEN(STR_PATTERN)), stringref(STRING_TOKEN(STR_STRING)), PERL_GUID);

-      numeric 

+      numeric

         varid   = MyIfrNVData.Match2,

         prompt  = STRING_TOKEN(STR_MATCH2_PROMPT),

         help    = STRING_TOKEN(STR_MATCH2_HELP),

@@ -676,19 +676,19 @@ formset
 

   endform;

 

-  formmap formid = 4,            

-    maptitle = STRING_TOKEN(STR_SAMPL_MAP_METHOD);  

+  formmap formid = 4,

+    maptitle = STRING_TOKEN(STR_SAMPL_MAP_METHOD);

     mapguid  = DRIVER_SAMPLE_FORMSET_GUID;

-    maptitle = STRING_TOKEN(STR_STANDARD_MAP_METHOD);  

+    maptitle = STRING_TOKEN(STR_STANDARD_MAP_METHOD);

     mapguid  = EFI_HII_STANDARD_FORM_GUID;

 

-    oneof varid = MyIfrNVData.SerialPortNo,    

+    oneof varid = MyIfrNVData.SerialPortNo,

       prompt  = STRING_TOKEN(STR_SERIAL_PORT),

       help    = STRING_TOKEN(STR_ONE_OF_HELP),

 

       read    cond (get(MyIfrNVData.SerialPortStatus) != 0 ? 0 : cond ((get(MyIfrNVData.SerialPortIo) & 0xF00) >> 0x8 == get(MyIfrNVData.SerialPortIrq) - 1 ? UNDEFINED : map (get(MyIfrNVData.SerialPortIo) : 0x3f8,1; 0x2F8,2; 0x3E8,3; 0x2E8,4;)));

       write   set(MyIfrNVData.SerialPortStatus, pushthis != 0) AND set(MyIfrNVData.SerialPortIo, map (pushthis : 1,0x3F8; 2,0x2F8; 3,0x3E8; 4,0x2E8;)) AND set (MyIfrNVData.SerialPortIrq, map (pushthis: 1,4; 2,3; 3,4; 4,3;));

-      

+

       option text = STRING_TOKEN(STR_SERIAL_PORT_DISABLE), value = 0x0, flags = DEFAULT;

       option text = STRING_TOKEN(STR_SERIAL_PORT1), value = 0x1, flags = 0;

       option text = STRING_TOKEN(STR_SERIAL_PORT2), value = 0x2, flags = 0;

@@ -705,10 +705,10 @@ formset
 

     grayoutif TRUE;

       suppressif ideqval MyIfrNVData.SerialPortStatus == 0;

-        oneof varid = MyIfrNVData.SerialPortIo,    

+        oneof varid = MyIfrNVData.SerialPortIo,

           prompt  = STRING_TOKEN(STR_SERIAL_PORT_IO_ADDRESS),

           help    = STRING_TOKEN(STR_ONE_OF_HELP),

-          

+

           option text = STRING_TOKEN(STR_SERIAL_PORT1_IOADDR), value = 0x3F8, flags = DEFAULT;

           option text = STRING_TOKEN(STR_SERIAL_PORT2_IOADDR), value = 0x2F8, flags = 0;

           option text = STRING_TOKEN(STR_SERIAL_PORT3_IOADDR), value = 0x3E8, flags = 0;

@@ -719,10 +719,10 @@ formset
 

     grayoutif TRUE;

       suppressif ideqval MyIfrNVData.SerialPortStatus == 0;

-        oneof varid = MyIfrNVData.SerialPortIrq,    

+        oneof varid = MyIfrNVData.SerialPortIrq,

           prompt  = STRING_TOKEN(STR_SERIAL_PORT_IRQ),

           help    = STRING_TOKEN(STR_ONE_OF_HELP),

-          

+

           option text = STRING_TOKEN(STR_SERIAL_PORT13_IRQ), value = 0x4, flags = DEFAULT;

           option text = STRING_TOKEN(STR_SERIAL_PORT24_IRQ), value = 0x3, flags = 0;

         endoneof;

@@ -755,7 +755,7 @@ formset
   endform;

 

   form formid = 6,            // Form to show the refresh guid group op-code

-       title = STRING_TOKEN(STR_FORM6_TITLE); 

+       title = STRING_TOKEN(STR_FORM6_TITLE);

 

     text

       help   = STRING_TOKEN(STR_TEXT_REFRESH_GUID),

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/VfrStrings.uni b/MdeModulePkg/Universal/DriverSampleDxe/VfrStrings.uni
index 2215c08c5a..e223bb6075 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/VfrStrings.uni
+++ b/MdeModulePkg/Universal/DriverSampleDxe/VfrStrings.uni
@@ -1,24 +1,24 @@
 // *++

-	//

+  //

 // Copyright (c) 2007 - 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.             

-// 

+// 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.

+//

 // Module Name:

 //

 //   VfrStrings.vfr

-// 

+//

 // Abstract:

-// 

+//

 //   String definitions for Sample Setup formset.

-// 

+//

 // Revision History:

-// 

+//

 // --*/

 

 

@@ -52,9 +52,9 @@
 #string STR_CPU_STRING2                #language en-US " "

                                        #language fr-FR " "

 #string STR_NUMERIC_NUM_PROMPT         #language en-US "Please select the number"

-                                       #language fr-FR "Please select the number"                                       

+                                       #language fr-FR "Please select the number"

 #string STR_NUMERIC_NUM_HELP           #language en-US "Check the input number, test the efi buffer varstore"

-                                       #language fr-FR "Check the input number, test the efi buffer varstore"                                        

+                                       #language fr-FR "Check the input number, test the efi buffer varstore"

 #string STR_ONE_OF_PROMPT              #language en-US "My one-of prompt #1"

                                        #language fr-FR "Mi uno- de guía # 1"

 #string STR_ONE_OF_PROMPT_KEYWORD      #language en-US "My Keyword Namespace Test"

@@ -142,7 +142,7 @@
 #string STR_GOTO_DYNAMIC3_HELP         #language en-US "Update the destination through "retrieve" call back type before user select it."

                                        #language fr-FR "Update the destination through "retrieve" call back type before user select it."

 #string STR_GOTO_DYNAMIC4_HELP         #language en-US "Update the destination through "changing" call back type when user select it."

-                                       #language fr-FR "Update the destination through "changing" call back type when user select it."                                                                                

+                                       #language fr-FR "Update the destination through "changing" call back type when user select it."

 #string STR_ERROR_INCONSISTENT         #language en-US "This is my inconsistent error message"

                                        #language fr-FR "Éste es mi mensaje de error contrario."

 #string STR_ERROR_POPUP                #language en-US "You typed in something bad!"

@@ -240,7 +240,7 @@
 #string STR_STRING_CHECK_ERROR_POPUP   #language en-US "String you typed in is not correct!"

                                        #language fr-FR "String you typed in is not correct!"

 #string STR_TEXT_REFRESH_GUID          #language en-US "Add new menu by press "Ctrl + C""

-                                       #language fr-FR "Add new menu by press "Ctrl + C"" 

+                                       #language fr-FR "Add new menu by press "Ctrl + C""

 #string STR_TEXT_REFRESH_GUID_COUNT    #language en-US "Refresh guid event count"

                                        #language fr-FR "Refresh guid event count"

 #string STR_MODAL_FORM_TITLE           #language en-US "First Modal Form"

@@ -262,7 +262,7 @@
 #string STR_GOTO_ANOTHER_FORMSET_HELP                #language en-US "When select this option, browser will go to another formset."

                                                      #language fr-FR "When select this option, browser will go to another formset."

 #string STR_DEVICE_PATH                              #language en-US ""

-                                                     #language fr-FR ""                                                                                                           

+                                                     #language fr-FR ""

 #string STR_SUBMITTED_CALLBACK_TEST_PROMPT           #language en-US "Submitted callback test"

                                                      #language fr-FR "Submitted callback test"

 #string STR_SUBMITTED_CALLBACK_TEST_HELP             #language en-US "Change the value and press F10 to submmit will pop up a dialogue to show SUBMITTED Callback has been triggered"

@@ -346,7 +346,7 @@
                                        #language fr-FR "Manufacture Default"

 

 #string STR_DEFAULTSTORE_SAFE          #language en-US "Safe Default"

-                                       #language fr-FR "Safe Default"                                       

+                                       #language fr-FR "Safe Default"

 

 #string STR_STANDARD_DEFAULT_PROMPT    #language en-US "Standard Default"

                                        #language fr-FR "Standard Default"

@@ -370,7 +370,7 @@
 #string STR_STANDARD_MAP_METHOD        #language en-US "UEFI Standard Map Form"

                                        #language fr-FR "UEFI Standard Map Form"

 //

-// Serial Port 

+// Serial Port

 //

 #string STR_SERIAL_PORT                #language en-US "Serial port number"

                                        #language fr-FR "Serial port number"

@@ -431,4 +431,4 @@
 #string STR_STRING                     #language en-US  "Match2 Test"

                                        #language fr-FR  "Match2 Test"

 #string STR_PATTERN                    #language en-US  "Match2"

-                                       #language fr-FR  "Match2"
\ No newline at end of file
+                                       #language fr-FR  "Match2"